Vector3: Remove elementwise multiplication (inconsistent with vector arithmetic)

diff --git a/src/libs/Vector3.cpp b/src/libs/Vector3.cpp
index 828af6f..73bfc01 100644 (file)
--- a/src/libs/Vector3.cpp
+++ b/src/libs/Vector3.cpp
@@ -75,17 +75,6 @@ Vector3 Vector3::mul(float scalar) const
     return out;
 }
 
-Vector3 Vector3::mul(const Vector3& v) const
-{
-    Vector3 out;
-
-    out.elem[0] = elem[0] * v[0];
-    out.elem[1] = elem[1] * v[1];
-    out.elem[2] = elem[2] * v[2];
-
-    return out;
-}
-
 Vector3 Vector3::unit() const
 {
     Vector3 out;

diff --git a/src/libs/Vector3.h b/src/libs/Vector3.h
index d50f10c..6de53e0 100644 (file)
--- a/src/libs/Vector3.h
+++ b/src/libs/Vector3.h
@@ -20,7 +20,6 @@ public:
     Vector3  sub(const Vector3&) const;
 
     Vector3  mul(float) const;
-    Vector3  mul(const Vector3& v) const;
 
     Vector3  unit(void) const;
 

diff --git a/src/modules/tools/zprobe/Plane3D.cpp b/src/modules/tools/zprobe/Plane3D.cpp
index 7064419..38ad013 100644 (file)
--- a/src/modules/tools/zprobe/Plane3D.cpp
+++ b/src/modules/tools/zprobe/Plane3D.cpp
@@ -11,8 +11,7 @@ Plane3D::Plane3D(const Vector3 &v1, const Vector3 &v2, const Vector3 &v3)
 
     // ax+by+cz+d=0
     // solve for d
-    Vector3 dv = normal.mul(v1);
-    d = -dv[0] - dv[1] - dv[2];
+    d = -normal.dot(v1);
 }
 
 typedef union { float f; uint32_t u; } conv_t;