From 3e0bb82ef1eaf41605d3d5ed575a8a5debcadfe8 Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Thu, 27 Oct 2022 16:30:03 +0200 Subject: [PATCH 1/4] Added multiply/multiplied/divide/divided methods to Vector3D --- modules/juce_opengl/geometry/juce_Vector3D.h | 112 ++++++++++--------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/modules/juce_opengl/geometry/juce_Vector3D.h b/modules/juce_opengl/geometry/juce_Vector3D.h index 75fe11315193..cad3fcae9f3c 100644 --- a/modules/juce_opengl/geometry/juce_Vector3D.h +++ b/modules/juce_opengl/geometry/juce_Vector3D.h @@ -35,58 +35,64 @@ namespace juce { -//============================================================================== -/** - A three-coordinate vector. - - @tags{OpenGL} -*/ -template -class Vector3D -{ -public: - Vector3D() noexcept : x(), y(), z() {} - Vector3D (Type xValue, Type yValue, Type zValue) noexcept : x (xValue), y (yValue), z (zValue) {} - Vector3D (const Vector3D& other) noexcept : x (other.x), y (other.y), z (other.z) {} - Vector3D& operator= (Vector3D other) noexcept { x = other.x; y = other.y; z = other.z; return *this; } - - /** Returns a vector that lies along the X axis. */ - static Vector3D xAxis() noexcept { return { (Type) 1, 0, 0 }; } - /** Returns a vector that lies along the Y axis. */ - static Vector3D yAxis() noexcept { return { 0, (Type) 1, 0 }; } - /** 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 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) 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 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-() const noexcept { return { -x, -y, -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; } - - /** Returns the cross-product of these two vectors. */ - Vector3D operator^ (Vector3D other) const noexcept { return { y * other.z - z * other.y, z * other.x - x * other.z, x * other.y - y * other.x }; } - - Type length() const noexcept { return std::sqrt (lengthSquared()); } - Type lengthSquared() const noexcept { return x * x + y * y + z * z; } - - Vector3D normalised() const noexcept { return *this / length(); } - - /** Returns true if the vector is practically equal to the origin. */ - bool lengthIsBelowEpsilon() const noexcept - { - auto epsilon = std::numeric_limits::epsilon(); - return ! (x < -epsilon || x > epsilon || y < -epsilon || y > epsilon || z < -epsilon || z > epsilon); - } - - Type x, y, z; -}; + //============================================================================== + /** + A three-coordinate vector. + + @tags{OpenGL} + */ + template + class Vector3D + { + public: + Vector3D() noexcept : x(), y(), z() {} + Vector3D(Type xValue, Type yValue, Type zValue) noexcept : x(xValue), y(yValue), z(zValue) {} + Vector3D(const Vector3D& other) noexcept : x(other.x), y(other.y), z(other.z) {} + Vector3D& operator= (Vector3D other) noexcept { x = other.x; y = other.y; z = other.z; return *this; } + + /** Returns a vector that lies along the X axis. */ + static Vector3D xAxis() noexcept { return { (Type)1, 0, 0 }; } + /** Returns a vector that lies along the Y axis. */ + static Vector3D yAxis() noexcept { return { 0, (Type)1, 0 }; } + /** 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 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) 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 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-() const noexcept { return { -x, -y, -z }; } + + /*Multiply and divide in method to avoid using * and / operators (* is used for dot product) */ + void multiply(Vector3D other) const noexcept { x *= other.x; y *= other.y, z *= other.z; } + Vector3D multiplied(Vector3D other) const noexcept { return { x * other.x, y * other.y, z * other.z }; } + void divide(Vector3D other) const noexcept { x /= other.x; y /= other.y; z /= other.z }; + Vector3D divided(Vector3D other) const noexcept { return { 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; } + + /** Returns the cross-product of these two vectors. */ + Vector3D operator^ (Vector3D other) const noexcept { return { y * other.z - z * other.y, z * other.x - x * other.z, x * other.y - y * other.x }; } + + Type length() const noexcept { return std::sqrt(lengthSquared()); } + Type lengthSquared() const noexcept { return x * x + y * y + z * z; } + + Vector3D normalised() const noexcept { return *this / length(); } + + /** Returns true if the vector is practically equal to the origin. */ + bool lengthIsBelowEpsilon() const noexcept + { + auto epsilon = std::numeric_limits::epsilon(); + return !(x < -epsilon || x > epsilon || y < -epsilon || y > epsilon || z < -epsilon || z > epsilon); + } + + Type x, y, z; + }; } // namespace juce From 249c0397bd7b97d3fca2e3527cb1f18f689d525f Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Fri, 28 Oct 2022 10:10:38 +0200 Subject: [PATCH 2/4] fix typo --- modules/juce_opengl/geometry/juce_Vector3D.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/juce_opengl/geometry/juce_Vector3D.h b/modules/juce_opengl/geometry/juce_Vector3D.h index cad3fcae9f3c..1ebda37b84b8 100644 --- a/modules/juce_opengl/geometry/juce_Vector3D.h +++ b/modules/juce_opengl/geometry/juce_Vector3D.h @@ -71,7 +71,7 @@ namespace juce /*Multiply and divide in method to avoid using * and / operators (* is used for dot product) */ void multiply(Vector3D other) const noexcept { x *= other.x; y *= other.y, z *= other.z; } Vector3D multiplied(Vector3D other) const noexcept { return { x * other.x, y * other.y, z * other.z }; } - void divide(Vector3D other) const noexcept { x /= other.x; y /= other.y; z /= other.z }; + void divide(Vector3D other) const noexcept { x /= other.x; y /= other.y; z /= other.z; }; Vector3D divided(Vector3D other) const noexcept { return { x / other.x, y / other.y, z / other.z }; } /** Returns the dot-product of these two vectors. */ From a2fd544d28bac16ec93d6a4f2e26ae769d43d512 Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Mon, 28 Oct 2024 12:02:23 +0100 Subject: [PATCH 3/4] indent --- modules/juce_opengl/geometry/juce_Vector3D.h | 116 +++++++++---------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/modules/juce_opengl/geometry/juce_Vector3D.h b/modules/juce_opengl/geometry/juce_Vector3D.h index 1ebda37b84b8..82d86883928f 100644 --- a/modules/juce_opengl/geometry/juce_Vector3D.h +++ b/modules/juce_opengl/geometry/juce_Vector3D.h @@ -35,64 +35,64 @@ namespace juce { - //============================================================================== - /** - A three-coordinate vector. - - @tags{OpenGL} - */ - template - class Vector3D +//============================================================================== +/** + A three-coordinate vector. + + @tags{OpenGL} +*/ +template +class Vector3D +{ +public: + Vector3D() noexcept : x(), y(), z() {} + Vector3D(Type xValue, Type yValue, Type zValue) noexcept : x(xValue), y(yValue), z(zValue) {} + Vector3D(const Vector3D& other) noexcept : x(other.x), y(other.y), z(other.z) {} + Vector3D& operator= (Vector3D other) noexcept { x = other.x; y = other.y; z = other.z; return *this; } + + /** Returns a vector that lies along the X axis. */ + static Vector3D xAxis() noexcept { return { (Type)1, 0, 0 }; } + /** Returns a vector that lies along the Y axis. */ + static Vector3D yAxis() noexcept { return { 0, (Type)1, 0 }; } + /** 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 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) 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 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-() const noexcept { return { -x, -y, -z }; } + + /*Multiply and divide in method to avoid using * and / operators (* is used for dot product) */ + void multiply(Vector3D other) const noexcept { x *= other.x; y *= other.y, z *= other.z; } + Vector3D multiplied(Vector3D other) const noexcept { return { x * other.x, y * other.y, z * other.z }; } + void divide(Vector3D other) const noexcept { x /= other.x; y /= other.y; z /= other.z; }; + Vector3D divided(Vector3D other) const noexcept { return { 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; } + + /** Returns the cross-product of these two vectors. */ + Vector3D operator^ (Vector3D other) const noexcept { return { y * other.z - z * other.y, z * other.x - x * other.z, x * other.y - y * other.x }; } + + Type length() const noexcept { return std::sqrt(lengthSquared()); } + Type lengthSquared() const noexcept { return x * x + y * y + z * z; } + + Vector3D normalised() const noexcept { return *this / length(); } + + /** Returns true if the vector is practically equal to the origin. */ + bool lengthIsBelowEpsilon() const noexcept { - public: - Vector3D() noexcept : x(), y(), z() {} - Vector3D(Type xValue, Type yValue, Type zValue) noexcept : x(xValue), y(yValue), z(zValue) {} - Vector3D(const Vector3D& other) noexcept : x(other.x), y(other.y), z(other.z) {} - Vector3D& operator= (Vector3D other) noexcept { x = other.x; y = other.y; z = other.z; return *this; } - - /** Returns a vector that lies along the X axis. */ - static Vector3D xAxis() noexcept { return { (Type)1, 0, 0 }; } - /** Returns a vector that lies along the Y axis. */ - static Vector3D yAxis() noexcept { return { 0, (Type)1, 0 }; } - /** 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 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) 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 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-() const noexcept { return { -x, -y, -z }; } - - /*Multiply and divide in method to avoid using * and / operators (* is used for dot product) */ - void multiply(Vector3D other) const noexcept { x *= other.x; y *= other.y, z *= other.z; } - Vector3D multiplied(Vector3D other) const noexcept { return { x * other.x, y * other.y, z * other.z }; } - void divide(Vector3D other) const noexcept { x /= other.x; y /= other.y; z /= other.z; }; - Vector3D divided(Vector3D other) const noexcept { return { 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; } - - /** Returns the cross-product of these two vectors. */ - Vector3D operator^ (Vector3D other) const noexcept { return { y * other.z - z * other.y, z * other.x - x * other.z, x * other.y - y * other.x }; } - - Type length() const noexcept { return std::sqrt(lengthSquared()); } - Type lengthSquared() const noexcept { return x * x + y * y + z * z; } - - Vector3D normalised() const noexcept { return *this / length(); } - - /** Returns true if the vector is practically equal to the origin. */ - bool lengthIsBelowEpsilon() const noexcept - { - auto epsilon = std::numeric_limits::epsilon(); - return !(x < -epsilon || x > epsilon || y < -epsilon || y > epsilon || z < -epsilon || z > epsilon); - } - - Type x, y, z; - }; + auto epsilon = std::numeric_limits::epsilon(); + return !(x < -epsilon || x > epsilon || y < -epsilon || y > epsilon || z < -epsilon || z > epsilon); + } + + Type x, y, z; +}; } // namespace juce From 2cfcf980da3e6d244c03b046e55ab391caf34919 Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Mon, 28 Oct 2024 12:03:54 +0100 Subject: [PATCH 4/4] indent again --- modules/juce_opengl/geometry/juce_Vector3D.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_opengl/geometry/juce_Vector3D.h b/modules/juce_opengl/geometry/juce_Vector3D.h index 82d86883928f..34bff43f6022 100644 --- a/modules/juce_opengl/geometry/juce_Vector3D.h +++ b/modules/juce_opengl/geometry/juce_Vector3D.h @@ -37,9 +37,9 @@ namespace juce //============================================================================== /** - A three-coordinate vector. +A three-coordinate vector. - @tags{OpenGL} +@tags{OpenGL} */ template class Vector3D