Renamed MatMath and moved into utils

include/Camera.h

@@ -7,7 +7,7 @@
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "Matrix.h"
 #include "Quaternion.h"
 

include/Matrix.h

@@ -8,7 +8,7 @@
 #ifndef _MATRIX_H_
 #define _MATRIX_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "Quaternion.h"
 #include "Vector3d.h"
 

include/Mesh.h

@@ -10,7 +10,7 @@
 #ifndef _OPENGLMESH_H_
 #define _OPENGLMESH_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 
 /*!
  * \brief OpenGL Mesh
@@ -29,7 +29,7 @@ public:
         fMesh_UseVertexArray = (1 << 0)
     } MeshFlags;
 
-    typedef struct tris_s {
+    typedef struct {
         int texture;
 #ifdef MULTITEXTURE
         int bumpmap;
@@ -53,7 +53,7 @@ public:
         unsigned int *alpha_triangles; //!< ABCABCABC...
     } tris_t;
 
-    typedef struct rect_s {
+    typedef struct {
 
         int texture;
 #ifdef MULTITEXTURE
@@ -108,8 +108,8 @@ public:
     void bufferNormalArray(unsigned int normalCount, vec_t *normals);
 
     void bufferTriangles(unsigned int count,
-                                unsigned int *indices, vec_t *texCoords,
-                                int *textures, unsigned int *flags);
+                            unsigned int *indices, vec_t *texCoords,
+                            int *textures, unsigned int *flags);
 
     void bufferVertexArray(unsigned int vertexCount, vec_t *vertices);
 
@@ -125,11 +125,11 @@ public:
     void sortFacesByTexture();
 
     void addFace(int textureIndex, int textureIndexB, unsigned int flags,
-                     unsigned int vertexIndexCount, vec_t *vertexIndices);
+                    unsigned int vertexIndexCount, vec_t *vertexIndices);
 
     void addTexTiledFace(int textureIndex, int textureIndexB,
-                                unsigned int flags, unsigned int indexCount,
-                                vec_t *vertexIndices, vec_t *texcoords);
+                            unsigned int flags, unsigned int indexCount,
+                            vec_t *vertexIndices, vec_t *texcoords);
 
     void bufferTexcoords(unsigned int texcoordCount, vec_t *texcoords);
 

include/Particle.h

@@ -8,7 +8,7 @@
 #ifndef _PARTICLE_H_
 #define _PARTICLE_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 
 /*!
  * \brief Partcle systems atomic base

include/Quaternion.h

@@ -8,7 +8,7 @@
 #ifndef _QUATERNION_H_
 #define _QUATERNION_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 
 /*!
  * \brief Quaternion

include/Render.h

@@ -17,7 +17,6 @@
 #include "Texture.h"
 #include "Camera.h"
 #include "GLString.h"
-#include "templates/List.h"
 #include "templates/Vector.h"
 
 #ifdef USING_EMITTER

include/SkeletalModel.h

@@ -12,7 +12,7 @@
 #ifndef _SKELETALMODEL_H_
 #define _SKELETALMODEL_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "templates/Vector.h"
 
 typedef struct {

include/Vector3d.h

@@ -8,7 +8,7 @@
 #ifndef _VECTOR3D_H_
 #define _VECTOR3D_H_
 
-#include "MatMath.h"
+#include "utils/math.h"
 
 /*!
  * \brief 3D Math Vector

include/World.h

@@ -14,7 +14,7 @@
 #include "SkeletalModel.h"
 #endif
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "templates/List.h"
 #include "templates/Vector.h"
 

include/MatMath.h → include/utils/math.h

@@ -1,6 +1,6 @@
 /*!
  *
- * \file include/MatMath.h
+ * \file include/utils/math.h
  * \brief Vector and Matrix math
  *
  * \author Mongoose
@@ -27,16 +27,6 @@ typedef float vec4_t[4];    //!< 4D Vector
 typedef vec_t matrix_t[16]; //!< Used as _Column_major_ in every class now!
 
 /*!
- * \fixme Add Documentation or remove, as it is unused?
- */
-vec_t helIntersectionOfAbstractSpheres(vec3_t centerA, vec_t radiusA, vec3_t centerB, vec_t radiusB);
-
-/*!
- * \fixme Add Documentation or remove, as it is unused?
- */
-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

include/utils/strings.h

@@ -48,6 +48,6 @@ bool rc_command(const char *symbol, char *command);
  * \param val is set to boolean interpretation of buffer
  * \returns -1 for null string, -2 if string is not "true" or "false"
  */
-int rc_get_bool(char *buffer, bool *val);
+int rc_get_bool(const char *buffer, bool *val);
 
 #endif

include/utils/tga.h

