Started world refactoring

ChangeLog.md

@@ -2,6 +2,11 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140503 ]
+    * Started big World-Data refactoring.
+      - Created Sprite class with drawing code from Render
+      - Created Room, Portal, Box, Sector, StaticModel classes
+
 	[ 20140501 ]
 	* Fix compiling with gcc on Arch Linux
 	- carstene1ns <dev@f4ke.de>

include/Render.h

@@ -192,15 +192,6 @@ public:
 
     unsigned int getFlags();
 
-    //! \fixme should be private
-
-    ViewVolume mViewVolume; //!< View Volume for frustum culling
-    std::vector<SkeletalModel *> mModels;
-
-private:
-
-    void drawLoadScreen();
-
     /*!
      * \brief Check if a bounding box is in the View Volume
      * \param bboxMin Start coordinates of a valid bounding box
@@ -228,6 +219,15 @@ private:
      */
     bool isVisible(float x, float y, float z, float radius);
 
+    //! \fixme should be private
+
+    ViewVolume mViewVolume; //!< View Volume for frustum culling
+    std::vector<SkeletalModel *> mModels;
+
+private:
+
+    void drawLoadScreen();
+
     /*!
      * \brief Build a visible room list starting at index
      * \param index valid room index where to start the list

include/Room.h

@@ -0,0 +1,86 @@
+/*!
+ * \file include/Room.h
+ * \brief World Room Mesh
+ *
+ * \author xythobuz
+ */
+
+#ifndef _ROOM_H_
+#define _ROOM_H_
+
+#include <vector>
+#include <memory>
+#include "math/math.h"
+#include "Sprite.h"
+
+class StaticModel {
+public:
+    StaticModel(int _index, vec_t _yaw, vec3_t _pos);
+
+private:
+    int index;
+    vec_t yaw;
+    vec3_t pos;
+
+    // ?
+    //vec3_t bbox[2];
+};
+
+class Portal {
+public:
+    Portal(vec3_t _vertices[4], vec3_t _normal, int _adjoiningRoom);
+
+private:
+    vec3_t vertices[4];
+    vec3_t normal;
+    int adjoiningRoom;
+};
+
+class Box {
+public:
+    Box(vec3_t _a, vec3_t _b, vec3_t _c, vec3_t _d);
+
+private:
+    vec3_t a;
+    vec3_t b;
+    vec3_t c;
+    vec3_t d;
+};
+
+class Sector {
+public:
+    Sector(vec_t _floor, vec_t _ceiling, bool _wall);
+
+private:
+    vec_t floor;
+    vec_t ceiling;
+    bool wall;
+};
+
+typedef enum {
+    RoomFlagUnderWater = (1 << 0)
+} RoomFlags;
+
+class Room {
+public:
+    Room(int _id);
+    ~Room();
+
+private:
+    int id;
+    unsigned int flags;
+    unsigned int numXSectors;
+    unsigned int numZSectors;
+    vec3_t pos;
+    vec3_t bbox[2];
+
+    std::vector<int> adjacentRooms;
+    std::vector<Sprite *> sprites;
+    std::vector<StaticModel *> models;
+    std::vector<Portal *> portals;
+    std::vector<Box *> boxes;
+    std::vector<Sector *> sectors;
+};
+
+#endif
+

include/Sprite.h

@@ -0,0 +1,28 @@
+/*!
+ * \file include/Sprite.h
+ * \brief World Sprite
+ *
+ * \author xythobuz
+ */
+
+#ifndef _SPRITE_H_
+#define _SPRITE_H_
+
+#include "math/math.h"
+
+class Sprite {
+public:
+    Sprite(int _numVerts, vec3_t _vertex[4], vec2_t _texel[4], vec3_t _pos, vec_t _radius, int _texture);
+    void display();
+
+private:
+    int numVerts;     //!< 4 == Quad, 3 == Triangle, rendered as triangles
+    vec3_t vertex[4];
+    vec2_t texel[4];
+    vec3_t pos;
+    vec_t radius;     //!< \fixme yeah, I know (I don't? --xythobuz)
+    int texture;
+};
+
+#endif
+

src/CMakeLists.txt

@@ -48,8 +48,10 @@ set (SRCS ${SRCS} "Menu.cpp")
 set (SRCS ${SRCS} "Mesh.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Render.cpp")
