Removed unused code

README.md

@@ -11,7 +11,7 @@ It seems as if OpenRaider will currently only work on Little-Endian platforms. T
 ## Configuration
 
 OpenRaider needs some configuration files, and level data and assets from custom levels or the Tomb Raider games.
-These are stored in `~/.OpenRaider`. Running the included `setup.sh` will create/copy the necessary files and directories.
+These are stored in `~/.OpenRaider`. Running `make setup` will create/copy the necessary files and directories.
 
 You still need to add level files in `~/.OpenRaider/paks/` and add them to `~/.OpenRaider/OpenRaider.init`.
 Dust off your old Tomb Raider CDs or grab some [custom levels](http://www.aspidetr.com/levels/yvel-woods-v1-5/) from the interwebs.
@@ -79,7 +79,7 @@ A Doxygen API documentation can be created with `make doc`.
 ### Configuration file
 
 OpenRaider will try to load `~/.OpenRaider/OpenRaider.init` or, if it doesn't exist, `OpenRaider.init` from the current directory.
-Running `make setup` or the `cmake/setup.sh` script will create a minimal configuration in your home directory.
+Running `make setup` will create a minimal configuration in your home directory.
 
 The configuration file format is very simple:
 * Anything following a `#` up to the next `\n` will be ignored.

include/Render.h

@@ -37,11 +37,6 @@ public:
         typeDirectional = 3  //!< Directional light
     } LightType;
 
-    // These aren't used anywhere? -- xythobuz
-    //float mAmbient[4]; //! Ambient color
-    //float mDiffuse[4]; //! Diffuse color
-    //float mSpecular[4]; //! Specular color
-
     vec4_t mPos; //! Light position in 3 space
     vec3_t mDir; //! Light direction
     float mAtt;
@@ -62,7 +57,6 @@ public:
     RenderRoom() {
         room = 0x0;
         dist = 0.0f;
-        center[0] = center[1] = center[2] = 0.0f;
     }
 
     /*!
@@ -73,17 +67,7 @@ public:
         //lights.erase();
     }
 
-    /*!
-     * \brief Computes central point of room.
-     * Result is stored in center member variable.
-     */
-    void computeCenter() {
-        if (room)
-            helMidpoint3v(room->bbox_min, room->bbox_max, center);
-    }
-
     vec_t dist;             //!< Distance to near plane, move to room?
-    vec3_t center;          //!< Center of bbox, move to room?
     Vector<Light *> lights; //!< List of lights in this room
     Mesh mesh;              //!< OpenGL mesh that represents this room
 

include/utils/math.h

@@ -8,8 +8,8 @@
 
 #include <math.h>
 
-#ifndef _MATMATH_H
-#define _MATMATH_H
+#ifndef _UTILS_MATH_H
+#define _UTILS_MATH_H
 
 #define HEL_PI           ((float)M_PI) //!< pi
 #define HEL_2_PI         (HEL_PI * 2.0f) //!< pi*2

include/utils/tga.h

@@ -5,10 +5,8 @@
  * \author Mongoose
  * \author xythobuz
  */
