Added game mode command

include/Game.h

@@ -44,6 +44,7 @@ public:
 
     int command(std::vector<char *> *args);
 
+    //! \fixme should be private
     World mWorld;
     entity_t *mLara;
     Render *mRender;

include/OpenRaider.h

@@ -55,6 +55,8 @@ public:
 
     void handleMouseScroll(int xrel, int yrel);
 
+    //! \fixme should be private
+
     Window *mWindow;
     Sound *mSound;
     Menu *mMenu;

include/Render.h

@@ -212,6 +212,10 @@ public:
 
     void addSkeletalModel(SkeletalModel *mdl);
 
+    //! \fixme should be private
+
+    ViewVolume mViewVolume; //!< View Volume for frustum culling
+
 private:
 
     void drawLoadScreen();

include/Window.h

@@ -58,6 +58,7 @@ public:
     virtual void drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...)
         __attribute__((format(printf, 6, 0))) = 0;
 
+    //! \fixme should be private
     unsigned int mWidth;
     unsigned int mHeight;
 

src/Game.cpp

@@ -176,10 +176,8 @@ void Game::handleMouseMotion(int xrel, int yrel) {
                 mCamera->command(CAMERA_ROTATE_DOWN);
 
         // Fix Laras rotation
-        if (mLara) {
-            mLara->angles[1] = mCamera->getRadianYaw();
-            mLara->angles[2] = mCamera->getRadianPitch();
-        }
+        mLara->angles[1] = mCamera->getRadianYaw();
+        mLara->angles[2] = mCamera->getRadianPitch();
     }
 }
 
@@ -194,42 +192,119 @@ int Game::command(std::vector<char *> *args) {
     }
 
     char *cmd = args->at(0);
