Moved Box, Sector,... into extra file

include/Room.h

@@ -15,89 +15,7 @@
 #include "Mesh.h"
 #include "Sprite.h"
 #include "TombRaider.h"
-
-class Light {
-public:
-    /*!
-     * \brief Type a light can be of
-     */
-    typedef enum {
-        typePoint       = 1, //!< Point light
-        typeSpot        = 2, //!< Spot light
-        typeDirectional = 3  //!< Directional light
-    } LightType;
-
-    Light(TombRaider &tr, unsigned int room, unsigned int index);
-
-    void getPos(vec4_t p);
-    void getDir(vec3_t d);
-    vec_t getAtt();
-    void getColor(vec4_t c);
-    vec_t getCutoff();
-    LightType getType();
-
-private:
-    vec4_t pos; //! Light position in 3 space
-    vec3_t dir; //! Light direction
-    vec_t att;
-    vec4_t color; //! Color of light
-    vec_t cutoff; //! Fade out distance
-    LightType type; //! Type of light
-};
-
-class StaticModel {
-public:
-    StaticModel(TombRaider &tr, unsigned int room, unsigned int i);
-    void display();
-
-    // Compares distance to ViewVolume for depth sorting
-    bool operator<(const StaticModel &other);
-
-private:
-    int index;
-    vec_t yaw;
-    vec3_t pos;
-
-    // ?
-    //vec3_t bbox[2];
-};
-
-class Portal {
-public:
-    Portal(TombRaider &tr, unsigned int room, unsigned int index, Matrix &transform);
-
-    void getVertices(vec3_t vert[4]);
-    int getAdjoiningRoom();
-
-private:
-    vec3_t vertices[4];
-    vec3_t normal;
-    int adjoiningRoom;
-};
-
-class Box {
-public:
-    Box(TombRaider &tr, unsigned int room, unsigned int index);
-
-private:
-    vec3_t a;
-    vec3_t b;
-    vec3_t c;
-    vec3_t d;
-};
-
-class Sector {
-public:
-    Sector(TombRaider &tr, unsigned int room, unsigned int index);
-    vec_t getFloor();
-    vec_t getCeiling();
-    bool isWall();
-
-private:
-    vec_t floor;
-    vec_t ceiling;
-    bool wall;
-};
+#include "RoomData.h"
 
 typedef enum {
     RoomFlagUnderWater = (1 << 0)

include/RoomData.h

@@ -0,0 +1,103 @@
+/*!
+ * \file include/RoomData.h
+ * \brief World Room Mesh
+ *
+ * \author xythobuz
+ */
+
+#ifndef _ROOM_DATA_H_
+#define _ROOM_DATA_H_
+
+#include <vector>
+#include <memory>
+#include "math/math.h"
+#include "math/Matrix.h"
+#include "Mesh.h"
+#include "Sprite.h"
+#include "TombRaider.h"
+
+class Light {
+public:
+    /*!
+     * \brief Type a light can be of
+     */
+    typedef enum {
+        typePoint       = 1, //!< Point light
+        typeSpot        = 2, //!< Spot light
+        typeDirectional = 3  //!< Directional light
+    } LightType;
+
+    Light(TombRaider &tr, unsigned int room, unsigned int index);
+
+    void getPos(vec4_t p);
+    void getDir(vec3_t d);
+    vec_t getAtt();
+    void getColor(vec4_t c);
+    vec_t getCutoff();
+    LightType getType();
+
+private:
+    vec4_t pos; //! Light position in 3 space
+    vec3_t dir; //! Light direction
+    vec_t att;
+    vec4_t color; //! Color of light
+    vec_t cutoff; //! Fade out distance
+    LightType type; //! Type of light
+};
+
+class StaticModel {
+public:
+    StaticModel(TombRaider &tr, unsigned int room, unsigned int i);
+    void display();
+
+    // Compares distance to ViewVolume for depth sorting
+    bool operator<(const StaticModel &other);
+
+private:
+    int index;
+    vec_t yaw;
+    vec3_t pos;
+
+    // ?
+    //vec3_t bbox[2];
+};
+
+class Portal {
+public:
+    Portal(TombRaider &tr, unsigned int room, unsigned int index, Matrix &transform);
+
+    void getVertices(vec3_t vert[4]);
+    int getAdjoiningRoom();
+
+private:
+    vec3_t vertices[4];
+    vec3_t normal;
+    int adjoiningRoom;
+};
+
+class Box {
+public:
+    Box(TombRaider &tr, unsigned int room, unsigned int index);
+
+private:
+    vec3_t a;
+    vec3_t b;
+    vec3_t c;
+    vec3_t d;
+};
+
+class Sector {
+public:
+    Sector(TombRaider &tr, unsigned int room, unsigned int index);
+    vec_t getFloor();
+    vec_t getCeiling();
+    bool isWall();
+
+private:
+    vec_t floor;
+    vec_t ceiling;
+    bool wall;
+};
+
+#endif
+

src/CMakeLists.txt

@@ -49,6 +49,7 @@ set (SRCS ${SRCS} "Mesh.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Render.cpp")
 set (SRCS ${SRCS} "Room.cpp")
+set (SRCS ${SRCS} "RoomData.cpp")
 set (SRCS ${SRCS} "SkeletalModel.cpp")
 set (SRCS ${SRCS} "Sound.cpp")
 set (SRCS ${SRCS} "Sprite.cpp")

src/Render.cpp

@@ -1218,7 +1218,6 @@ void Render::drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type)
     texture_tri_t *ttri;
     int lastTexture = -1;
 
