Moved math, Matrix, Quaternion, Vector3d into lib

include/utils/Matrix.h → include/math/Matrix.h

@@ -1,16 +1,16 @@
 /*!
- * \file include/utils/Matrix.h
+ * \file include/math/Matrix.h
  * \brief 3D Matrix
  *
  * \author Mongoose
  */
 
-#ifndef _UTILS_MATRIX_H_
-#define _UTILS_MATRIX_H_
+#ifndef _MATH_MATRIX_H_
+#define _MATH_MATRIX_H_
 
-#include "utils/math.h"
-#include "utils/Quaternion.h"
-#include "utils/Vector3d.h"
+#include "math/math.h"
+#include "math/Quaternion.h"
+#include "math/Vector3d.h"
 
 
 /*!

include/utils/Quaternion.h → include/math/Quaternion.h

@@ -1,14 +1,14 @@
 /*!
- * \file include/utils/Quaternion.h
+ * \file include/math/Quaternion.h
  * \brief Quaternion
  *
  * \author Mongoose
  */
 
-#ifndef _UTILS_QUATERNION_H_
-#define _UTILS_QUATERNION_H_
+#ifndef _MATH_QUATERNION_H_
+#define _MATH_QUATERNION_H_
 
-#include "utils/math.h"
+#include "math/math.h"
 
 /*!
  * \brief Quaternion

include/utils/Vector3d.h → include/math/Vector3d.h

@@ -1,14 +1,14 @@
 /*!
- * \file include/utils/Vector3d.h
+ * \file include/math/Vector3d.h
  * \brief 3D Math vector
  *
  * \author Mongoose
  */
 
-#ifndef _UTILS_VECTOR3D_H_
-#define _UTILS_VECTOR3D_H_
+#ifndef _MATH_VECTOR3D_H_
+#define _MATH_VECTOR3D_H_
 
-#include "utils/math.h"
+#include "math/math.h"
 
 /*!
  * \brief 3D Math Vector

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

@@ -1,6 +1,6 @@
 /*!
  *
- * \file include/utils/math.h
+ * \file include/math/math.h
  * \brief Vector and Matrix math
  *
  * \author Mongoose
@@ -8,8 +8,8 @@
 
 #include <math.h>
 
-#ifndef _UTILS_MATH_H
-#define _UTILS_MATH_H
+#ifndef _MATH_MATH_H
+#define _MATH_MATH_H
 
 #define HEL_PI           ((float)M_PI) //!< pi
 #define HEL_2_PI         (HEL_PI * 2.0f) //!< pi*2

src/CMakeLists.txt

@@ -65,8 +65,9 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_DEBUG}")
 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OpenRaider_CXX_FLAGS} ${OpenRaider_CXX_FLAGS_RELEASE}")
 
-# Add utils directory
-add_subdirectory (utils)
+# Add subdirectories
+add_subdirectory ("math")
+add_subdirectory ("utils")
 
 # Add Executable
 add_executable (OpenRaider MACOSX_BUNDLE ${SRCS})
@@ -148,7 +149,8 @@ include_directories (SYSTEM ${ZLIB_INCLUDE_DIRS})
 set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 
 # Add utils Library
-set (LIBS ${LIBS} utilities)
+set (LIBS ${LIBS} OpenRaider_math)
+set (LIBS ${LIBS} OpenRaider_utils)
 
 # Link to all found libs
 target_link_libraries (OpenRaider ${LIBS})

src/Sound.cpp

@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include "utils/math.h"
+#include "math/math.h"
 #include "Sound.h"
 
 Sound::Sound() {

src/math/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Source files
+set (MATH_SRCS ${MATH_SRCS} "math.cpp")
+set (MATH_SRCS ${MATH_SRCS} "Matrix.cpp")
+set (MATH_SRCS ${MATH_SRCS} "Quaternion.cpp")
+set (MATH_SRCS ${MATH_SRCS} "Vector3d.cpp")
+
+# Include directory
+include_directories ("${PROJECT_SOURCE_DIR}/include")
+
+# Add library
+add_library (OpenRaider_math ${MATH_SRCS})

src/utils/Matrix.cpp → src/math/Matrix.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file src/utils/Matrix.cpp
+ * \file src/math/Matrix.cpp
  * \brief 3D Matrix
  *
  * \author Mongoose
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "utils/Matrix.h"
+#include "math/Matrix.h"
 
 Matrix::Matrix() {
     setIdentity();

src/utils/Quaternion.cpp → src/math/Quaternion.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file src/utils/Quaternion.cpp
+ * \file src/math/Quaternion.cpp
  * \brief Quaternion
  *
  * \author Mongoose
@@ -7,7 +7,7 @@
 
 #include <math.h>
 
-#include "utils/Quaternion.h"
+#include "math/Quaternion.h"
 
 Quaternion::Quaternion() {
     mW = 0;

src/utils/Vector3d.cpp → src/math/Vector3d.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file src/utils/Vector3d.cpp
+ * \file src/math/Vector3d.cpp
  * \brief 3D Math vector
  *
  * \author Mongoose
@@ -7,7 +7,7 @@
 
 #include <math.h>
 
-#include "utils/Vector3d.h"
+#include "math/Vector3d.h"
 
 Vector3d::Vector3d() {
     mVec[0] = mVec[1] = mVec[2] = 0.0f;

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

@@ -1,6 +1,6 @@
 /*!
  *
- * \file src/utils/math.cpp
+ * \file src/math/math.cpp
  * \brief Vector and Matrix math
  *
  * \author Mongoose
@@ -11,9 +11,9 @@
 #include <float.h>
 #include <assert.h>
 
-#include "utils/Vector3d.h"
-#include "utils/Matrix.h"
-#include "utils/math.h"
+#include "math/Vector3d.h"
+#include "math/Matrix.h"
+#include "math/math.h"
 
 bool equalEpsilon(vec_t a, vec_t b) {
     vec_t epsilon = FLT_EPSILON;

src/utils/CMakeLists.txt

@@ -1,14 +1,10 @@
 # Source files
-set (UTIL_SRCS ${UTIL_SRCS} "math.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "Matrix.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "Quaternion.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "time.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "Vector3d.cpp")
 
 # Include directory
 include_directories ("${PROJECT_SOURCE_DIR}/include")
 
 # Add library
-add_library (utilities ${UTIL_SRCS})
+add_library (OpenRaider_utils ${UTIL_SRCS})