Slimmed down Render

ChangeLog.md

@@ -10,6 +10,8 @@
     * Re-Implemented the move command
     * Prevent crash (segfault) when resizing window while console is
       not fully scrolled to the bottom
+    * Removed Render flags fUsePortals, fAllRooms, fOneRoom,
+      fViewModel and fUpdateRoomListPerFrame
 
     [ 20140624 ]
     * Some changes to allow compilation with Ubuntu 14.04 / gcc

include/Render.h

@@ -31,17 +31,12 @@ public:
 
     typedef enum {
         fRoomAlpha              = (1 << 0),
-        fViewModel              = (1 << 1),
-        fEntityModels           = (1 << 2),
-        fFog                    = (1 << 3),
-        fUsePortals             = (1 << 4),
-        fGL_Lights              = (1 << 5),
-        fOneRoom                = (1 << 6),
-        fRenderPonytail         = (1 << 7),
-        // fMultiTexture           = (1 << 8), //! \todo Whats up with Multitexture stuff? Where is it needed?
-        fUpdateRoomListPerFrame = (1 << 9),
-        fAnimateAllModels       = (1 << 10),
-        fAllRooms               = (1 << 11)
+        fEntityModels           = (1 << 1),
+        fFog                    = (1 << 2),
+        fGL_Lights              = (1 << 3),
+        fRenderPonytail         = (1 << 4),
+        fAnimateAllModels       = (1 << 5),
+        // fMultiTexture           = (1 << 6), //! \todo Whats up with Multitexture stuff? Where is it needed?
     } RenderFlags;
 
     /*!

src/Command.cpp

@@ -109,13 +109,9 @@ int OpenRaider::command(std::string &c) {
             getConsole().print("  fog       - BOOL - GL Fog");
             getConsole().print("  viewmodel - INT - Change Laras model");
             getConsole().print("  pos       - Print position info");
-            getConsole().print("  vmodel    - BOOL - View Model");
             getConsole().print("  ralpha    - BOOL - Room Alpha");
-            getConsole().print("  vis       - BOOL - Use Portals");
             getConsole().print("  upf       - BOOL - Update Room List Per Frame");
             getConsole().print("  entmodel  - BOOL");
-            getConsole().print("  oneroom   - BOOL");
-            getConsole().print("  allrooms  - BOOL");
             getConsole().print("  ponytail  - BOOL");
             getConsole().print("  pigtail   - BOOL");
             getConsole().print("  ponypos   - FLOAT FLOAT FLOAT FLOAT - x y z angle");
@@ -252,22 +248,6 @@ int OpenRaider::command(std::string &c) {
             getConsole().print("Invalid use of fog-command!");
             return -18;
         }
-    } else if (cmd.compare("vmodel") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to vmodel command!");
-                return -22;
-            }
-            if (b)
-                getRender().setFlags(Render::fViewModel);
-            else
-                getRender().clearFlags(Render::fViewModel);
-            getConsole().print("Viewmodel is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of vmodel-command!");
-            return -23;
-        }
     } else if (cmd.compare("ralpha") == 0) {
         if (args->size() > 0) {
             bool b;
@@ -284,22 +264,6 @@ int OpenRaider::command(std::string &c) {
             getConsole().print("Invalid use of ralpha-command!");
             return -25;
         }
-    } else if (cmd.compare("vis") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to vis command!");
-                return -28;
-            }
-            if (b)
-                getRender().setFlags(Render::fUsePortals);
-            else
-                getRender().clearFlags(Render::fUsePortals);
-            getConsole().print("Portals are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of vis-command!");
-            return -29;
-        }
     } else if (cmd.compare("upf") == 0) {
         if (args->size() > 0) {
             bool b;
@@ -332,38 +296,6 @@ int OpenRaider::command(std::string &c) {
             getConsole().print("Invalid use of entmodel-command!");
             return -39;
         }
-    } else if (cmd.compare("oneroom") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to oneroom command!");
-                return -40;
-            }
-            if (b)
-                getRender().setFlags(Render::fOneRoom);
-            else
-                getRender().clearFlags(Render::fOneRoom);
-            getConsole().print("Rendering one room is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of oneroom-command!");
-            return -41;
-        }
-    } else if (cmd.compare("allrooms") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to allrooms command!");
-                return -42;
-            }
-            if (b)
-                getRender().setFlags(Render::fAllRooms);
-            else
-                getRender().clearFlags(Render::fAllRooms);
-            getConsole().print("Rendering all rooms is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of allrooms-command!");
-            return -43;
-        }
     } else if (cmd.compare("ponytail") == 0) {
         if (args->size() > 0) {
             bool b;

src/Render.cpp

@@ -26,9 +26,7 @@ Render::Render() {
     mSkyMeshRotation = false;
     mMode = Render::modeDisabled;
     mLock = 0;
-    mFlags = (fRoomAlpha | fViewModel |
-            fEntityModels | fRenderPonytail |
-            fUsePortals | fUpdateRoomListPerFrame);
+    mFlags = (fRoomAlpha | fEntityModels | fRenderPonytail);
 }
 
 
@@ -78,48 +76,6 @@ unsigned int Render::getFlags() {
 }
 
 
-// Texture must be set to WHITE solid color texture
-void renderTrace(int color, vec3_t start, vec3_t end)
-{
-    const float widthStart = 10.0f; //5.0f;
-    const float widthEnd = 10.0f;
-    float delta = randomNum(0.01f, 0.16f); // for flicker fx
-
-
-    // Draw two long quads that skrink and fade the they go further out
-    glBegin(GL_QUADS);
-
-    switch (color)
-    {
-        case 0:
-            glColor3f(0.9f - delta, 0.2f, 0.2f);
-            break;
-        case 1:
-            glColor3f(0.2f, 0.9f - delta, 0.2f);
-            break;
-        case 2:
-        default:
-            glColor3f(0.2f, 0.2f, 0.9f - delta);
-    }
-
-    glVertex3f(start[0], start[1], start[2]);
-    glVertex3f(start[0], start[1] + widthStart, start[2] + widthStart);
-    glVertex3f(end[0], end[1] + widthEnd, end[2] + widthEnd);
-    glVertex3f(end[0], end[1], end[2]);
-
-    glVertex3f(start[0],  start[1], start[2]);
-    glVertex3f(start[0],  start[1] + widthStart, start[2] - widthStart);
-    glVertex3f(end[0], end[1] + widthEnd, end[2] - widthEnd);
-    glVertex3f(end[0], end[1], end[2]);
-
-    glVertex3f(start[0],  start[1] + widthStart, start[2] + widthStart);
-    glVertex3f(start[0],  start[1] + widthStart, start[2] - widthStart);
-    glVertex3f(end[0], end[1] + widthEnd, end[2] - widthEnd);
-    glVertex3f(end[0], end[1] + widthEnd, end[2] + widthEnd);
-    glEnd();
-}
-
-
 void setLighting(bool on)
 {
     if (on)
@@ -270,33 +226,31 @@ void Render::setMode(int n)
 // Replaced the deprecated gluLookAt with slightly modified code from here:
 // http://www.khronos.org/message_boards/showthread.php/4991
 void gluLookAt(float eyeX, float eyeY, float eyeZ,
-                            float lookAtX, float lookAtY, float lookAtZ,
-                            float upX, float upY, float upZ) {
-    float f[3];
-
+        float lookAtX, float lookAtY, float lookAtZ,
+        float upX, float upY, float upZ) {
     // calculating the viewing vector
-    f[0] = lookAtX - eyeX;
-    f[1] = lookAtY - eyeY;
-    f[2] = lookAtZ - eyeZ;
-
-    float fMag = sqrtf(f[0] * f[0] + f[1] * f[1] + f[2] * f[2]);
-    //float upMag = sqrtf(upX * upX + upY * upY + upZ * upZ);
+    float f[3] = {
+        lookAtX - eyeX,
+        lookAtY - eyeY,
+        lookAtZ - eyeZ
+    };
 
     // normalizing the viewing vector
-    f[0] = f[0] / fMag;
-    f[1] = f[1] / fMag;
-    f[2] = f[2] / fMag;
+    float fMag = sqrtf(f[0] * f[0] + f[1] * f[1] + f[2] * f[2]);
+    f[0] /= fMag;
+    f[1] /= fMag;
+    f[2] /= fMag;
 
     float s[3] = {
-        f[1] * upZ - upY * f[2],
-        upX * f[2] - f[0] * upZ,
-        f[0] * upY - upX * f[1]
+        (f[1] * upZ) - (upY * f[2]),
+        (upX * f[2]) - (f[0] * upZ),
+        (f[0] * upY) - (upX * f[1])
     };
 
     float u[3] = {
-        s[1] * f[2] - f[1] * s[2],
-        f[0] * s[2] - s[0] * f[2],
-        s[0] * f[1] - f[0] * s[1]
+        (s[1] * f[2]) - (f[1] * s[2]),
+        (f[0] * s[2]) - (s[0] * f[2]),
+        (s[0] * f[1]) - (f[0] * s[1])
     };
 
     float m[16] = {
@@ -433,8 +387,7 @@ void Render::display()
         glPushMatrix();
 
         // Draw lara or other player model ( move to entity rendering method )
-        if (mFlags & Render::fViewModel)
-            getGame().getLara().display();
+        getGame().getLara().display();
 
         // Draw sprites after player to handle alpha
         for (unsigned int i = 0; i < getWorld().sizeSprite(); i++) {
@@ -445,9 +398,8 @@ void Render::display()
 
         glPopMatrix();
 
-        // Depth sort entityRenderList with qsort
+        // Depth sort entityRenderList and display each entity
         std::sort(entityRenderList.begin(), entityRenderList.end());
-
         for (unsigned int i = 0; i < entityRenderList.size(); i++) {
             entityRenderList[i]->display();
         }
@@ -514,37 +466,17 @@ void Render::newRoomRenderList(int index)
 {
     static int currentRoomId = -1;
 
-    if (mFlags & Render::fUsePortals)
+    if (index == -1) // -1 is error, so draw room 0, for the hell of it
     {
-        if (index == -1) // -1 is error, so draw room 0, for the hell of it
-        {
-            mRoomRenderList.clear();
-            mRoomRenderList.push_back(&getWorld().getRoom(0));
-        }
-        else
-        {
-            // Update room render list if needed
-            if (mFlags & Render::fUpdateRoomListPerFrame ||
-                    currentRoomId != index)
-            {
-                buildRoomRenderList(getWorld().getRoom(index));
-            }
-        }
+        mRoomRenderList.clear();
+        mRoomRenderList.push_back(&getWorld().getRoom(0));
     }
-    else // Render all rooms pretty much
+    else
     {
-        if (currentRoomId != index || index == -1)
+        // Update room render list if needed
+        if (currentRoomId != index)
         {
-            printf("*** Room render list -> %i\n", index);
-            mRoomRenderList.clear();
-
-            for (unsigned int i = 0; i < getWorld().sizeRoom(); i++)
-            {
-                if (!isVisible(getWorld().getRoom(i).getBoundingBox()))
-                    continue;
-
-                mRoomRenderList.push_back(&getWorld().getRoom(i));
-            }
+            buildRoomRenderList(getWorld().getRoom(index));
         }
     }
 
@@ -563,34 +495,15 @@ void Render::buildRoomRenderList(Room &room)
     // Must not already be cached
     for (unsigned int i = 0; i < mRoomRenderList.size(); i++)
     {
-        Room &room2 = *mRoomRenderList[i];
+        Room *room2 = mRoomRenderList[i];
 
-        if (&room2 == &room)
+        if (room2 == &room)
             return;
     }
 
     /* Add current room to list */
     mRoomRenderList.push_back(&room);
 
-    if (mFlags & Render::fOneRoom)
-    {
-        return;
-    }
-    else if (mFlags & Render::fAllRooms) /* Are you serious? */
-    {
-        for (unsigned int i = 0; i < getWorld().sizeRoom(); i++)
-        {
-            Room &room2 = getWorld().getRoom(i);
-
-            if (&room2 != &room)
-            {
-                buildRoomRenderList(room2);
-            }
-        }
-
-        return;
-    }
-
     // Try to add adj rooms and their adj rooms, skip this room
     for (unsigned int i = 1; i < room.sizeAdjacentRooms(); i++)
     {
@@ -599,12 +512,10 @@ void Render::buildRoomRenderList(Room &room)
 
         Room &room2 = getWorld().getRoom(room.getAdjacentRoom(i));
 
-        // Mongoose 2002.03.22, Add portal visibility check here
+        //! \fixme Add portal visibility check here
 
         if (&room2 != &room)
-        {
             buildRoomRenderList(room2);
-        }
     }
 }