+set (SRCS ${SRCS} "Room.cpp")
 set (SRCS ${SRCS} "SkeletalModel.cpp")
 set (SRCS ${SRCS} "Sound.cpp")
+set (SRCS ${SRCS} "Sprite.cpp")
 set (SRCS ${SRCS} "Texture.cpp")
 set (SRCS ${SRCS} "TombRaider.cpp")
 set (SRCS ${SRCS} "ViewVolume.cpp")

src/Game.cpp

@@ -25,7 +25,7 @@
 // Old Code compatibility
 #define TexelScale 256.0f
 
-#ifndef EXPERIMENTAL_UNFIFIED_ROOM_GEOMETERY
+#ifndef EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
 #define TextureLimit 24
 #endif
 
@@ -1300,8 +1300,8 @@ void Game::processRooms()
 
         // Room geometery //////////////////////////////////
 
-        //#define EXPERIMENTAL_UNFIFIED_ROOM_GEOMETERY
-#ifdef EXPERIMENTAL_UNFIFIED_ROOM_GEOMETERY
+//#define EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
+#ifdef EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
         unsigned int vertexCount, normalCount, colorCount, triCount;
         vec_t *vertexArray;
         vec_t *normalArray;
@@ -1680,27 +1680,11 @@ void Game::processRooms()
 
             sprite->texture += mTextureStart; // OpenRaider preloads some textures
 
-            sprite->vertex[0].pos[0] = spriteVertices[0];
-            sprite->vertex[0].pos[1] = spriteVertices[1];
-            sprite->vertex[0].pos[2] = spriteVertices[2];
-            sprite->vertex[1].pos[0] = spriteVertices[3];
-            sprite->vertex[1].pos[1] = spriteVertices[4];
-            sprite->vertex[1].pos[2] = spriteVertices[5];
-            sprite->vertex[2].pos[0] = spriteVertices[6];
-            sprite->vertex[2].pos[1] = spriteVertices[7];
-            sprite->vertex[2].pos[2] = spriteVertices[8];
-            sprite->vertex[3].pos[0] = spriteVertices[9];
-            sprite->vertex[3].pos[1] = spriteVertices[10];
-            sprite->vertex[3].pos[2] = spriteVertices[11];
-
-            sprite->texel[0].st[0] = spriteTexCoords[0];
-            sprite->texel[0].st[1] = spriteTexCoords[1];
-            sprite->texel[1].st[0] = spriteTexCoords[2];
-            sprite->texel[1].st[1] = spriteTexCoords[3];
-            sprite->texel[2].st[0] = spriteTexCoords[4];
-            sprite->texel[2].st[1] = spriteTexCoords[5];
-            sprite->texel[3].st[0] = spriteTexCoords[6];
-            sprite->texel[3].st[1] = spriteTexCoords[7];
+            for (j = 0; j < 12; j++)
+                sprite->vertex[j / 3].pos[j % 3] = spriteVertices[j];
+
+            for (j = 0; j < 8; j++)
+                sprite->texel[j / 2].st[j % 2] = spriteTexCoords[j];
 
             r_mesh->sprites.push_back(sprite);
         }

src/Room.cpp

