Implemented all missing new methods. Builds and runs!

ChangeLog.md

@@ -6,6 +6,9 @@
     * Forcing use of new Room and Sprite classes in World.
     * Rewrote Sprite loading code in Game
     * Rewrote Room loading code in Game
+    * Rewrote Render handling of Sprites, Rooms, Static Models, ...
+    * No longer using second list of RenderRooms
+    * Sprites and Static Models draw themselves
 
     [ 20140503 ]
     * Started big World-Data refactoring.

src/Room.cpp

@@ -14,10 +14,23 @@
 #endif
 
 #include <algorithm>
+#include <assert.h>
 
 #include "main.h"
 #include "Room.h"
 
+Light::Light(vec4_t pos, vec3_t dir, vec_t att, vec4_t color, vec_t cutoff, LightType type) {
+    for (unsigned int i = 0; i < 4; i++) {
+        mPos[i] = pos[i];
+        mColor[i] = color[i];
+        if (i < 3)
+            mDir[i] = dir[i];
+    }
+    mAtt = att;
+    mCutoff = cutoff;
+    mType = type;
+}
+
 StaticModel::StaticModel(int _index, vec_t _yaw, vec3_t _pos) {
     index = _index;
     yaw = _yaw;
@@ -62,6 +75,18 @@ Portal::Portal(vec3_t _vertices[4], vec3_t _normal, int _adjoiningRoom) {
     adjoiningRoom = _adjoiningRoom;
 }
 
+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(vec3_t _a, vec3_t _b, vec3_t _c, vec3_t _d) {
     for (unsigned int i = 0; i < 3; i++) {
         a[i] = _a[i];
@@ -77,6 +102,18 @@ Sector::Sector(vec_t _floor, vec_t _ceiling, bool _wall) {
     wall = _wall;
 }
 
+vec_t Sector::getFloor() {
+    return floor;
+}
+
+vec_t Sector::getCeiling() {
+    return ceiling;
+}
+
+bool Sector::isWall() {
+    return wall;
+}
+
 Room::Room(int _id) {
     id = _id;
     flags = 0;
@@ -110,7 +147,157 @@ Room::~Room() {
     }
 }
 
+void Room::setFlags(unsigned int f) {
+    flags = f;
+}
+
+unsigned int Room::getFlags() {
+    return flags;
+}
+
+void Room::setNumXSectors(unsigned int n) {
+     numXSectors = n;
+}
+
+unsigned int Room::getNumXSectors() {
+    return numXSectors;
+}
+
+void Room::setNumZSectors(unsigned int n) {
+    numZSectors = n;
+}
+
+unsigned int Room::getNumZSectors() {
+    return numZSectors;
+}
+
+void Room::setPos(vec3_t p) {
+    for (unsigned int i = 0; i < 3; i++)
+        pos[i] = p[i];
+}
+
+void Room::getPos(vec3_t p) {
+    for (unsigned int i = 0; i < 3; i++)
+        p[i] = pos[i];
+}
+
+void Room::getBoundingBox(vec3_t box[2]) {
+    for (unsigned int i = 0; i < 2; i++)
+        for (unsigned int j = 0; j < 3; j++)
+            box[i][j] = bbox[i][j];
+}
+
+void Room::setBoundingBox(vec3_t box[2]) {
+    for (unsigned int i = 0; i < 2; i++)
+        for (unsigned int j = 0; j < 3; j++)
+            bbox[i][j] = box[i][j];
+}
+
+bool Room::inBox(vec_t x, vec_t y, vec_t z) {
+    return ((y > bbox[0][1]) && (y < bbox[1][1]) && inBoxPlane(x, z));
+}
+
+bool Room::inBoxPlane(vec_t x, vec_t z) {
+    return ((x > bbox[0][0]) && (x < bbox[1][0])
+            && (z > bbox[0][2]) && (z < bbox[1][2]));
+}
+
+unsigned int Room::sizeAdjacentRooms() {
+    return adjacentRooms.size();
+}
+
+int Room::getAdjacentRoom(unsigned int index) {
+    assert(index < adjacentRooms.size());
+    return adjacentRooms.at(index);
+}
+
+void Room::addAdjacentRoom(int r) {
+    adjacentRooms.push_back(r);
+}
+
+unsigned int Room::sizePortals() {
+    return portals.size();
+}
+
+Portal &Room::getPortal(unsigned int index) {
+    assert(index < portals.size());
+    return *portals.at(index);
+}
+
+void Room::addPortal(Portal &p) {
+    portals.push_back(&p);
+}
+
+unsigned int Room::sizeSectors() {
+    return sectors.size();
+}
+
+Sector &Room::getSector(unsigned int index) {
+    assert(index < sectors.size());
+    return *sectors.at(index);
+}
+
+void Room::addSector(Sector &s) {
+    sectors.push_back(&s);
+}
+
+unsigned int Room::sizeBox() {
+    return boxes.size();
+}
+
+Box &Room::getBox(unsigned int index) {
+    assert(index < boxes.size());
+    return *boxes.at(index);
+}
+
+void Room::addBox(Box &b) {
+    boxes.push_back(&b);
+}
+
+unsigned int Room::sizeModels() {
+    return models.size();
+}
+
+StaticModel &Room::getModel(unsigned int index) {
+    assert(index < models.size());
+    return *models.at(index);
+}
+
+void Room::addModel(StaticModel &m) {
+    models.push_back(&m);
+}
+
 void Room::sortModels() {
     std::sort(models.begin(), models.end());
 }
 
+unsigned int Room::sizeLights() {
+    return lights.size();
+}
+
+Light &Room::getLight(unsigned int index) {
+    assert(index < lights.size());
+    return *lights.at(index);
+}
+
+void Room::addLight(Light &l) {
+    lights.push_back(&l);
+}
+
+unsigned int Room::sizeSprites() {
+    return sprites.size();
+}
+
+Sprite &Room::getSprite(unsigned int index) {
+    assert(index < sprites.size());
+    return *sprites.at(index);
+}
+
+void Room::addSprite(Sprite &s) {
+    sprites.push_back(&s);
+}
+
+Mesh &Room::getMesh() {
+    return mesh;
+}
+