Changeset 10845 for branches/RELENG_1_0/juggler_1.0/Math

Timestamp:

09/26/02 20:41:15 (6 years ago)

Author:

patrickh

Message:

Move overloaded operators into the header so that they can actually
be used. Inlining them in the .cpp file wasn't terribly useful to
anyone.

Files:

• branches/RELENG_1_0/juggler_1.0/Math/vjMatrix.cpp (modified) (1 diff)
• branches/RELENG_1_0/juggler_1.0/Math/vjMatrix.h (modified) (1 diff)

branches/RELENG_1_0/juggler_1.0/Math/vjMatrix.cpp

@@ -632 +632 @@
-}
-
-inline vjMatrix operator *(float _s, const vjMatrix& _m) {
-    vjMatrix dst; dst.scale(_s, _m); return dst;
-}
-
-inline vjMatrix operator *(const vjMatrix& _m, float _s) {
-    vjMatrix dst; dst.scale(_s, _m); return dst;
-}
-
-inline vjMatrix operator /(const vjMatrix& _m, float _s) {
-    vjMatrix dst; dst.scale(1.0f/_s, _m); return dst;
-}
-
-    // Matrix Multiplication of A:(nxl) B:(lxm) ==> C:(nxm)
-    //   Cij = Sum(k=1,l) (Aik)(Bkj)

branches/RELENG_1_0/juggler_1.0/Math/vjMatrix.h

@@ -456 +456 @@
-};
-
+inline vjMatrix operator* (float _s, const vjMatrix& _m)
+{
+   vjMatrix dst;
+   dst.scale(_s, _m); return dst;
+}
+
+inline vjMatrix operator* (const vjMatrix& _m, float _s)
+{
+   vjMatrix dst;
+   dst.scale(_s, _m); return dst;
+}
+
+inline vjMatrix operator/ (const vjMatrix& _m, float _s)
+{
+   vjMatrix dst;
+   dst.scale(1.0f/_s, _m); return dst;
+}
+
-#endif