Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vector3 Additional functions #1463

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions modules/juce_opengl/geometry/juce_Vector3D.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,27 @@ class Vector3D
/** Returns a vector that lies along the Z axis. */
static Vector3D zAxis() noexcept { return { 0, 0, (Type) 1 }; }

Vector3D& operator+= (Vector3D other) noexcept { x += other.x; y += other.y; z += other.z; return *this; }
Vector3D& operator-= (Vector3D other) noexcept { x -= other.x; y -= other.y; z -= other.z; return *this; }
Vector3D& operator+= (Type value) noexcept { x += value; y += value; z += value; return *this; }
Vector3D& operator-= (Type value) noexcept { x -= value; y -= value; z -= value; return *this; }
Vector3D& operator*= (Type scaleFactor) noexcept { x *= scaleFactor; y *= scaleFactor; z *= scaleFactor; return *this; }
Vector3D& operator/= (Type scaleFactor) noexcept { x /= scaleFactor; y /= scaleFactor; z /= scaleFactor; return *this; }
Vector3D& operator+= (Vector3D other) noexcept { x += other.x; y += other.y; z += other.z; return *this; }
Vector3D& operator-= (Vector3D other) noexcept { x -= other.x; y -= other.y; z -= other.z; return *this; }
Vector3D& operator/= (Vector3D other) noexcept { x /= other.x; y /= other.y; z /= other.z; return *this; }

Vector3D operator+ (Vector3D other) const noexcept { return { x + other.x, y + other.y, z + other.z }; }
Vector3D operator- (Vector3D other) const noexcept { return { x - other.x, y - other.y, z - other.z }; }
Vector3D operator+ (Type value) const noexcept { return { x + value, y + value, z + value }; }
Vector3D operator- (Type value) const noexcept { return { x - value, y - value, z - value }; }
Vector3D operator* (Type scaleFactor) const noexcept { return { x * scaleFactor, y * scaleFactor, z * scaleFactor }; }
Vector3D operator/ (Type scaleFactor) const noexcept { return { x / scaleFactor, y / scaleFactor, z / scaleFactor }; }
Vector3D operator+ (Vector3D other) const noexcept { return { x + other.x, y + other.y, z + other.z }; }
Vector3D operator- (Vector3D other) const noexcept { return { x - other.x, y - other.y, z - other.z }; }
Vector3D operator/ (Vector3D other) const noexcept { return { x / other.x, y / other.y, z / other.z }; }
Vector3D operator-() const noexcept { return { -x, -y, -z }; }


Vector3D multiplied (Vector3D other) const noexcept { return { x * other.x, y * other.y, z * other.z }; }
void multiply(Vector3D other) const noexcept { x *= other.x; y *= other.y; z *= other.z; }

/** Returns the dot-product of these two vectors. */
Type operator* (Vector3D other) const noexcept { return x * other.x + y * other.y + z * other.z; }

Expand Down