From 42b06e48a8a2fe166b454ac582b02d6a7d296354 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 23 Jul 2013 11:21:31 +0200
Subject: [PATCH] Add nullify method to Matrix class

---
 src/Base/Matrix.cpp | 52 ++++++++++++++++++++++++++-------------------
 src/Base/Matrix.h   |  6 ++++--
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/Base/Matrix.cpp b/src/Base/Matrix.cpp
index 18072b6b0..65968afcc 100644
--- a/src/Base/Matrix.cpp
+++ b/src/Base/Matrix.cpp
@@ -23,8 +23,8 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <memory>
-# include <cstring>
+# include <memory>
+# include <cstring>
 # include <sstream>
 #endif
 
@@ -80,6 +80,14 @@ void Matrix4D::setToUnity (void)
   dMtrx4D[3][0] = 0.0; dMtrx4D[3][1] = 0.0; dMtrx4D[3][2] = 0.0; dMtrx4D[3][3] = 1.0;
 }
 
+void Matrix4D::nullify(void)
+{
+  dMtrx4D[0][0] = 0.0; dMtrx4D[0][1] = 0.0; dMtrx4D[0][2] = 0.0; dMtrx4D[0][3] = 0.0;
+  dMtrx4D[1][0] = 0.0; dMtrx4D[1][1] = 0.0; dMtrx4D[1][2] = 0.0; dMtrx4D[1][3] = 0.0;
+  dMtrx4D[2][0] = 0.0; dMtrx4D[2][1] = 0.0; dMtrx4D[2][2] = 0.0; dMtrx4D[2][3] = 0.0;
+  dMtrx4D[3][0] = 0.0; dMtrx4D[3][1] = 0.0; dMtrx4D[3][2] = 0.0; dMtrx4D[3][3] = 0.0;
+}
+
 double Matrix4D::determinant() const
 {
     double fA0 = dMtrx4D[0][0]*dMtrx4D[1][1] - dMtrx4D[0][1]*dMtrx4D[1][0];
@@ -701,8 +709,8 @@ void Matrix4D::fromString(const std::string &str)
       input >> dMtrx4D[i][j];
   }    
 }
-
-// Analyse the a transformation Matrix and describe the transformation
+
+// Analyse the a transformation Matrix and describe the transformation
 std::string Matrix4D::analyse(void) const
 {
     const double eps=1.0e-06;
@@ -723,22 +731,22 @@ std::string Matrix4D::analyse(void) const
         }
         else //translation and affine 
         {
-            if (dMtrx4D[0][1] == 0.0 &&  dMtrx4D[0][2] == 0.0 &&
-                dMtrx4D[1][0] == 0.0 &&  dMtrx4D[1][2] == 0.0 &&
+            if (dMtrx4D[0][1] == 0.0 &&  dMtrx4D[0][2] == 0.0 &&
+                dMtrx4D[1][0] == 0.0 &&  dMtrx4D[1][2] == 0.0 &&
                 dMtrx4D[2][0] == 0.0 &&  dMtrx4D[2][1] == 0.0) //scaling
             {
-                std::ostringstream stringStream;
-                stringStream << "Scale [" << dMtrx4D[0][0] << ", "  <<
+                std::ostringstream stringStream;
+                stringStream << "Scale [" << dMtrx4D[0][0] << ", "  <<
                     dMtrx4D[1][1] << ", " << dMtrx4D[2][2] << "]";
-                text = stringStream.str();
+                text = stringStream.str();
             }
             else
             {
                 Base::Matrix4D sub;
-                sub[0][0] = dMtrx4D[0][0]; sub[0][1] = dMtrx4D[0][1];
-                sub[0][2] = dMtrx4D[0][2]; sub[1][0] = dMtrx4D[1][0];
+                sub[0][0] = dMtrx4D[0][0]; sub[0][1] = dMtrx4D[0][1];
+                sub[0][2] = dMtrx4D[0][2]; sub[1][0] = dMtrx4D[1][0];
                 sub[1][1] = dMtrx4D[1][1]; sub[1][2] = dMtrx4D[1][2];
-                sub[2][0] = dMtrx4D[2][0]; sub[2][1] = dMtrx4D[2][1];
+                sub[2][0] = dMtrx4D[2][0]; sub[2][1] = dMtrx4D[2][1];
                 sub[2][2] = dMtrx4D[2][2];
 
                 Base::Matrix4D trp = sub;
@@ -771,23 +779,23 @@ std::string Matrix4D::analyse(void) const
                         }
                         else //scaling with rotation
                         {
-                            std::ostringstream stringStream;
-                            stringStream << "Scale and Rotate ";
+                            std::ostringstream stringStream;
+                            stringStream << "Scale and Rotate ";
                             if (determinant<0.0 )
-                                stringStream << "and Invert ";
-                            stringStream << "[ " <<
-            sqrt(trp[0][0]) << ", "  << sqrt(trp[1][1]) << ", " <<
+                                stringStream << "and Invert ";
+                            stringStream << "[ " <<
+            sqrt(trp[0][0]) << ", "  << sqrt(trp[1][1]) << ", " <<
             sqrt(trp[2][2]) << "]";
-                                text = stringStream.str();
+                                text = stringStream.str();
                         }
                     }
                 }
                 else
                 {
-                    std::ostringstream stringStream;
-                    stringStream << "Affine with det= " <<
+                    std::ostringstream stringStream;
+                    stringStream << "Affine with det= " <<
                         determinant;
-                    text = stringStream.str();
+                    text = stringStream.str();
                 }
             }
         }
@@ -795,4 +803,4 @@ std::string Matrix4D::analyse(void) const
             text += " with Translation";
     }
     return text;
-}
+}
diff --git a/src/Base/Matrix.h b/src/Base/Matrix.h
index 36444c667..f53019a4a 100644
--- a/src/Base/Matrix.h
+++ b/src/Base/Matrix.h
@@ -26,7 +26,7 @@
 
 #include <cassert>
 #include <cmath>
-#include <cstdio>
+#include <cstdio>
 #include <string>
 
 #include "Vector3D.h"
@@ -104,7 +104,9 @@ public:
   /** @name Manipulation */
   //@{
   /// Makes unity matrix
-  void setToUnity        (void);
+  void setToUnity(void);
+  /// Makes a null matrix
+  void nullify(void);
   /// moves the coordinatesystem for the x,y,z value
   void move         (float x, float y, float z)
   { move(Vector3f(x,y,z)); }