World now also service

include/Game.h

@@ -8,7 +8,7 @@
 #ifndef _GAME_H_
 #define _GAME_H_
 
-#include <list>
+#include <vector>
 
 #include "Camera.h"
 #include "global.h"
@@ -16,10 +16,6 @@
 #include "TombRaider.h"
 #include "World.h"
 
-typedef enum {
-    Flag_DebugModel = (1 << 0)
-} GameFlags;
-
 /*!
  * \brief Game abstraction
  */
@@ -45,7 +41,6 @@ public:
     int command(std::vector<char *> *args);
 
     //! \fixme should be private
-    World mWorld;
     entity_t *mLara;
     Render *mRender;
     Camera *mCamera;
@@ -65,7 +60,6 @@ private:
 
     bool mLoaded;
     char *mName;
-    unsigned int mFlags;
     TombRaider mTombRaider;
 
     unsigned int mTextureStart;

include/OpenRaider.h

@@ -41,8 +41,6 @@ public:
 
     int command(const char *command);
 
-    int initialize();
-
     void run();
 
     void handleKeyboard(KeyboardButton key, bool pressed);

include/main.h

@@ -1,6 +1,6 @@
 /*!
  * \file include/main.h
- * \brief Where main() is
+ * \brief Service locator
  *
  * \author xythobuz
  */
@@ -13,13 +13,21 @@
 #include "OpenRaider.h"
 #include "Sound.h"
 #include "Window.h"
+#include "World.h"
+
+Console &getConsole();
+
+Game &getGame();
+
+Menu &getMenu();
 
-Console    &getConsole();
-Game       &getGame();
-Menu       &getMenu();
 OpenRaider &getOpenRaider();