@@ -60,7 +60,7 @@ int tga_check(FILE *f);
  * \returns 0 on success, else error condition
  */
 int tga_load(FILE *f, unsigned char **image,
-        unsigned int *width, unsigned int *height, char *type);
+                unsigned int *width, unsigned int *height, char *type);
 
 /*!
  * \brief Save a pixel buffer into a file on disk
@@ -72,7 +72,7 @@ int tga_load(FILE *f, unsigned char **image,
  * \returns 0 on success, else error condition
  */
 int tga_save(FILE *f, unsigned char *image,
-        unsigned int width, unsigned int height, char type);
+                unsigned int width, unsigned int height, char type);
 
 /*!
  * \brief Save a pixel buffer into a file on disk
@@ -84,7 +84,8 @@ int tga_save(FILE *f, unsigned char *image,
  * \returns 0 on success, else error condition
  */
 int tga_save_filename(unsigned char *image,
-        unsigned int width, unsigned int height,
-        char type, char *s, ...) __attribute__((format(printf, 5, 6)));
+                        unsigned int width, unsigned int height,
+                        char type, char *s, ...)
+    __attribute__((format(printf, 5, 6)));
 
 #endif

src/CMakeLists.txt

@@ -2,7 +2,6 @@
 set (SRCS ${SRCS} "Camera.cpp")
 set (SRCS ${SRCS} "Emitter.cpp")
 set (SRCS ${SRCS} "GLString.cpp")
-set (SRCS ${SRCS} "MatMath.cpp")
 set (SRCS ${SRCS} "Matrix.cpp")
 set (SRCS ${SRCS} "Mesh.cpp")
 set (SRCS ${SRCS} "Network.cpp")

src/Camera.cpp

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "Camera.h"
 
 unsigned int Camera::mCounter = 0;

src/Network.cpp

@@ -20,7 +20,7 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 
-#include "MatMath.h" // Random Number
+#include "utils/math.h" // Random Number
 #include "Network.h"
 
 //#define LOCAL_BCAST

src/OpenRaider.cpp