@@ -0,0 +1,71 @@
+/*!
+ * \file src/Room.cpp
+ * \brief World Room Mesh
+ *
+ * \author xythobuz
+ */
+
+#include "Room.h"
+
+StaticModel::StaticModel(int _index, vec_t _yaw, vec3_t _pos) {
+    index = _index;
+    yaw = _yaw;
+    for (unsigned int i = 0; i < 3; i++)
+        pos[i] = _pos[i];
+}
+
+Portal::Portal(vec3_t _vertices[4], vec3_t _normal, int _adjoiningRoom) {
+    for (unsigned int i = 0; i < 3; i++) {
+        vertices[0][i] = _vertices[0][i];
+        vertices[1][i] = _vertices[1][i];
+        vertices[2][i] = _vertices[2][i];
+        vertices[3][i] = _vertices[3][i];
+        normal[i] = _normal[i];
+    }
+    adjoiningRoom = _adjoiningRoom;
+}
+
+Box::Box(vec3_t _a, vec3_t _b, vec3_t _c, vec3_t _d) {
+    for (unsigned int i = 0; i < 3; i++) {
+        a[i] = _a[i];
+        b[i] = _b[i];
+        c[i] = _c[i];
+        d[i] = _d[i];
+    }
+}
+
+Sector::Sector(vec_t _floor, vec_t _ceiling, bool _wall) {
+    floor = _floor;
+    ceiling = _ceiling;
+    wall = _wall;
+}
+
+Room::Room(int _id) {
+    id = _id;
+    flags = 0;
+    numXSectors = 0;
+    numZSectors = 0;
+    pos[0] = pos[1] = pos[2] = 0.0f;
+    bbox[0][0] = bbox[0][1] = bbox[0][2] = 0.0f;
+    bbox[1][0] = bbox[1][1] = bbox[1][2] = 0.0f;
+}
+
+Room::~Room() {
+    unsigned long i;
+
+    for (i = 0; i < sprites.size(); i++)
+        delete sprites[i];
+
+    for (i = 0; i < models.size(); i++)
+        delete models[i];
+
+    for (i = 0; i < portals.size(); i++)
+        delete portals[i];
+
+    for (i = 0; i < boxes.size(); i++)
+        delete boxes[i];
+
+    for (i = 0; i < sectors.size(); i++)
+        delete sectors[i];
+}
+

src/Sprite.cpp

@@ -0,0 +1,94 @@
+/*!
+ * \file src/Sprite.cpp
+ * \brief World Sprite
+ *
+ * \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 "Sprite.h"
+
+Sprite::Sprite(int _numVerts, vec3_t _vertex[4], vec2_t _texel[4], vec3_t _pos, vec_t _radius, int _texture) {
+    numVerts = _numVerts;
+    radius = _radius;
+    texture = _texture;
+    for (unsigned int i = 0; i < 3; i++) {
+        vertex[0][i] = _vertex[0][i];
+        vertex[1][i] = _vertex[1][i];
+        vertex[2][i] = _vertex[2][i];
+        vertex[3][i] = _vertex[3][i];
+        pos[i] = _pos[i];
+        if (i < 2) {
+            texel[0][i] = _texel[0][i];
+            texel[1][i] = _texel[1][i];
+            texel[2][i] = _texel[2][i];
+            texel[3][i] = _texel[3][i];
+        }
+    }
+}
+
+void Sprite::display() {
+    if (!getRender().isVisible(pos[0], pos[1], pos[2],
+                radius))
+        return;
+
+    glPushMatrix();
+    glTranslated(pos[0], pos[1], pos[2]);
+
+    // Sprites must always face camera, because they have no depth =)
+    glRotated(OR_RAD_TO_DEG(getCamera().getRadianYaw()), 0, 1, 0);
+
+    switch (getRender().getMode()) {
+        // No vertex lighting on sprites, as far as I see in specs
+        // So just draw normal texture, no case 2
+        case Render::modeSolid:
+            glBegin(GL_TRIANGLE_STRIP);
+            glColor3f(texel[0][0], texel[0][1], 0.5);
+            glVertex3fv(vertex[0]);
+
+            glColor3f(texel[1][0], texel[1][1], 0.5);
+            glVertex3fv(vertex[1]);
+
+            glColor3f(texel[3][0], texel[3][1], 0.5);
+            glVertex3fv(vertex[3]);
+
+            glColor3f(texel[2][0], texel[2][1], 0.5);
+            glVertex3fv(vertex[2]);
+            glEnd();
+            break;
+        case Render::modeWireframe:
+            glColor3fv(CYAN);
+            glBegin(GL_LINE_LOOP);
+            glVertex3fv(vertex[0]);
+            glVertex3fv(vertex[1]);
+            glVertex3fv(vertex[2]);
+            glVertex3fv(vertex[3]);
+            glEnd();
+            glColor3fv(WHITE);
+            break;
+        default:
+            glBindTexture(GL_TEXTURE_2D, texture+1);
+
+            glBegin(GL_TRIANGLE_STRIP);
+            glTexCoord2fv(texel[0]);
+            glVertex3fv(vertex[0]);
+            glTexCoord2fv(texel[1]);
+            glVertex3fv(vertex[1]);
+            glTexCoord2fv(texel[3]);
+            glVertex3fv(vertex[3]);
+            glTexCoord2fv(texel[2]);
+            glVertex3fv(vertex[2]);
+            glEnd();
+    }
+
+    glPopMatrix();
+}
+