-Sound      &getSound();
-Window     &getWindow();
+
+Sound &getSound();
+
+Window &getWindow();
+
+World &getWorld();
 
 /*!
  * \brief Program entry point

src/Game.cpp

@@ -13,7 +13,6 @@
 
 #include <algorithm>
 #include <map>
-#include <vector>
 #include <cstdlib>
 
 #include "main.h"
@@ -34,7 +33,6 @@ Game::Game() {
     mLoaded = false;
     mName = NULL;
     mLara = NULL;
-    mFlags = 0;
 
     mTextureStart = 0;
     mTextureLevelOffset = 0;
@@ -70,7 +68,7 @@ int Game::initialize() {
     mRender->setMode(Render::modeLoadScreen);
 
     // Enable World Hopping
-    mWorld.setFlag(World::fEnableHopping);
+    getWorld().setFlag(World::fEnableHopping);
 
     return 0;
 }
@@ -82,7 +80,7 @@ void Game::destroy() {
     mLoaded = false;
     mRender->setMode(Render::modeDisabled);
 
-    mWorld.destroy();
+    getWorld().destroy();
     mRender->ClearWorld();
     getSound().clear(); // Remove all previously loaded sounds
 }
@@ -146,13 +144,13 @@ int Game::loadLevel(const char *level) {
 void Game::handleAction(ActionEvents action, bool isFinished) {
     if (mLoaded) {
         if (action == forwardAction) {
-            mWorld.moveEntity(mLara, 'f');
+            getWorld().moveEntity(mLara, 'f');
         } else if (action == backwardAction) {
-            mWorld.moveEntity(mLara, 'b');
+            getWorld().moveEntity(mLara, 'b');
         } else if (action == leftAction) {
-            mWorld.moveEntity(mLara, 'l');
+            getWorld().moveEntity(mLara, 'l');
         } else if (action == rightAction) {
-            mWorld.moveEntity(mLara, 'r');
+            getWorld().moveEntity(mLara, 'r');
         }
     }
 }
@@ -493,7 +491,7 @@ void Game::processSprites()
                 s_index = sprite_sequence[j].offset;
 
                 r_mesh = new sprite_seq_t;
-                mWorld.addSprite(r_mesh);
+                getWorld().addSprite(r_mesh);
                 r_mesh->num_sprites = -sprite_sequence[j].negative_length;
                 r_mesh->sprite = new sprite_t[r_mesh->num_sprites];
 
@@ -737,7 +735,7 @@ void Game::processMoveable(int index, int i, int *ent,
     }
 
     //! \fixme Check here and see if we already have one for object_id later
-    // if (mWorld.isCachedSkeletalModel(moveable[index].object_id))
+    // if (getWorld().isCachedSkeletalModel(moveable[index].object_id))
     // {
     //   thing->modelId = mRender->add(sModel);
     //   return;
@@ -835,9 +833,9 @@ void Game::processMoveable(int index, int i, int *ent,
     if (!found)
     {
         sModel->model = r_model;
-        mWorld.addEntity(thing);
+        getWorld().addEntity(thing);
 
-        k = mWorld.addModel(r_model);
+        k = getWorld().addModel(r_model);
 
         cache.push_back(j);
         cache2.push_back(r_model);
@@ -901,22 +899,19 @@ void Game::processMoveable(int index, int i, int *ent,
         delete r_model;
         c_model = cache2[foundIndex];
         sModel->model = c_model;
-        mWorld.addEntity(thing);
-        mWorld.addModel(c_model);
+        getWorld().addEntity(thing);
+        getWorld().addModel(c_model);
         printf("c");
         return;
     }
 
     int aloop = mTombRaider.getNumAnimsForMoveable(index);
 
-#ifdef DEBUG
-    if (mFlags & Flag_DebugModel)
-    {
-        printf("\nanimation = %i, num_animations = %i\n",
-                moveable[index].animation, aloop);
-        printf("\nitem[%i].flags = %i\nentity[%i]\n",
-                i, item[i].flags, thing->id);
-    }
+#ifdef DEBUG_MOVEABLE
+    printf("\nanimation = %i, num_animations = %i\n",
+            moveable[index].animation, aloop);
+    printf("\nitem[%i].flags = %i\nentity[%i]\n",
+            i, item[i].flags, thing->id);
 #endif
 
     //a = moveable[index].animation;
@@ -933,28 +928,25 @@ void Game::processMoveable(int index, int i, int *ent,
         frame_count = (animation[a].frame_end - animation[a].frame_start) + 1;
         animation_frame->rate = animation[a].frame_rate;
 
-#ifdef DEBUG
-        if (mFlags & Flag_DebugModel)
-        {
-            printf("animation[%i] state and unknowns = %i, %i, %i, %i, %i\n",
-                    a, animation[a].state_id, animation[a].unknown1,
-                    animation[a].unknown2, animation[a].unknown3,
-                    animation[a].unknown4);
-            printf("animation[%i].frame_rate = %i\n",
-                    a, animation[a].frame_rate);
-            printf("animation[%i].next_animation = %i\n",
-                    a, animation[a].next_animation);
-            printf("animation[%i].frame_offset = %u\n",
-                    a, animation[a].frame_offset);
-            printf("animation[%i].anim_command = %i\n",
-                    a, animation[a].anim_command);
-            printf("animation[%i].num_anim_commands = %i\n",
-                    a, animation[a].num_anim_commands);
-            printf("animation[%i].state_change_offset = %i\n",
-                    a, animation[a].state_change_offset);
-            printf("              frame_offset = %u\n",
-                    frame_offset);
-        }
+#ifdef DEBUG_MOVEABLE
+        printf("animation[%i] state and unknowns = %i, %i, %i, %i, %i\n",
+                a, animation[a].state_id, animation[a].unknown1,
+                animation[a].unknown2, animation[a].unknown3,
+                animation[a].unknown4);
+        printf("animation[%i].frame_rate = %i\n",
+                a, animation[a].frame_rate);
+        printf("animation[%i].next_animation = %i\n",
+                a, animation[a].next_animation);
+        printf("animation[%i].frame_offset = %u\n",
+                a, animation[a].frame_offset);
+        printf("animation[%i].anim_command = %i\n",
+                a, animation[a].anim_command);
+        printf("animation[%i].num_anim_commands = %i\n",
+                a, animation[a].num_anim_commands);
+        printf("animation[%i].state_change_offset = %i\n",
+                a, animation[a].state_change_offset);
+        printf("              frame_offset = %u\n",
+                frame_offset);
 #endif
 
         // Get all the frames for aniamtion
@@ -997,12 +989,9 @@ void Game::processMoveable(int index, int i, int *ent,
                 }
             }
 
-#ifdef DEBUG
-            if (mFlags & Flag_DebugModel)
-            {
-                printf("animation[%i].boneframe[%u] = offset %u, step %i\n",
-                        a, f, frame_offset, frame_step);
-            }
+#ifdef DEBUG_MOVEABLE
+            printf("animation[%i].boneframe[%u] = offset %u, step %i\n",
+                    a, f, frame_offset, frame_step);
 #endif
 
             // Mongoose 2002.08.15, Was
@@ -1165,7 +1154,7 @@ void Game::processModels()
         if (index < 0 || !mTombRaider.isMeshValid(index))
         {
             //! \fixme allow sparse lists with matching ids instead?
-            mWorld.addMesh(NULL); // Filler, to make meshes array ids align
+            getWorld().addMesh(NULL); // Filler, to make meshes array ids align
             //printf("x");
             //fflush(stdout);
             return;
@@ -1347,7 +1336,7 @@ void Game::processModels()
         std::sort(mesh->texturedRectangles.begin(), mesh->texturedRectangles.end(), compareFaceTextureId);
         std::sort(mesh->coloredRectangles.begin(), mesh->coloredRectangles.end(), compareFaceTextureId);
 
-        mWorld.addMesh(mesh);
+        getWorld().addMesh(mesh);
         //printf(".");
         //fflush(stdout);
     }
@@ -1367,7 +1356,7 @@ void Game::processRooms()
         if (!mTombRaider.isRoomValid(index))
         {
             getConsole().print("WARNING: Handling invalid vertex array in room");
-            mWorld.addRoom(0x0);
+            getWorld().addRoom(0x0);
             mRender->addRoom(0x0);
 
             //printf("x");
@@ -1908,7 +1897,7 @@ void Game::processRooms()
             r_mesh->sprites.push_back(sprite);
         }
 
-        mWorld.addRoom(r_mesh);
+        getWorld().addRoom(r_mesh);
 
         rRoom->room = r_mesh;
         mRender->addRoom(rRoom);

src/Render.cpp

@@ -544,10 +544,10 @@ void Render::Display()
         camPos[0] -= (1024.0f * sinf(yaw));
         camPos[2] -= (1024.0f * cosf(yaw));
 
-        sector = getGame().mWorld.getSector(index, camPos[0], camPos[2]);
+        sector = getWorld().getSector(index, camPos[0], camPos[2]);
 
         // Handle camera out of world
-        if (sector < 0 || getGame().mWorld.isWall(index, sector))
+        if (sector < 0 || getWorld().isWall(index, sector))
         {
             camPos[0] = curPos[0] + (64.0f * sinf(yaw));
             camPos[1] -= 64.0f;
@@ -642,7 +642,7 @@ void Render::Display()
     {
         entity_t *e;
         std::vector<entity_t *> entityRenderList;
-        std::vector<entity_t *> *entities = getGame().mWorld.getEntities();
+        std::vector<entity_t *> *entities = getWorld().getEntities();
 
         for (unsigned int i = 0; i < entities->size(); i++)
         {
@@ -956,7 +956,7 @@ void Render::buildRoomRenderList(RenderRoom *rRoom)
 
 void Render::drawSkyMesh(float scale)
 {
-    skeletal_model_t *model = getGame().mWorld.getModel(mSkyMesh);
+    skeletal_model_t *model = getWorld().getModel(mSkyMesh);
 
 
     if (!model)
@@ -973,7 +973,7 @@ void Render::drawSkyMesh(float scale)
     glTranslated(0.0, 1000.0, 0.0);
     glScaled(scale, scale, scale);
     //drawModel(model);
-    //drawModelMesh(getGame().mWorld.getMesh(mSkyMesh), );
+    //drawModelMesh(getWorld().getMesh(mSkyMesh), );
     glPopMatrix();
     glEnable(GL_DEPTH_TEST);
 }
@@ -1041,7 +1041,7 @@ void Render::drawObjects()
     {
         std::vector<sprite_seq_t *> *sprites;
 
-        sprites = getGame().mWorld.getSprites();
+        sprites = getWorld().getSprites();
 
         for (unsigned int i = 0; i < sprites->size(); i++)
         {
@@ -1161,7 +1161,7 @@ void Render::drawModel(SkeletalModel *model)
 
                 if (tag2)
                 {
-                    drawModelMesh(getGame().mWorld.getMesh(tag2->mesh), Render::skeletalMesh);
+                    drawModelMesh(getWorld().getMesh(tag2->mesh), Render::skeletalMesh);
                 }
             }
         }
@@ -1204,19 +1204,19 @@ void Render::drawModel(SkeletalModel *model)
                     {
                         glPushMatrix();
                         glTranslatef(mdl->ponyOff2, 0.0, 0.0);
-                        drawModelMesh(getGame().mWorld.getMesh(mdl->ponytailMeshId + i),
+                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i),
                                 Render::skeletalMesh);
                         glPopMatrix();
 
                         glPushMatrix();
                         glTranslatef(-mdl->ponyOff2, 0.0, 0.0);
-                        drawModelMesh(getGame().mWorld.getMesh(mdl->ponytailMeshId + i),
+                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i),
                                 Render::skeletalMesh);
                         glPopMatrix();
                     }
                     else
                     {
-                        drawModelMesh(getGame().mWorld.getMesh(mdl->ponytailMeshId + i),
+                        drawModelMesh(getWorld().getMesh(mdl->ponytailMeshId + i),
                                 Render::skeletalMesh);
                     }
                 }
@@ -1230,7 +1230,7 @@ void Render::drawModel(SkeletalModel *model)
             }
         }
 
-        drawModelMesh(getGame().mWorld.getMesh(tag->mesh), Render::skeletalMesh);
+        drawModelMesh(getWorld().getMesh(tag->mesh), Render::skeletalMesh);
     }
 
     // Cycle frames ( cheap hack from old ent state based system )
@@ -1612,7 +1612,7 @@ void Render::drawRoomModel(static_model_t *mesh)
     if (!mesh)
         return;
 
-    r_mesh = getGame().mWorld.getMesh(mesh->index);
+    r_mesh = getWorld().getMesh(mesh->index);
 
     if (!r_mesh)
         return;
@@ -1862,7 +1862,7 @@ void Render::ViewModel(entity_t *ent, int index)
         return;
     }
 
-    model = getGame().mWorld.getModel(index);
+    model = getWorld().getModel(index);
 
     if (model)
     {

src/main.cpp

@@ -8,6 +8,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+#include <assert.h>
 
 #include "config.h"
 #include "main.h"
@@ -20,31 +21,43 @@ Menu *gMenu = NULL;
 OpenRaider *gOpenRaider = NULL;
 Sound *gSound = NULL;
 Window *gWindow = NULL;
+World *gWorld = NULL;
 
 Console &getConsole() {
+    assert(gConsole != NULL);
     return *gConsole;
 }
 
 Game &getGame() {
+    assert(gGame != NULL);
     return *gGame;
 }
 
 Menu &getMenu() {
+    assert(gMenu != NULL);
     return *gMenu;
 }
 
 OpenRaider &getOpenRaider() {
+    assert(gOpenRaider != NULL);
     return *gOpenRaider;
 }
 
 Sound &getSound() {
+    assert(gSound != NULL);
     return *gSound;
 }
 
 Window &getWindow() {
+    assert(gWindow != NULL);
     return *gWindow;
 }
 
+World &getWorld() {
+    assert(gWorld != NULL);
+    return *gWorld;
+}
+
 void cleanupHandler(void) {
     if (gConsole)
         delete gConsole;
@@ -55,6 +68,9 @@ void cleanupHandler(void) {
     if (gMenu)
         delete gMenu;
 
+    if (gWorld)
+        delete gWorld;
+
     if (gOpenRaider)
         delete gOpenRaider;
 
@@ -110,6 +126,7 @@ int main(int argc, char *argv[]) {
     gOpenRaider = new OpenRaider();
     gWindow = new WindowSDL();
     gSound = new Sound();
+    gWorld = new World();
     gConsole = new Console();
     gMenu = new Menu();
     gGame = new Game();