-
     // If they pass NULL structs let it hang up - this is tmp
 
     //! \fixme Duh, vis tests need to be put back
@@ -1227,47 +1226,6 @@ void Render::drawModelMesh(model_mesh_t *r_mesh, RenderMeshType type)
     //   return;
     //}
 
-#ifdef USE_GL_ARRAYS
-    // Setup Arrays ( move these to another method depends on mMode )
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glVertexPointer(3, GL_FLOAT, 0, r_mesh->vertices);
-
-    if (r_mesh->normals)
-    {
-        glEnableClientState(GL_NORMAL_ARRAY);
-        glNormalPointer(3, GL_FLOAT, 0, r_mesh->normals);
-    }
-
-    if (r_mesh->colors)
-    {
-        glEnableClientState(GL_COLOR_ARRAY);
-        glColorPointer(4, GL_FLOAT, 0, r_mesh->colors);
-    }
-
-    //glTexCoordPointer(2, GL_FLOAT, 0, ttri->st);
-    //glDrawArrays(GL_TRIANGLES, i * 3, 3 * j);
-
-    glBegin(GL_TRIANGLES);
-
-    for (unsigned int i = 0; i < r_mesh->texturedTriangles.size(); i++)
-    {
-        ttri = r_mesh->texturedTriangles[i];
-
-        if (!ttri)
-            continue;
-
-        for (k = 0; k < 4; ++k)
-        {
-            index = mQuads[i].quads[j*4+k];
-            glTexCoord2fv(mQuads[i].texcoors[j*4+k]);
-            glArrayElement(mVertices[index]);
-        }
-    }
-
-    glEnd();
-#endif
-
-
     //! \fixme 'AMBIENT' -- Mongoose 2002.01.08
     glColor3fv(WHITE);
 

src/Room.cpp

@@ -5,159 +5,12 @@
  * \author xythobuz
  */
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif
-
 #include <algorithm>
 #include <assert.h>
 
 #include "main.h"
 #include "Room.h"
 