-    if (strcmp(cmd, "noclip") == 0) {
-        mLara->moveType = worldMoveType_noClipping;
-        gOpenRaider->mConsole->print("Lara is noclipping...");
-    } else if (strcmp(cmd, "fly") == 0) {
-        mLara->moveType = worldMoveType_fly;
-        gOpenRaider->mConsole->print("Lara is flying...");
-    } else if (strcmp(cmd, "walk") == 0) {
-        mLara->moveType = worldMoveType_walk;
-        gOpenRaider->mConsole->print("Lara is walking...");
+    if (strcmp(cmd, "mode") == 0) {
+        if (args->size() > 1) {
+            char *mode = args->at(1);
+            if (strcmp(mode, "wireframe") == 0) {
+                if (mLoaded) {
+                    mRender->setMode(Render::modeWireframe);
+                    gOpenRaider->mConsole->print("Wireframe mode");
+                } else {
+                    gOpenRaider->mConsole->print("Load a level to set this mode!");
+                    return -2;
+                }
+            } else if (strcmp(mode, "solid") == 0) {
+                if (mLoaded) {
+                    mRender->setMode(Render::modeSolid);
+                    gOpenRaider->mConsole->print("Solid mode");
+                } else {
+                    gOpenRaider->mConsole->print("Load a level to set this mode!");
+                    return -3;
+                }
+            } else if (strcmp(mode, "texture") == 0) {
+                if (mLoaded) {
+                    mRender->setMode(Render::modeTexture);
+                    gOpenRaider->mConsole->print("Texture mode");
+                } else {
+                    gOpenRaider->mConsole->print("Load a level to set this mode!");
+                    return -4;
+                }
+            } else if (strcmp(mode, "vertexlight") == 0) {
+                if (mLoaded) {
+                    mRender->setMode(Render::modeVertexLight);
+                    gOpenRaider->mConsole->print("Vertexlight mode");
+                } else {
+                    gOpenRaider->mConsole->print("Load a level to set this mode!");
+                    return -5;
+                }
+            } else if (strcmp(mode, "titlescreen") == 0) {
+                mRender->setMode(Render::modeLoadScreen);
+                gOpenRaider->mConsole->print("Titlescreen mode");
+            } else {
+                gOpenRaider->mConsole->print("Invalid use of mode command (%s)!", mode);
+                return -6;
+            }
+        } else {
+            gOpenRaider->mConsole->print("Invalid use of mode command!");
+            return -7;
+        }
+    } else if (strcmp(cmd, "move") == 0) {
+        if (args->size() > 1) {
+            if (mLoaded) {
+                char *move = args->at(1);
+                if (strcmp(move, "walk") == 0) {
+                    mLara->moveType = worldMoveType_walk;
+                    gOpenRaider->mConsole->print("Lara is walking...");
+                } else if (strcmp(move, "fly") == 0) {
+                    mLara->moveType = worldMoveType_fly;
+                    gOpenRaider->mConsole->print("Lara is flying...");
+                } else if (strcmp(move, "noclip") == 0) {
+                    mLara->moveType = worldMoveType_noClipping;
+                    gOpenRaider->mConsole->print("Lara is noclipping...");
+                } else {
+                    gOpenRaider->mConsole->print("Invalid use of move command (%s)!", move);
+                    return -8;
+                }
+            } else {
+                gOpenRaider->mConsole->print("Load a level to change the movement type!");
+                return -9;
+            }
+        } else {
+            gOpenRaider->mConsole->print("Invalid use of move command!");
+            return -10;
+        }
     } else if (strcmp(cmd, "sound") == 0) {
         if (args->size() > 1) {
             gOpenRaider->mSound->play(atoi(args->at(1)));
         } else {
             gOpenRaider->mConsole->print("Invalid use of sound command!");
-            return -2;
+            return -11;
         }
     } else if (strcmp(cmd, "help") == 0) {
         if (args->size() < 2) {
             gOpenRaider->mConsole->print("game-command Usage:");
             gOpenRaider->mConsole->print("  game COMMAND");
             gOpenRaider->mConsole->print("Available commands:");
-            gOpenRaider->mConsole->print("  walk");
-            gOpenRaider->mConsole->print("  fly");
-            gOpenRaider->mConsole->print("  noclip");
+            gOpenRaider->mConsole->print("  move [walk|fly|noclip]");
             gOpenRaider->mConsole->print("  sound INT");
+            gOpenRaider->mConsole->print("  mode MODE");
         } else if (strcmp(args->at(1), "sound") == 0) {
             gOpenRaider->mConsole->print("game-sound-command Usage:");
             gOpenRaider->mConsole->print("  game sound INT");
             gOpenRaider->mConsole->print("Where INT is a valid sound ID integer");
+        } else if (strcmp(args->at(1), "move") == 0) {
+            gOpenRaider->mConsole->print("game-move-command Usage:");
+            gOpenRaider->mConsole->print("  game move COMMAND");
+            gOpenRaider->mConsole->print("Where COMMAND is one of the following:");
+            gOpenRaider->mConsole->print("  walk");
+            gOpenRaider->mConsole->print("  fly");
+            gOpenRaider->mConsole->print("  noclip");
+        } else if (strcmp(args->at(1), "mode") == 0) {
+            gOpenRaider->mConsole->print("game-mode-command Usage:");
+            gOpenRaider->mConsole->print("  game mode MODE");
+            gOpenRaider->mConsole->print("Where MODE is one of the following:");
+            gOpenRaider->mConsole->print("  wireframe");
+            gOpenRaider->mConsole->print("  solid");
+            gOpenRaider->mConsole->print("  texture");
+            gOpenRaider->mConsole->print("  vertexlight");
+            gOpenRaider->mConsole->print("  titlescreen");
         } else {
             gOpenRaider->mConsole->print("No help available for game %s.", args->at(1));
-            return -3;
+            return -12;
         }
     } else {
         gOpenRaider->mConsole->print("Invalid use of game-command (%s)!", cmd);
-        return -4;
+        return -13;
     }
 
     return 0;
@@ -737,7 +812,7 @@ void Game::processMoveable(int index, int i, int *ent,
                     }
 
                     mRender->setFlags(Render::fRenderPonytail);
-                    printf("Found known ponytail\n");
+                    gOpenRaider->mConsole->print("Found known ponytail");
                 }
                 break; // ?
             case TR_VERSION_1:
@@ -766,16 +841,13 @@ void Game::processMoveable(int index, int i, int *ent,
     }
     else
     {
+        // Already cached
         delete r_model;
-
         c_model = cache2[foundIndex];
         sModel->model = c_model;
         mWorld.addEntity(thing);
         mWorld.addModel(c_model);
-        //printf("c"); // it's already cached
-        //fflush(stdout);
-
-        //continue;
+        printf("c");
         return;
     }
 

src/Render.cpp

@@ -30,73 +30,6 @@
 #include "OpenRaider.h"
 #include "Render.h"
 
