Float comparison epsilon

ChangeLog

@@ -8,6 +8,7 @@
 	[ 20140129 ]
 	* Removed unused libferit stuff
 	* Changed code to generate much less warnings
+	* Using relative epsilon for float comparison
 
 	[ 20140124 ]
 	* Fixed some TombRaider.cpp warnings

include/MatMath.h

@@ -37,6 +37,14 @@ vec_t helIntersectionOfAbstractSpheres(vec3_t centerA, vec_t radiusA, vec3_t cen
 int helIntersectionOfAbstractSphereAndLine(vec3_t center, vec_t radius, vec3_t posA, vec3_t posB, vec3_t intersectionA, vec3_t intersectionB);
 
 /*!
+ * \brief Compare two floats with an Epsilon.
+ * \param a first float
+ * \param b second float
+ * \returns true if a and b are probably the same.
+ */
+bool equalEpsilon(vec_t a, vec_t b);
+
+/*!
  * \brief Calculate Intersection of a line and a polygon
  * \param intersect Where the intersection is stored, if it exists
  * \param p1 First point of line segment

include/OpenGLMesh.h

@@ -105,8 +105,7 @@ public:
 
     void allocateVertices(unsigned int n);
 
-    void bufferColorArray(unsigned int colorCount, vec_t *colors,
-                                 unsigned int colorWidth);
+    void bufferColorArray(unsigned int colorCount, vec_t *colors);
 
     void bufferNormalArray(unsigned int normalCount, vec_t *normals);
 

src/MatMath.cpp

@@ -8,11 +8,18 @@
 
 #include <stdlib.h>
 #include <math.h>
+#include <float.h>
 
 #include <MatMath.h>
 #include <Vector3d.h>
 #include <Matrix.h>
 
+bool equalEpsilon(vec_t a, vec_t b) {
+    vec_t epsilon = FLT_EPSILON;
+    if (fabs(a - b) <= (((fabs(b) > fabs(a)) ? fabs(b) : fabs(a)) * epsilon))
+        return true;
+    return false;
+}
 
 vec_t helIntersectionOfAbstractSpheres(vec3_t centerA, vec_t radiusA,
         vec3_t centerB, vec_t radiusB)

src/Matrix.cpp

@@ -254,6 +254,7 @@ void Matrix::print()
 bool Matrix::isIdentity()
 {
     // Hhhmm... floating point using direct comparisions
+    /*
     if (mMatrix[ 0] == 1 && mMatrix[ 1] == 0 && mMatrix[ 2] == 0 &&
             mMatrix[ 3] == 0 &&    mMatrix[ 4] == 0 && mMatrix[ 5] == 1 &&
             mMatrix[ 6] == 0 && mMatrix[ 7] == 0 && mMatrix[ 8] == 0 &&
@@ -261,6 +262,14 @@ bool Matrix::isIdentity()
             mMatrix[12] == 0 && mMatrix[13] == 0 && mMatrix[14] == 0 &&
             mMatrix[15] == 1)
         return true;
+    */
+    if (equalEpsilon(mMatrix[ 0], 1.0) && equalEpsilon(mMatrix[ 1], 0.0) && equalEpsilon(mMatrix[ 2], 0.0) &&
+        equalEpsilon(mMatrix[ 3], 0.0) && equalEpsilon(mMatrix[ 4], 0.0) && equalEpsilon(mMatrix[ 5], 1.0) &&
+        equalEpsilon(mMatrix[ 6], 0.0) && equalEpsilon(mMatrix[ 7], 0.0) && equalEpsilon(mMatrix[ 8], 0.0) &&
+        equalEpsilon(mMatrix[ 9], 0.0) && equalEpsilon(mMatrix[10], 1.0) && equalEpsilon(mMatrix[11], 0.0) &&
+        equalEpsilon(mMatrix[12], 0.0) && equalEpsilon(mMatrix[13], 0.0) && equalEpsilon(mMatrix[14], 0.0) &&
+        equalEpsilon(mMatrix[15], 1.0))
+        return true;
 
     return false;
 }

src/OpenGLMesh.cpp

@@ -498,8 +498,7 @@ void OpenGLMesh::allocateVertices(unsigned int n)
 }
 
 
-void OpenGLMesh::bufferColorArray(unsigned int colorCount, vec_t *colors,
-        unsigned int colorWidth)
+void OpenGLMesh::bufferColorArray(unsigned int colorCount, vec_t *colors)
 {
     if (mColors)
     {
@@ -512,7 +511,6 @@ void OpenGLMesh::bufferColorArray(unsigned int colorCount, vec_t *colors,
         return;
     }
 
-    //mColorWidth = colorWidth;  // for now assume 4 always
     mNumColors = colorCount;
     mColorArray = colors;
 }

src/OpenRaider.cpp

@@ -2440,7 +2440,7 @@ void OpenRaider::processRoom(int index)
 
     rRoom->mesh.bufferVertexArray(vertexCount, (vec_t *)vertexArray);
     rRoom->mesh.bufferNormalArray(normalCount, (vec_t *)normalArray);
-    rRoom->mesh.bufferColorArray(vertexCount, (vec_t *)colorArray, 4);
+    rRoom->mesh.bufferColorArray(vertexCount, (vec_t *)colorArray);
 
     m_tombraider.getRoomTriangles(index, m_texOffset,
             &triCount, &indices, &texCoords, &textures,

src/Quaternion.cpp

@@ -125,7 +125,9 @@ Quaternion Quaternion::operator -(const Quaternion &q)
 
 bool Quaternion::operator ==(const Quaternion &q)
 {
-    return (mX == q.mX && mY == q.mY && mZ == q.mZ && mW == q.mW);
+    //return (mX == q.mX && mY == q.mY && mZ == q.mZ && mW == q.mW);
+    return (equalEpsilon(mX, q.mX) && equalEpsilon(mY, q.mY) &&
+            equalEpsilon(mZ, q.mZ) && equalEpsilon(mW, q.mW));
 }