Game is singleton. Started initializing Render.

Modified Camera and Render.

include/Game.h

@@ -8,7 +8,9 @@
 #ifndef _GAME_H_
 #define _GAME_H_
 
+#include "Camera.h"
 #include "global.h"
+#include "Render.h"
 #include "TombRaider.h"
 #include "World.h"
 
@@ -18,11 +20,16 @@
 class Game {
 public:
 
-    // Throw exception with negative integer error code if fails
-    Game(const char *level);
+    Game();
 
     ~Game();
 
+    int initialize();
+
+    int loadLevel(const char *level);
+
+    void destroy();
+
     void handleAction(ActionEvents action, bool isFinished);
 
     void handleMouseMotion(int xrel, int yrel);
@@ -33,12 +40,18 @@ public:
 
     World mWorld;
     entity_t *mLara;
+    Render *mRender;
+    Camera *mCamera;
 
 private:
 
+    bool mLoaded;
     char *mName;
     TombRaider mTombRaider;
 
+    unsigned int mTextureStart;
+    unsigned int mTextureLevelOffset;
+    unsigned int mTextureOffset;
 };
 
 #endif

include/OpenRaider.h

@@ -67,6 +67,11 @@ public:
     float mCameraRotationDeltaX;
     float mCameraRotationDeltaY;
 
+    char *mBaseDir;
+    char *mPakDir;
+    char *mAudioDir;
+    char *mDataDir;
+
 private:
 
     int command(const char *command, std::vector<char *> *args);
@@ -88,11 +93,6 @@ private:
     bool mInit;
     bool mRunning;
 
-    char *mBaseDir;
-    char *mPakDir;
-    char *mAudioDir;
-    char *mDataDir;
-
     KeyboardButton keyBindings[ActionEventCount];
 };
 

include/Render.h

@@ -144,13 +144,6 @@ public:
     void addRoom(RenderRoom *rRoom);
 
     /*!
-     * \brief Starts and sets up OpenGL target
-     * \param width width of window
-     * \param height height of window
-     */
-    void Init(int width, int height);
-
-    /*!
      * \brief Loads textures in a certain id slot
      * \param image Image to load
      * \param width width of image
@@ -207,8 +200,6 @@ public:
 
     void setMode(int n);
 
-    void Update(int width, int height);
-
     /*!
      * \brief Renders a single game frame
      */
@@ -218,8 +209,6 @@ public:
 
     void ViewModel(entity_t *ent, int index);
 
-    void RegisterCamera(Camera *camera);
-
     void addSkeletalModel(SkeletalModel *mdl);
 
 private:
@@ -332,15 +321,12 @@ private:
     void tmpRenderModelMesh(model_mesh_t *r_mesh, texture_tri_t *ttri);
 
     Texture mTexture;                     //!< Texture subsystem
-    Camera *mCamera;                      //!< Camera subsystem
 
     std::vector<RenderRoom *> mRoomRenderList;
     std::vector<RenderRoom *> mRooms;
     std::vector<SkeletalModel *> mModels;
 
     unsigned int mFlags;                  //!< Rendering flags
-    unsigned int mWidth;                  //!< Viewport width
-    unsigned int mHeight;                 //!< Viewport height
     unsigned int mMode;                   //!< Rendering mode
     unsigned int *mNumTexturesLoaded;
     unsigned int *mNextTextureId;

src/Game.cpp

@@ -18,6 +18,39 @@
 #include "Game.h"
 #include "utils/strings.h"
 
