Camera now also service

include/Game.h

@@ -43,7 +43,6 @@ public:
     //! \fixme should be private
     entity_t *mLara;
     Render *mRender;
-    Camera *mCamera;
 
 private:
 

include/main.h

@@ -7,6 +7,7 @@
 #ifndef _MAIN_H_
 #define _MAIN_H_
 
+#include "Camera.h"
 #include "Console.h"
 #include "Game.h"
 #include "Menu.h"
@@ -15,6 +16,8 @@
 #include "Window.h"
 #include "World.h"
 
+Camera &getCamera();
+
 Console &getConsole();
 
 Game &getGame();

src/Camera.cpp

@@ -14,7 +14,7 @@
 Camera::Camera() {
     mFlags = 0;
     mViewDistance = 14.0f;
-    mTranslateDelta = 256.0f;
+    mTranslateDelta = 512.0f; // 256.0f
     mFlags &= Camera_FlyMode;
     reset();
 }
@@ -138,7 +138,7 @@ void Camera::reset() {
     mSide[2] = 0.0f;
 
     mUp[0] = 0.0f;
-    mUp[1] = 1.0f;
+    mUp[1] = -1.0f; // 1.0f
     mUp[2] = 0.0f;
 
     mQ.setIdentity();

src/Game.cpp

@@ -38,7 +38,6 @@ Game::Game() {
     mTextureLevelOffset = 0;
     mTextureOffset = 0;
 
-    mCamera = NULL;
     mRender = NULL;
 }
 
@@ -47,19 +46,9 @@ Game::~Game() {
 
     if (mRender)
         delete mRender;
-
-    if (mCamera)
-        delete mCamera;
 }
 
 int Game::initialize() {
-    // Set up Camera
-    vec3_t up = {0.0f, -1.0f, 0.0f};
-    mCamera = new Camera();
-    mCamera->reset();
-    mCamera->setSpeed(512);
-    mCamera->setUp(up);
-
     // Set up Renderer
     mRender = new Render();
     mRender->initTextures(getOpenRaider().mDataDir, &mTextureStart, &mTextureLevelOffset);
@@ -160,22 +149,22 @@ void Game::handleMouseMotion(int xrel, int yrel) {
         // Move Camera on X Axis
         if (xrel > 0)
             while (xrel-- > 0)
-                mCamera->command(CAMERA_ROTATE_RIGHT);
+                getCamera().command(CAMERA_ROTATE_RIGHT);
         else if (xrel < 0)
             while (xrel++ < 0)
-                mCamera->command(CAMERA_ROTATE_LEFT);
+                getCamera().command(CAMERA_ROTATE_LEFT);
 
         // Move Camera on Y Axis
         if (yrel > 0)
             while (yrel-- > 0)
-                mCamera->command(CAMERA_ROTATE_UP);
+                getCamera().command(CAMERA_ROTATE_UP);
         else if (yrel < 0)
             while (yrel++ < 0)
-                mCamera->command(CAMERA_ROTATE_DOWN);
+                getCamera().command(CAMERA_ROTATE_DOWN);
 
         // Fix Laras rotation
-        mLara->angles[1] = mCamera->getRadianYaw();
-        mLara->angles[2] = mCamera->getRadianPitch();
+        mLara->angles[1] = getCamera().getRadianYaw();
+        mLara->angles[2] = getCamera().getRadianPitch();
     }
 }
 
@@ -750,7 +739,7 @@ void Game::processMoveable(int index, int i, int *ent,
         gLaraModel = r_model; // hack to avoid broken system until new event sys
 
         lara = true;
-        mCamera->translate(pos[0], pos[1] - 470, pos[2]);
+        getCamera().translate(pos[0], pos[1] - 470, pos[2]);
         thing->type = 0x02;
         mLara = thing; // Mongoose 2002.03.22, Cheap hack for now
         mLara->master = 0x0;

src/Render.cpp

@@ -554,16 +554,16 @@ void Render::Display()
             camPos[2] = curPos[2] + (64.0f * cosf(yaw));
         }
 
-        getGame().mCamera->setPosition(camPos);
+        getCamera().setPosition(camPos);
     }
 
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
 
     // Setup view in OpenGL with camera
-    getGame().mCamera->update();
-    getGame().mCamera->getPosition(camPos);
-    getGame().mCamera->getTarget(atPos);
+    getCamera().update();
+    getCamera().getPosition(camPos);
+    getCamera().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.0f, -1.0f, 0.0f);
@@ -1023,13 +1023,13 @@ void Render::drawObjects()
         glPushMatrix();
 
 #ifdef USING_FPS_CAMERA
-        getGame().mCamera->getPosition(curPos);
+        getCamera().getPosition(curPos);
         glTranslated(curPos[0], curPos[1], curPos[2]);
-        glRotated(getGame().mCamera->getYaw(), 0, 1, 0);
+        glRotated(getCamera().getYaw(), 0, 1, 0);
         glTranslated(0, 500, 1200);
 #else
         glTranslated(getGame().mLara->pos[0], getGame().mLara->pos[1], getGame().mLara->pos[2]);
-        glRotated(getGame().mCamera->getYaw(), 0, 1, 0);
+        glRotated(getCamera().getYaw(), 0, 1, 0);
 #endif
 
         drawModel(static_cast<SkeletalModel *>(getGame().mLara->tmpHook));
@@ -1554,7 +1554,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(getGame().mCamera->getYaw(), 0, 1, 0);
+    glRotated(getCamera().getYaw(), 0, 1, 0);
 
     switch (mMode)
     {

src/main.cpp

@@ -15,6 +15,7 @@
 #include "utils/time.h"
 #include "WindowSDL.h"
 
+Camera *gCamera = NULL;
 Console *gConsole = NULL;
 Game *gGame = NULL;
 Menu *gMenu = NULL;
@@ -23,6 +24,11 @@ Sound *gSound = NULL;
 Window *gWindow = NULL;
 World *gWorld = NULL;
 
+Camera &getCamera() {
+    assert(gCamera != NULL);
+    return *gCamera;
+}
+
 Console &getConsole() {
     assert(gConsole != NULL);
     return *gConsole;
@@ -71,6 +77,9 @@ void cleanupHandler(void) {
     if (gWorld)
         delete gWorld;
 
+    if (gCamera)
+        delete gCamera;
+
     if (gOpenRaider)
         delete gOpenRaider;
 
@@ -127,6 +136,7 @@ int main(int argc, char *argv[]) {
     gWindow = new WindowSDL();
     gSound = new Sound();
     gWorld = new World();
+    gCamera = new Camera();
     gConsole = new Console();
     gMenu = new Menu();
     gGame = new Game();