-ViewVolume gViewVolume; /* View volume for frustum culling */
-
-void Render::drawLoadScreen()
-{
-    float x = 0.0f, y = 0.0f, z = -160.0f;
-    float w = 500.0f, h = 500.0f;
-
-
-    if (mTexture.getTextureCount() <= 0)
-        return;
-
-    // Mongoose 2002.01.01, Rendered while game is loading...
-    //! \fixme seperate logo/particle coor later
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glLoadIdentity();
-
-    glColor3fv(WHITE);
-
-    if (mFlags & Render::fGL_Lights)
-        glDisable(GL_LIGHTING);
-
-    // Mongoose 2002.01.01, Draw logo/load screen
-    glTranslatef(0.0f, 0.0f, -2000.0f);
-    glRotatef(180.0f, 1.0f, 0.0f, 0.0f);
-
-    glBindTexture(GL_TEXTURE_2D, 2);
-
-    glBegin(GL_TRIANGLE_STRIP);
-    glTexCoord2f(1.0, 1.0);
-    glVertex3f(x + w, y + h, z);
-    glTexCoord2f(0.0, 1.0);
-    glVertex3f(x - w, y + h, z);
-    glTexCoord2f(1.0, 0.0);
-    glVertex3f(x + w, y - h, z);
-    glTexCoord2f(0.0, 0.0);
-    glVertex3f(x - w, y - h, z);
-    glEnd();
-
-    if (mFlags & Render::fGL_Lights)
-        glEnable(GL_LIGHTING);
-
-#ifdef USING_EMITTER
-    // Mongoose 2002.01.01, Test particle prototype on load screen
-    if (mEmitter && mFlags & Render::fParticles)
-    {
-        glPushMatrix();
-        glLoadIdentity();
-
-        glEnable(GL_BLEND);
-        glRotatef(180.0, 1.0, 0.0, 0.0);
-        glTranslatef(0.0, -820.0, 575.0);
-        glScalef(80.0, 80.0, 80.0);
-
-        // Update view volume for vising
-        updateViewVolume();
-        gViewVolume.getFrustum(mEmitter->mFrustum);
-        mEmitter->Flags(Emitter::fUseDepthSorting, true);
-        mEmitter->Draw();
-
-        glPopMatrix();
-    }
-#endif
-
-    glFlush();
-}
-
-
 bool compareEntites(const void *voidA, const void *voidB)
 {
     entity_t *a = (entity_t *)voidA, *b = (entity_t *)voidB;
@@ -105,11 +38,11 @@ bool compareEntites(const void *voidA, const void *voidB)
     if (!a || !b)
         return false; // error really
 
-    distA = gViewVolume.getDistToSphereFromNear(a->pos[0],
+    distA = gOpenRaider->mGame->mRender->mViewVolume.getDistToSphereFromNear(a->pos[0],
             a->pos[1],
             a->pos[2],
             1.0f);
-    distB = gViewVolume.getDistToSphereFromNear(b->pos[0],
+    distB = gOpenRaider->mGame->mRender->mViewVolume.getDistToSphereFromNear(b->pos[0],
             b->pos[1],
             b->pos[2],
             1.0f);
@@ -126,11 +59,11 @@ bool compareStaticModels(const void *voidA, const void *voidB)
     if (!a || !b)
         return false; // error really
 
-    distA = gViewVolume.getDistToSphereFromNear(a->pos[0],
+    distA = gOpenRaider->mGame->mRender->mViewVolume.getDistToSphereFromNear(a->pos[0],
             a->pos[1],
             a->pos[2],
             128.0f);
-    distB = gViewVolume.getDistToSphereFromNear(b->pos[0],
+    distB = gOpenRaider->mGame->mRender->mViewVolume.getDistToSphereFromNear(b->pos[0],
             b->pos[1],
             b->pos[2],
             128.0f);
@@ -830,6 +763,74 @@ void Render::Display()
     glFlush();
 }
 
+void Render::drawLoadScreen()
+{
+    float x = 0.0f, y = 0.0f, z = -160.0f;
+    float w, h;
+
+    if (gOpenRaider->mWindow->mWidth < gOpenRaider->mWindow->mHeight)
+        w = h = (float)gOpenRaider->mWindow->mWidth;
+    else
+        w = h = (float)gOpenRaider->mWindow->mHeight;
+
+
+    if (mTexture.getTextureCount() <= 0)
+        return;
+
+    // Mongoose 2002.01.01, Rendered while game is loading...
+    //! \fixme seperate logo/particle coor later
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glLoadIdentity();
+
+    glColor3fv(WHITE);
+
+    if (mFlags & Render::fGL_Lights)
+        glDisable(GL_LIGHTING);
+
+    // Mongoose 2002.01.01, Draw logo/load screen
+    glTranslatef(0.0f, 0.0f, -2000.0f);
+    glRotatef(180.0f, 1.0f, 0.0f, 0.0f);
+
+    glBindTexture(GL_TEXTURE_2D, 2); //! \fixme store texture id somewhere
+
+    glBegin(GL_TRIANGLE_STRIP);
+    glTexCoord2f(1.0, 1.0);
+    glVertex3f(x + w, y + h, z);
+    glTexCoord2f(0.0, 1.0);
+    glVertex3f(x - w, y + h, z);
+    glTexCoord2f(1.0, 0.0);
+    glVertex3f(x + w, y - h, z);
+    glTexCoord2f(0.0, 0.0);
+    glVertex3f(x - w, y - h, z);
+    glEnd();
+
+    if (mFlags & Render::fGL_Lights)
+        glEnable(GL_LIGHTING);
+
+#ifdef USING_EMITTER
+    // Mongoose 2002.01.01, Test particle prototype on load screen
+    if (mEmitter && mFlags & Render::fParticles)
+    {
+        glPushMatrix();
+        glLoadIdentity();
+
+        glEnable(GL_BLEND);
+        glRotatef(180.0, 1.0, 0.0, 0.0);
+        glTranslatef(0.0, -820.0, 575.0);
+        glScalef(80.0, 80.0, 80.0);
+
+        // Update view volume for vising
+        updateViewVolume();
+        mViewVolume.getFrustum(mEmitter->mFrustum);
+        mEmitter->Flags(Emitter::fUseDepthSorting, true);
+        mEmitter->Draw();
+
+        glPopMatrix();
+    }
+#endif
+
+    glFlush();
+}
 
 void Render::newRoomRenderList(int index)
 {
@@ -880,7 +881,7 @@ void Render::newRoomRenderList(int index)
                     continue;
 
                 //room->dist =
-                //gViewVolume.getDistToBboxFromNear(room->room->bbox_min,
+                //mViewVolume.getDistToBboxFromNear(room->room->bbox_min,
                 //                                           room->room->bbox_max);
 
                 mRoomRenderList.push_back(room);
@@ -919,7 +920,7 @@ void Render::buildRoomRenderList(RenderRoom *rRoom)
     }
 
     //rRoom->dist =
-    //gViewVolume.getDistToBboxFromNear(rRoom->room->bbox_min,
+    //mViewVolume.getDistToBboxFromNear(rRoom->room->bbox_min,
     //                                           rRoom->room->bbox_max);
 
     /* Add current room to list */
@@ -1894,7 +1895,7 @@ void Render::updateViewVolume()
 
     glGetFloatv(GL_PROJECTION_MATRIX, proj);
     glGetFloatv(GL_MODELVIEW_MATRIX, mdl);
-    gViewVolume.updateFrame(proj, mdl);
+    mViewVolume.updateFrame(proj, mdl);
 }
 
 
@@ -1913,7 +1914,7 @@ bool Render::isVisible(float bbox_min[3], float bbox_max[3])
         draw_bbox_color(bbox_min, bbox_max, true, PINK, RED);
     }
 
-    return gViewVolume.isBboxInFrustum(bbox_min, bbox_max);
+    return mViewVolume.isBboxInFrustum(bbox_min, bbox_max);
 }
 
 
@@ -1929,7 +1930,7 @@ bool Render::isVisible(float x, float y, float z)
         glEnd();
     }
 
-    return (gViewVolume.isPointInFrustum(x, y, z));
+    return (mViewVolume.isPointInFrustum(x, y, z));
 }
 
 
@@ -1945,5 +1946,5 @@ bool Render::isVisible(float x, float y, float z, float radius)
         glEnd();
     }
 
-    return (gViewVolume.isSphereInFrustum(x, y, z, radius));
+    return (mViewVolume.isSphereInFrustum(x, y, z, radius));
 }