+Game::Game() {
+    mLoaded = false;
+    mName = NULL;
+    mLara = NULL;
+
+    mTextureStart = 0;
+    mTextureLevelOffset = 0;
+    mTextureOffset = 0;
+
+    mCamera = NULL;
+    mRender = NULL;
+}
+
+Game::~Game() {
+    destroy();
+
+    if (mRender)
+        delete mRender;
+
+    if (mCamera)
+        delete mCamera;
+}
+
+int Game::initialize() {
+    mCamera = new Camera();
+    // TODO setup Camera
+
+    mRender = new Render();
+    mRender->initTextures(gOpenRaider->mDataDir, &mTextureStart, &mTextureLevelOffset);
+
+    return 0;
+}
+
 void percentCallbackTrampoline(int percent, void *data) {
     Game *self = static_cast<Game *>(data);
     self->percentCallback(percent);
@@ -27,9 +60,8 @@ void Game::percentCallback(int percent) {
 
 }
 
-// Throw exception with negative integer error code if fails
-Game::Game(const char *level) {
-    mLara = NULL;
+int Game::loadLevel(const char *level) {
+    destroy();
 
     mName = bufferString("%s", level);
 
@@ -37,7 +69,7 @@ Game::Game(const char *level) {
     gOpenRaider->mConsole->print("Loading %s", mName);
     int error = mTombRaider.Load(mName, percentCallbackTrampoline, this);
     if (error != 0) {
-        throw error;
+        return error;
     }
 
     // If required, load the external sound effect file MAIN.SFX into TombRaider
@@ -58,23 +90,39 @@ Game::Game(const char *level) {
         }
         delete [] tmp;
     }
+
+    mLoaded = true;
+    //mRender->setMode(Render::modeTexture);
+    // TODO enable Renderer
+    return 0;
 }
 
-Game::~Game() {
+void Game::destroy() {
     if (mName)
         delete [] mName;
+
+    mLoaded = false;
+    mRender->setMode(Render::modeDisabled);
 }
 
 void Game::handleAction(ActionEvents action, bool isFinished) {
+    if (mLoaded) {
 
+    }
 }
 
 void Game::handleMouseMotion(int xrel, int yrel) {
+    if (mLoaded) {
 
+    }
 }
 
 void Game::display() {
-    glClearColor(0.00f, 0.70f, 0.00f, 1.0f);
-    glClear(GL_COLOR_BUFFER_BIT);
+    if (mLoaded) {
+        //glClearColor(0.00f, 0.70f, 0.00f, 1.0f);
+        //glClear(GL_COLOR_BUFFER_BIT);
+
+        mRender->Display();
+    }
 }
 

src/OpenRaider.cpp

@@ -39,7 +39,7 @@ OpenRaider::OpenRaider() {
     mConsole = new Console();
     mSound = new Sound();
     mWindow = new WindowSDL();
-    mGame = NULL;
+    mGame = new Game();
 
     for (int i = 0; i < ActionEventCount; i++)
         keyBindings[i] = unknown;
@@ -179,17 +179,10 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             return -4;
         }
     } else if (strcmp(command, "load") == 0) {
-        if (mGame)
-            delete mGame;
         char *tmp = bufferString("%s/%s", mPakDir, args->at(0));
-        try {
-            mGame = new Game(tmp);
-            delete [] tmp;
-            return 0;
-        } catch (int error) {
-            delete [] tmp;
-            return error;
-        }
+        int error = mGame->loadLevel(tmp);
+        delete [] tmp;
+        return error;
     } else {
         mConsole->print("Unknown command: %s ", command);
         return -1;
@@ -605,6 +598,10 @@ int OpenRaider::initialize() {
     if (mSound->initialize() != 0)
         return -4;
 
+    // Initialize game engine
+    if (mGame->initialize() != 0)
+        return -5;
+
     mMenu->setVisible(true);
 
     mInit = true;
@@ -628,8 +625,7 @@ void OpenRaider::run() {
         glClear(GL_COLOR_BUFFER_BIT);
 
         // Draw game scene
-        if (mGame)
-            mGame->display();
+        mGame->display();
 
         // Draw 2D overlays (console and menu)
         mWindow->glEnter2D();
@@ -662,8 +658,7 @@ void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
         } else if (!mConsole->isVisible()) {
             for (int i = forwardAction; i < ActionEventCount; i++) {
                 if (keyBindings[i] == key) {
-                    if (mGame)
-                        mGame->handleAction((ActionEvents)i, pressed);
+                    mGame->handleAction((ActionEvents)i, pressed);
                 }
             }
         } else {
@@ -686,8 +681,7 @@ void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton
     } else if (!mConsole->isVisible()) {
         for (int i = forwardAction; i < ActionEventCount; i++) {
             if (keyBindings[i] == button) {
-                if (mGame)
-                    mGame->handleAction((ActionEvents)i, !released);
+                mGame->handleAction((ActionEvents)i, !released);
             }
         }
     }
@@ -695,8 +689,7 @@ void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton
 
 void OpenRaider::handleMouseMotion(int xrel, int yrel) {
     if ((!mConsole->isVisible()) && (!mMenu->isVisible())) {
-        if (mGame)
-            mGame->handleMouseMotion(xrel, yrel);
+        mGame->handleMouseMotion(xrel, yrel);
     }
 }
 

src/Render.cpp

@@ -127,7 +127,6 @@ Render::Render()
 #ifdef USING_EMITTER
     mEmitter = 0x0;
 #endif
-    mCamera = 0x0;
     mSkyMesh = -1;
     mSkyMeshRotation = false;
     mMode = Render::modeDisabled;
@@ -138,9 +137,6 @@ Render::Render()
 
     mNextTextureId = NULL;
     mNumTexturesLoaded = NULL;
-
-    mWidth = 640;
-    mHeight = 480;
 }
 
 
@@ -156,7 +152,7 @@ Render::~Render()
 
 void Render::screenShot(char *filenameBase)
 {
-    mTexture.glScreenShot(filenameBase, mWidth, mHeight);
+    mTexture.glScreenShot(filenameBase, gOpenRaider->mWindow->mWidth, gOpenRaider->mWindow->mHeight);
 }
 
 
@@ -213,7 +209,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
         ++numTextures;
     }
 
-    snprintf(filename, 126, "%s%s", textureDir, "splash.tga");
+    snprintf(filename, 126, "%s/%s", textureDir, "splash.tga");
     filename[127] = 0;
 
     if ((bg_id = mTexture.loadTGA(filename)) > -1)
@@ -221,7 +217,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
         ++numTextures;
     }
 
-    snprintf(filename, 126, "%s%s", textureDir, "snow.tga");
+    snprintf(filename, 126, "%s/%s", textureDir, "snow.tga");
     filename[127] = 0;
 
     if ((snow1_id = mTexture.loadTGA(filename)) > -1)
@@ -229,7 +225,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
         ++numTextures;
     }
 