-#ifndef _TGA_H
-#define _TGA_H
-
-#include <stdio.h>
+#ifndef _UTILS_TGA_H
+#define _UTILS_TGA_H
 
 /*!
  * \brief Possible TGA image types

src/OpenRaider.cpp

@@ -2259,7 +2259,6 @@ void OpenRaider::processRoom(int index)
     room_mesh_t *r_mesh = NULL;
     RenderRoom *rRoom = NULL;
 #ifdef MATRIX_TRANSFORMS
-    //matrix_t transform;
     Matrix transform;
 #endif
 
@@ -2293,12 +2292,8 @@ void OpenRaider::processRoom(int index)
 
     // Mongoose 2002.04.03, Setup 3d transform
 #ifdef MATRIX_TRANSFORMS
-    //mtkMatrixIdentity(transform);
-    //mtkMatrixTranslate(transform,
-    //                       r_mesh->pos[0], r_mesh->pos[1], r_mesh->pos[2]);
     transform.setIdentity();
     transform.translate(r_mesh->pos);
-#else
 #endif
 
     // Setup portals
@@ -2328,7 +2323,6 @@ void OpenRaider::processRoom(int index)
 
             // Relative coors in vis portals
 #ifdef MATRIX_TRANSFORMS
-            //mtkMatrixTransform(transform, portal->vertices[j]);
             transform.multiply3v(portal->vertices[j], portal->vertices[j]);
 #else
             portal->vertices[j][0] += r_mesh->pos[0];

src/Render.cpp

@@ -807,10 +807,6 @@ void Render::Display()
             v[1] = u[1] + (9000.0f * sinf(LARA->angles[2]));
             v[2] = u[2] + (9000.0f * cosf(LARA->angles[1]));
 
-            //mtkVectorSubtract(u, v, t);
-            //mtkVectorSubtract(u, curPos, s);
-            //printf("* %f rad\n", LARA->angles[1]);
-
             // Test tracing of aim
             renderTrace(0, u, v); // v = target
         }

src/utils/math.cpp

@@ -16,7 +16,7 @@
 
 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))
+    if (fabs(a - b) <= (fmax(fabs(a), fabs(b)) * epsilon))
         return true;
     return false;
 }
@@ -41,14 +41,10 @@ int helIntersectionLineAndPolygon(vec3_t intersect,
     pB = Vector3d(p2);
 
     // Find normal
-    //mtkVectorSubtract(polygon[1], polygon[0], a);
     a = Vector3d(polygon[1]) - Vector3d(polygon[0]);
-    //mtkVectorSubtract(polygon[2], polygon[0], b);
     b = Vector3d(polygon[2]) - Vector3d(polygon[0]);
     normal = Vector3d::cross(a, b);
-    //mtkVectorCrossProduct(a, b, normal);
     normal.normalize();
-    //mtkVectorNormalize(normal, normal);
 
     // find D
     //d = (normal[0] * polygon[0][0] -
@@ -59,7 +55,6 @@ int helIntersectionLineAndPolygon(vec3_t intersect,
             normal.mVec[2] * polygon[0][2]);
 
     // line segment parallel to plane?
-    //mtkVectorSubtract(p2, p1, a); // cache p2 - p1 => a
     a = pB - pA;
 
     //denominator = (normal[0] * a[0] +
@@ -88,30 +83,11 @@ int helIntersectionLineAndPolygon(vec3_t intersect,
 
 
     // See if the intercept is bound by polygon by winding number
-#ifdef WINDING_NUMBERS_TRIANGLE
-    mtkVectorSubtract(polygon[0], intersect, a);
-    mtkVectorNormalize(a, a);
-    mtkVectorSubtract(polygon[1], intersect, b);
-    mtkVectorNormalize(b, b);
-    mtkVectorSubtract(polygon[2], intersect, c);
-    mtkVectorNormalize(c, c);
-
-    t0 = mtkVectorDotProduct(a, b);
-    t1 = mtkVectorDotProduct(b, c);
-    t2 = mtkVectorDotProduct(c, a);
-
-    total = HEL_RAD_TO_DEG(acos(t0) + acos(t1) + acos(t2));
-
-    if (total - 360 < 0.0)
-        return 0;
-#else // assume convex polygons here for sure
-    //mtkVectorSubtract(intersect, polygon[0], a);
-    //theta = mtkVectorDotProduct(a, normal);
+    // assume convex polygons here for sure
     double theta = Vector3d::dot(b - Vector3d(polygon[0]), normal); // b = intersect
 
     if (theta >= 90.0) // Yeah I know
         return 0;
-#endif
 
     return 1;
 }

src/utils/tga.cpp

@@ -8,6 +8,7 @@
  * \author xythobuz
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdarg.h>