-#ifndef EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
-#define TextureLimit 24
-#endif
-
-Light::Light(TombRaider &tr, unsigned int room, unsigned int index) {
-    unsigned int lightFlags, lightType;
-
-    tr.getRoomLight(room, index, pos, color,
-            dir, &att, &cutoff, &lightType, &lightFlags);
-
-    switch (lightType) {
-        case tombraiderLight_typeDirectional:
-            type = Light::typeDirectional;
-            break;
-        case tombraiderLight_typeSpot:
-            type = Light::typeSpot;
-            break;
-        case tombraiderLight_typePoint:
-        default:
-            type = Light::typePoint;
-    }
-
-    //! \todo Light flags?
-}
-
-void Light::getPos(vec4_t p) {
-    p[0] = pos[0];
-    p[1] = pos[1];
-    p[2] = pos[2];
-    p[3] = pos[3];
-}
-
-void Light::getDir(vec3_t d) {
-    d[0] = dir[0];
-    d[1] = dir[1];
-    d[2] = dir[2];
-}
-
-vec_t Light::getAtt() {
-    return att;
-}
-
-void Light::getColor(vec4_t c) {
-    c[0] = color[0];
-    c[1] = color[1];
-    c[2] = color[2];
-    c[3] = color[3];
-}
-
-vec_t Light::getCutoff() {
-    return cutoff;
-}
-
-Light::LightType Light::getType() {
-    return type;
-}
-
-StaticModel::StaticModel(TombRaider &tr, unsigned int room, unsigned int i) {
-    tr.getRoomModel(room, i, &index, pos, &yaw);
-}
-
-void StaticModel::display() {
-    model_mesh_t *mesh = getWorld().getMesh(index);
-
-    if (!mesh)
-        return;
-
-    if (!getRender().isVisible(pos[0], pos[1], pos[2], mesh->radius))
-        return;
-
-    glPushMatrix();
-    glTranslated(pos[0], pos[1], pos[2]);
-    glRotated(yaw, 0, 1, 0);
-
-    getRender().drawModelMesh(mesh, Render::roomMesh);
-    glPopMatrix();
-}
-
-bool StaticModel::operator<(const StaticModel &other) {
-    vec_t distA, distB;
-    distA = getRender().mViewVolume.getDistToSphereFromNear(pos[0],
-            pos[1], pos[2], 128.0f);
-    distB = getRender().mViewVolume.getDistToSphereFromNear(other.pos[0],
-            other.pos[1], other.pos[2], 128.0f);
-    return (distA < distB);
-}
-
-Portal::Portal(TombRaider &tr, unsigned int room, unsigned int index, Matrix &transform) {
-    float portalVertices[12];
-    tr.getRoomPortal(room, index, &adjoiningRoom, normal, portalVertices);
-    for (unsigned int j = 0; j < 4; ++j) {
-        vertices[j][0] = portalVertices[j*3];
-        vertices[j][1] = portalVertices[j*3+1];
-        vertices[j][2] = portalVertices[j*3+2];
-
-        // Relative coors in vis portals
-        transform.multiply3v(vertices[j], vertices[j]);
-    }
-}
-
-void Portal::getVertices(vec3_t vert[4]) {
-    for (unsigned int i = 0; i < 4; i++) {
-        for (unsigned int j = 0; j < 3; j++) {
-            vert[i][j] = vertices[i][j];
-        }
-    }
-}
-
-int Portal::getAdjoiningRoom() {
-    return adjoiningRoom;
-}
-
-Box::Box(TombRaider &tr, unsigned int room, unsigned int index) {
-    tr.getRoomBox(room, index, a, b, c, d);
-}
-
-Sector::Sector(TombRaider &tr, unsigned int room, unsigned int index) {
-    unsigned int sectorFlags;
-    int floorDataIndex, boxIndex, roomBelow, roomAbove;
-
-    tr.getRoomSector(room, index, &sectorFlags,
-            &ceiling, &floor, &floorDataIndex, &boxIndex,
-            &roomBelow, &roomAbove);
-
-    wall = (sectorFlags & tombraiderSector_wall);
-}
-
-vec_t Sector::getFloor() {
-    return floor;
-}
-
-vec_t Sector::getCeiling() {
-    return ceiling;
-}
-
-bool Sector::isWall() {
-    return wall;
-}
-
 Room::Room(TombRaider &tr, unsigned int index) {
     Matrix transform;
 
@@ -218,13 +71,13 @@ Room::Room(TombRaider &tr, unsigned int index) {
     for (unsigned int i = 0; i < count; i++)
         sprites.push_back(new Sprite(tr, index, i));
 
-//#define EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
+#define EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
 #ifdef EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
     unsigned int vertexCount, normalCount, colorCount, triCount;
     vec_t *vertexArray;
     vec_t *normalArray;
     vec_t *colorArray;
-    unsigned int *indices, *flags;
+    unsigned int *indices, *fflags;
     float *texCoords;
     int *textures;
 
@@ -233,16 +86,17 @@ Room::Room(TombRaider &tr, unsigned int index) {
             &normalCount, &normalArray,
             &colorCount, &colorArray);
 
-    mesh.bufferVertexArray(vertexCount, (vec_t *)vertexArray);
-    mesh.bufferNormalArray(normalCount, (vec_t *)normalArray);
-    mesh.bufferColorArray(vertexCount, (vec_t *)colorArray);
+    mesh.bufferVertexArray(vertexCount, vertexArray);
+    mesh.bufferNormalArray(normalCount, normalArray);
+    mesh.bufferColorArray(vertexCount, colorArray);
 
     tr.getRoomTriangles(index, getGame().getTextureStart(),
             &triCount, &indices, &texCoords, &textures,
-            &flags);
+            &fflags);
 
-    mesh.bufferTriangles(triCount, indices, texCoords, textures, flags);
+    mesh.bufferTriangles(triCount, indices, texCoords, textures, fflags);
 #else
+    const unsigned int TextureLimit = 24;
     float rgba[4];
     float xyz[3];
 

src/RoomData.cpp

@@ -0,0 +1,153 @@
+/*!
+ * \file src/RoomData.cpp
+ * \brief World Room Mesh
+ *
+ * \author xythobuz
+ */
+
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
+
+#include "main.h"
+#include "RoomData.h"
+
+Light::Light(TombRaider &tr, unsigned int room, unsigned int index) {
+    unsigned int lightFlags, lightType;
+
+    tr.getRoomLight(room, index, pos, color,
+            dir, &att, &cutoff, &lightType, &lightFlags);
+
+    switch (lightType) {
+        case tombraiderLight_typeDirectional:
+            type = Light::typeDirectional;
+            break;
+        case tombraiderLight_typeSpot:
+            type = Light::typeSpot;
+            break;
+        case tombraiderLight_typePoint:
+        default:
+            type = Light::typePoint;
+    }
+
+    //! \todo Light flags?
+}
+
+void Light::getPos(vec4_t p) {
+    p[0] = pos[0];
+    p[1] = pos[1];
+    p[2] = pos[2];
+    p[3] = pos[3];
+}
+
+void Light::getDir(vec3_t d) {
+    d[0] = dir[0];
+    d[1] = dir[1];
+    d[2] = dir[2];
+}
+
+vec_t Light::getAtt() {
+    return att;
+}
+
+void Light::getColor(vec4_t c) {
+    c[0] = color[0];
+    c[1] = color[1];
+    c[2] = color[2];
+    c[3] = color[3];
+}
+
+vec_t Light::getCutoff() {
+    return cutoff;
+}
+
+Light::LightType Light::getType() {
+    return type;
+}
+
+StaticModel::StaticModel(TombRaider &tr, unsigned int room, unsigned int i) {
+    tr.getRoomModel(room, i, &index, pos, &yaw);
+}
+
+void StaticModel::display() {
+    model_mesh_t *mesh = getWorld().getMesh(index);
+
+    if (!mesh)
+        return;
+
+    if (!getRender().isVisible(pos[0], pos[1], pos[2], mesh->radius))
+        return;
+
+    glPushMatrix();
+    glTranslated(pos[0], pos[1], pos[2]);
+    glRotated(yaw, 0, 1, 0);
+
+    getRender().drawModelMesh(mesh, Render::roomMesh);
+    glPopMatrix();
+}
+
+bool StaticModel::operator<(const StaticModel &other) {
+    vec_t distA, distB;
+    distA = getRender().mViewVolume.getDistToSphereFromNear(pos[0],
+            pos[1], pos[2], 128.0f);
+    distB = getRender().mViewVolume.getDistToSphereFromNear(other.pos[0],
+            other.pos[1], other.pos[2], 128.0f);
+    return (distA < distB);
+}
+
+Portal::Portal(TombRaider &tr, unsigned int room, unsigned int index, Matrix &transform) {
+    float portalVertices[12];
+    tr.getRoomPortal(room, index, &adjoiningRoom, normal, portalVertices);
+    for (unsigned int j = 0; j < 4; ++j) {
+        vertices[j][0] = portalVertices[j*3];
+        vertices[j][1] = portalVertices[j*3+1];
+        vertices[j][2] = portalVertices[j*3+2];
+
+        // Relative coors in vis portals
+        transform.multiply3v(vertices[j], vertices[j]);
+    }
+}
+
+void Portal::getVertices(vec3_t vert[4]) {
+    for (unsigned int i = 0; i < 4; i++) {
+        for (unsigned int j = 0; j < 3; j++) {
+            vert[i][j] = vertices[i][j];
+        }
+    }
+}
+
+int Portal::getAdjoiningRoom() {
+    return adjoiningRoom;
+}
+
+Box::Box(TombRaider &tr, unsigned int room, unsigned int index) {
+    tr.getRoomBox(room, index, a, b, c, d);
+}
+
+Sector::Sector(TombRaider &tr, unsigned int room, unsigned int index) {
+    unsigned int sectorFlags;
+    int floorDataIndex, boxIndex, roomBelow, roomAbove;
+
+    tr.getRoomSector(room, index, &sectorFlags,
+            &ceiling, &floor, &floorDataIndex, &boxIndex,
+            &roomBelow, &roomAbove);
+
+    wall = (sectorFlags & tombraiderSector_wall);
+}
+
+vec_t Sector::getFloor() {
+    return floor;
+}
+
+vec_t Sector::getCeiling() {
+    return ceiling;
+}
+
+bool Sector::isWall() {
+    return wall;
+}
+