-    snprintf(filename, 126, "%s%s", textureDir, "snow2.tga");
+    snprintf(filename, 126, "%s/%s", textureDir, "snow2.tga");
     filename[127] = 0;
 
     if ((snow2_id = mTexture.loadTGA(filename)) > -1)
@@ -348,109 +344,6 @@ void renderTrace(int color, vec3_t start, vec3_t end)
 }
 
 
-void Render::Init(int width, int height)
-{
-    char *s;
-
-    mWidth = width;
-    mHeight = height;
-
-    // Print driver support information
-    printf("GL Vendor   : %s\n", glGetString(GL_VENDOR));
-    printf("GL Renderer : %s\n", glGetString(GL_RENDERER));
-    printf("GL Version  : %s\n", glGetString(GL_VERSION));
-    //printf("Extensions : %s\n\n\n", (char*)glGetString(GL_EXTENSIONS));
-
-    // Testing for goodies
-    // Mongoose 2001.12.31, Fixed string use to check for bad strings
-    s = (char*)glGetString(GL_EXTENSIONS);
-
-    if (s && s[0])
-    {
-        //printf("\tGL_ARB_multitexture       \t\t");
-
-        if (strstr(s, "GL_ARB_multitexture"))
-        {
-            mFlags |= Render::fMultiTexture;
-            //printf("YES\n");
-        }
-        /*
-        else
-        {
-            printf("NO\n");
-        }
-
-        printf("\tGL_EXT_texture_env_combine\t\t");
-
-        if (strstr(s, "GL_EXT_texture_env_combine"))
-        {
-            printf("YES\n");
-        }
-        else
-        {
-            printf("NO\n");
-        }
-        */
-    }
-
-    // Set up Z buffer
-    glEnable(GL_DEPTH_TEST);
-    glDepthFunc(GL_LESS);
-
-    // Set up culling
-    glEnable(GL_CULL_FACE);
-    glFrontFace(GL_CW);
-    //glFrontFace(GL_CCW);
-    //glCullFace(GL_FRONT);
-
-    // Set background to black
-    glClearColor(BLACK[0], BLACK[1], BLACK[2], BLACK[3]);
-
-    // Disable lighting
-    glDisable(GL_LIGHTING);
-
-    // Set up alpha blending
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-
-    //glEnable(GL_ALPHA_TEST); // Disable per pixel alpha blending
-    glAlphaFunc(GL_GREATER, 0);
-
-    glPointSize(5.0);
-
-    // Setup shading
-    glShadeModel(GL_SMOOTH);
-
-    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-    glHint(GL_FOG_HINT, GL_NICEST);
-    glEnable(GL_COLOR_MATERIAL);
-    glEnable(GL_DITHER);
-
-    // AA polygon edges
-    glEnable(GL_POLYGON_SMOOTH);
-    glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
-
-    glDisable(GL_LINE_SMOOTH);
-    glDisable(GL_POINT_SMOOTH);
-    glDisable(GL_AUTO_NORMAL);
-    glDisable(GL_LOGIC_OP);
-    glDisable(GL_TEXTURE_1D);
-    glDisable(GL_STENCIL_TEST);
-    glDisable(GL_FOG);
-
-    glDisable(GL_NORMALIZE);
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_EDGE_FLAG_ARRAY);
-    glDisableClientState(GL_COLOR_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
-
-    glPolygonMode(GL_FRONT, GL_FILL);
-
-    glMatrixMode(GL_MODELVIEW);
-}
-
-
 void setLighting(bool on)
 {
     if (on)
@@ -548,13 +441,6 @@ void Render::setFlags(unsigned int flags)
 }
 
 