@@ -1451,8 +1451,8 @@ void OpenRaider::processSprites()
 
 void OpenRaider::processMoveables()
 {
-    List <unsigned int> cache;
-    List <skeletal_model_t *> cache2;
+    List<unsigned int> cache;
+    List<skeletal_model_t *> cache2;
     tr2_mesh_t *mesh = NULL;
     tr2_moveable_t *moveable = NULL;
     tr2_meshtree_t *meshtree = NULL;
@@ -1568,8 +1568,8 @@ void OpenRaider::processMoveables()
 
 
 void OpenRaider::processMoveable(int index, int i, int *ent,
-        List <skeletal_model_t *> &cache2,
-        List <unsigned int> &cache, int object_id)
+        List<skeletal_model_t *> &cache2,
+        List<unsigned int> &cache, int object_id)
 {
     skeletal_model_t *r_model = NULL;
     skeletal_model_t *c_model = NULL;

src/SDLSystem.cpp

@@ -12,7 +12,7 @@
 
 #include "SDL_opengl.h"
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "SDLSystem.h"
 
 unsigned int *gWidth = 0x0;

src/System.cpp

@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #endif
 
-#include "MatMath.h"
+#include "utils/math.h"
 #include "System.h"
 
 ////////////////////////////////////////////////////////////

src/utils/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Source files
+set (UTIL_SRCS ${UTIL_SRCS} "math.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
 

src/MatMath.cpp → src/utils/math.cpp

@@ -1,6 +1,6 @@
 /*!
  *
- * \file src/MatMath.cpp
+ * \file src/utils/math.cpp
  * \brief Vector and Matrix math
  *
  * \author Mongoose
@@ -10,9 +10,9 @@
 #include <math.h>
 #include <float.h>
 
-#include "MatMath.h"
 #include "Vector3d.h"
 #include "Matrix.h"
+#include "utils/math.h"
 
 bool equalEpsilon(vec_t a, vec_t b) {
     vec_t epsilon = FLT_EPSILON;
@@ -21,20 +21,6 @@ bool equalEpsilon(vec_t a, vec_t b) {
     return false;
 }
 
-vec_t helIntersectionOfAbstractSpheres(vec3_t centerA, vec_t radiusA,
-        vec3_t centerB, vec_t radiusB)
-{
-    Vector3d a = Vector3d(centerA);
-    Vector3d b = Vector3d(centerB);
-    Vector3d d = a - b;
-    vec_t dist, minDist;
-
-    dist = Vector3d::dot(d, d);
-    minDist = radiusA + radiusB;
-
-    return (dist <= minDist * minDist);
-}
-
 
 inline vec_t square(vec_t a)
 {
@@ -42,68 +28,6 @@ inline vec_t square(vec_t a)
 }
 
 
-// Returns number of intersections and intersection position(s)
-// Got algorithm from http://astronomy.swin.edu.au/~pbourke/geometry/
-int helIntersectionOfAbstractSphereAndLine(vec3_t center, vec_t radius,
-        vec3_t posA, vec3_t posB,
-        vec3_t intersectionA,
-        vec3_t intersectionB)
-{
-    // float x , y , z;
-    vec_t a, b, c, mu, i ;
-
-
-    a = (square(posB[0] - posA[0]) +
-            square(posB[1] - posA[1]) +
-            square(posB[2] - posA[2]));
-    b = (2 * ((posB[0] - posA[0]) * (posA[0] - center[0]) +
-                (posB[1] - posA[1]) * (posA[1] - center[1]) +
-                (posB[2] - posA[2]) * (posA[2] - center[2])));
-    c = (square(center[0]) + square(center[1]) +
-            square(center[2]) + square(posA[0]) +
-            square(posA[1]) + square(posA[2]) -
-            2 * (center[0]*posA[0] + center[1]*posA[1] + center[2]*posA[2]) -
-            square(radius));
-
-    i = b * b - 4 * a * c;
-
-
-    if (i < 0.0)
-    {
-        // No intersection
-        return 0;
-    }
-    else if (i == 0.0)
-    {
-        // One intersection
-        mu = -b/(2*a) ;
-        intersectionA[0] = posA[0] + mu*(posB[0]-posA[0]);
-        intersectionA[1] = posA[1] + mu*(posB[1]-posA[1]);
-        intersectionA[2] = posA[2] + mu*(posB[2]-posA[2]);
-
-        return 1;
-    }
-    else
-    {
-        // Two intersections
-
-        // First intersection
-        mu = (-b + sqrtf( square(b) - 4.0f*a*c)) / (2.0f*a);
-        intersectionA[0] = posA[0] + mu*(posB[0]-posA[0]);
-        intersectionA[1] = posA[1] + mu*(posB[1]-posA[1]);
-        intersectionA[2] = posA[2] + mu*(posB[2]-posA[2]);
-
-        // Second intersection
-        mu = (-b - sqrtf(square(b) - 4.0f*a*c)) / (2.0f*a);
-        intersectionB[0] = posA[0] + mu*(posB[0]-posA[0]);
-        intersectionB[1] = posA[1] + mu*(posB[1]-posA[1]);
-        intersectionB[2] = posA[2] + mu*(posB[2]-posA[2]);
-
-        return 2;
-    }
-}
-
-
 int helIntersectionLineAndPolygon(vec3_t intersect,
         vec3_t p1, vec3_t p2,
         vec3_t *polygon)

src/utils/strings.cpp

@@ -138,7 +138,7 @@ bool rc_command(const char *symbol, char *command) {
     return false;
 }
 
-int rc_get_bool(char *buffer, bool *val) {
+int rc_get_bool(const char *buffer, bool *val) {
     if (!buffer || !buffer[0])
         return -1;
 

test/CMakeLists.txt

@@ -52,7 +52,7 @@ set (THREADLIBS ${THREADLIBS} ${CMAKE_THREAD_LIBS_INIT})
 
 # Network Test
 set (NETWORKSRCS "${PROJECT_SOURCE_DIR}/test/Network.cpp" "${PROJECT_SOURCE_DIR}/src/Network.cpp")
-set (NETWORKSRCS ${NETWORKSRCS} "${PROJECT_SOURCE_DIR}/src/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
+set (NETWORKSRCS ${NETWORKSRCS} "${PROJECT_SOURCE_DIR}/src/utils/math.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
 add_executable (NetworkTest EXCLUDE_FROM_ALL ${NETWORKSRCS})
 set_target_properties (NetworkTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
 target_link_libraries (NetworkTest m ${THREADLIBS})
@@ -60,7 +60,7 @@ target_link_libraries (NetworkTest m ${THREADLIBS})
 #################################################################
 
 # Math Test
-set (MATHSRCS "${PROJECT_SOURCE_DIR}/test/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
+set (MATHSRCS "${PROJECT_SOURCE_DIR}/test/math.cpp" "${PROJECT_SOURCE_DIR}/src/utils/math.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
 add_executable (MathTest EXCLUDE_FROM_ALL ${MATHSRCS})
 set_target_properties (MathTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
 
@@ -68,7 +68,7 @@ set_target_properties (MathTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS}
 
 # Matrix Test
 set (MATRIXSRCS "${PROJECT_SOURCE_DIR}/test/Matrix.cpp" "${PROJECT_SOURCE_DIR}/src/Matrix.cpp")
-set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp" "${PROJECT_SOURCE_DIR}/src/MatMath.cpp")
+set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp" "${PROJECT_SOURCE_DIR}/src/utils/math.cpp")
 set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Quaternion.cpp")
 add_executable (MatrixTest EXCLUDE_FROM_ALL ${MATRIXSRCS})
 set_target_properties (MatrixTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})