-void Render::Update(int width, int height)
-{
-    mWidth = width;
-    mHeight = height;
-}
-
-
 int Render::getMode()
 {
     return mMode;
@@ -638,13 +524,6 @@ void Render::Display()
     gl_test_reset();
 #endif
 
-    // Assertion: Rendering is disabled without texture or camera
-    if (!mCamera)
-    {
-        fprintf(stderr, "Render::Display> ERROR: No camera is registered\n");
-        return;
-    }
-
     switch (mMode)
     {
         case Render::modeDisabled:
@@ -705,16 +584,16 @@ void Render::Display()
             camPos[2] = curPos[2] + (64.0f * cosf(yaw));
         }
 
-        mCamera->setPosition(camPos);
+        gOpenRaider->mGame->mCamera->setPosition(camPos);
     }
 
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
 
     // Setup view in OpenGL with camera
-    mCamera->update();
-    mCamera->getPosition(camPos);
-    mCamera->getTarget(atPos);
+    gOpenRaider->mGame->mCamera->update();
+    gOpenRaider->mGame->mCamera->getPosition(camPos);
+    gOpenRaider->mGame->mCamera->getTarget(atPos);
     // Mongoose 2002.08.13, Quick fix to render OpenRaider upside down
     // gluLookAt(camPos[0], camPos[1], camPos[2], atPos[0], atPos[1], atPos[2], 0.0, -1.0, 0.0);
 
@@ -1107,13 +986,13 @@ void Render::drawObjects()
         glPushMatrix();
 
 #ifdef USING_FPS_CAMERA
-        mCamera->getPosition(curPos);
+        gOpenRaider->mGame->mCamera->getPosition(curPos);
         glTranslated(curPos[0], curPos[1], curPos[2]);
-        glRotated(mCamera->getYaw(), 0, 1, 0);
+        glRotated(gOpenRaider->mGame->mCamera->getYaw(), 0, 1, 0);
         glTranslated(0, 500, 1200);
 #else
         glTranslated(LARA->pos[0], LARA->pos[1], LARA->pos[2]);
-        glRotated(mCamera->getYaw(), 0, 1, 0);
+        glRotated(gOpenRaider->mGame->mCamera->getYaw(), 0, 1, 0);
 #endif
 
         drawModel(static_cast<SkeletalModel *>(LARA->tmpHook));
@@ -1638,7 +1517,7 @@ void Render::drawSprite(sprite_t *sprite)
     glTranslated(sprite->pos[0], sprite->pos[1], sprite->pos[2]);
 
     // Sprites must always face camera, because they have no depth  =)
-    glRotated(mCamera->getYaw(), 0, 1, 0);
+    glRotated(gOpenRaider->mGame->mCamera->getYaw(), 0, 1, 0);
 
     switch (mMode)
     {
@@ -1956,15 +1835,6 @@ void Render::ViewModel(entity_t *ent, int index)
 }
 
 
-void Render::RegisterCamera(Camera *camera)
-{
-    if (camera)
-    {
-        mCamera = camera;
-    }
-}
-
-
 void Render::addSkeletalModel(SkeletalModel *mdl)
 {
     mModels.push_back(mdl);

src/Window.cpp

@@ -98,9 +98,9 @@ int Window::initializeGL() {
 }
 
 void Window::resizeGL() {
-    float fovY = 45.0f;
-    float clipNear = 4.0f;
-    float clipFar = 4000.0f;
+    float fovY = 40.0f; // 45.0f
+    float clipNear = 10.0f; // 4.0f
+    float clipFar = 600000.0f; // 4000.0f
 
     glViewport(0, 0, mWidth, mHeight);
     glMatrixMode(GL_PROJECTION);