Added Game class.

Moved typedefs into global header.

include/Game.h

@@ -0,0 +1,33 @@
+/*!
+ * \file include/Game.h
+ * \brief Game abstraction
+ *
+ * \author xythobuz
+ */
+
+#ifndef _GAME_H_
+#define _GAME_H_
+
+#include "global.h"
+
+/*!
+ * \brief Game abstraction
+ */
+class Game {
+public:
+
+    Game(const char *level);
+
+    ~Game();
+
+    void handleAction(ActionEvents action, bool isFinished);
+
+    void handleMouseMotion(int xrel, int yrel);
+
+    void display();
+
+private:
+
+};
+
+#endif

include/OpenRaider.h

@@ -10,7 +10,9 @@
 
 #include <vector>
 
+#include "global.h"
 #include "Console.h"
+#include "Game.h"
 #include "Menu.h"
 #include "Sound.h"
 #include "Window.h"
@@ -21,21 +23,6 @@
 class OpenRaider {
 public:
 
-    typedef enum {
-        menu = 0,
-        console,
-        forward,
-        backward,
-        left,
-        right,
-        jump,
-        crouch,
-        use,
-        holster,
-
-        ActionEventCount // Should always be at the end
-    } ActionEvents;
-
     /*!
      * \brief Constructs an object of OpenRaider
      */
@@ -72,6 +59,7 @@ public:
     Sound *mSound;
     Menu *mMenu;
     Console *mConsole;
+    Game *mGame;
 
     bool mMapListFilled;
     std::vector<char *> mMapList;

include/Window.h

@@ -10,47 +10,7 @@
 
 #include <ctime>
 
-typedef enum {
-    zero = '0', one = '1',
-    two = '2', three = '3',
-    four = '4', five = '5',
-    six = '6', seven = '7',
-    eight = '8', nine = '9',
-    a = 'a', b = 'b',
-    c = 'c', d = 'd',
-    e = 'e', f = 'f',
-    g = 'g', h = 'h',
-    i = 'i', j = 'j',
-    k = 'k', l = 'l',
-    m = 'm', n = 'n',
-    o = 'o', p = 'p',
-    q = 'q', r = 'r',
-    s = 's', t = 't',
-    u = 'u', v = 'v',
-    w = 'w', x = 'x',
-    y = 'y', z = 'z',
-    quote, backslash, backspace, capslock,
-    comma, del, up, down, left, right,
-    end, equals, escape, f1, f2, f3, f4, f5,
-    f6, f7, f8, f9, f10, f11, f12, backquote,
-    home, insert, leftalt, leftctrl, leftbracket,
-    leftgui, leftshift, minus, numlock, pagedown,
-    pageup, pause, dot, rightalt, rightctrl, enter,
-    rightgui, rightbracket, rightshift, scrolllock,
-    semicolon, slash, space, tab,
-    leftmouse, middlemouse, rightmouse,
-    unknown
-} KeyboardButton;
-
-typedef struct {
-    char *text;
-    unsigned int x;
-    unsigned int y;
-    int w;
-    int h;
-    float scale;
-    unsigned char color[4];
-} WindowString;
+#include "global.h"
 
 /*!
  * \brief Windowing interface

include/global.h

@@ -0,0 +1,68 @@
+/*!
+ * \file include/global.h
+ * \brief Global typedefs
+ *
+ * \author xythobuz
+ */
+#ifndef _GLOBAL_H_
+#define _GLOBAL_H_
+
+typedef enum {
+    menuAction = 0,
+    consoleAction, // menu and console should always be the first two items
+    forwardAction,
+    backwardAction,
+    leftAction,
+    rightAction,
+    jumpAction,
+    crouchAction,
+    useAction,
+    holsterAction,
+
+    ActionEventCount // Should always be at the end
+} ActionEvents;
+
+typedef enum {
+    zero = '0', one = '1',
+    two = '2', three = '3',
+    four = '4', five = '5',
+    six = '6', seven = '7',
+    eight = '8', nine = '9',
+    a = 'a', b = 'b',
+    c = 'c', d = 'd',
+    e = 'e', f = 'f',
+    g = 'g', h = 'h',
+    i = 'i', j = 'j',
+    k = 'k', l = 'l',
+    m = 'm', n = 'n',
+    o = 'o', p = 'p',
+    q = 'q', r = 'r',
+    s = 's', t = 't',
+    u = 'u', v = 'v',
+    w = 'w', x = 'x',
+    y = 'y', z = 'z',
+    quote, backslash, backspace, capslock,
+    comma, del, up, down, left, right,
+    end, equals, escape, f1, f2, f3, f4, f5,
+    f6, f7, f8, f9, f10, f11, f12, backquote,
+    home, insert, leftalt, leftctrl, leftbracket,
+    leftgui, leftshift, minus, numlock, pagedown,
+    pageup, pause, dot, rightalt, rightctrl, enter,
+    rightgui, rightbracket, rightshift, scrolllock,
+    semicolon, slash, space, tab,
+    leftmouse, middlemouse, rightmouse,
+    unknown
+} KeyboardButton;
+
+typedef struct {
+    char *text;
+    unsigned int x;
+    unsigned int y;
+    int w;
+    int h;
+    float scale;
+    unsigned char color[4];
+} WindowString;
+
+#endif
+

src/CMakeLists.txt

@@ -32,6 +32,7 @@ set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 
 # Set Source files
 set (SRCS ${SRCS} "Console.cpp")
+set (SRCS ${SRCS} "Game.cpp")
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")

src/Console.cpp

@@ -98,7 +98,7 @@ void Console::display() {
         LINE_GEOMETRY(window);
 
         // Draw half-transparent *overlay*
-        glColor4f(0.0f, 0.0f, 0.0f, 0.5f);
+        glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
         glDisable(GL_TEXTURE_2D);
         glRecti(0, 0, window->mWidth, window->mHeight / 2);
         glEnable(GL_TEXTURE_2D);

src/Game.cpp

@@ -0,0 +1,38 @@
+/*!
+ * \file src/Game.cpp
+ * \brief Game abstraction
+ *
+ * \author xythobuz
+ */
+
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
+
+#include "main.h"
+#include "Window.h"
+#include "Game.h"
+
+Game::Game(const char *level) {
+}
+
+Game::~Game() {
+}
+
+void Game::handleAction(ActionEvents action, bool isFinished) {
+
+}
+
+void Game::handleMouseMotion(int xrel, int yrel) {
+
+}
+
+void Game::display() {
+    unsigned char color[4] = {0xFF, 0xFF, 0xFF, 0xFF};
+    gOpenRaider->mWindow->drawText(10, 10, 1.50f, color, "Game");
+}
+

src/Menu.cpp

@@ -91,7 +91,7 @@ void Menu::display() {
 
     if (mVisible) {
         // Draw half-transparent *overlay*
-        glColor4f(0.0f, 0.0f, 0.0f, 0.5f);
+        glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
         glDisable(GL_TEXTURE_2D);
         glRecti(0, 0, window->mWidth, window->mHeight);
         glEnable(GL_TEXTURE_2D);

src/OpenRaider.cpp

@@ -13,6 +13,11 @@
 #include "WindowSDL.h"
 
 #include "config.h"
+#include "Console.h"
+#include "Game.h"
+#include "Menu.h"
+#include "Sound.h"
+#include "Window.h"
 #include "utils/strings.h"
 #include "utils/time.h"
 #include "OpenRaider.h"
@@ -32,12 +37,16 @@ OpenRaider::OpenRaider() {
     mConsole = new Console();
     mSound = new Sound();
     mWindow = new WindowSDL();
+    mGame = NULL;
 
     for (int i = 0; i < ActionEventCount; i++)
         keyBindings[i] = unknown;
 }
 
 OpenRaider::~OpenRaider() {
+    if (mGame)
+        delete mGame;
+
     if (mMenu)
         delete mMenu;
 
@@ -338,25 +347,25 @@ int OpenRaider::bind(const char *action, const char *key) {
         tmp++;
 
     if (strcmp(tmp, "menu") == 0) {
-        return bind(menu, key);
+        return bind(menuAction, key);
     } else if (strcmp(tmp, "console") == 0) {
-        return bind(console, key);
+        return bind(consoleAction, key);
     } else if (strcmp(tmp, "forward") == 0) {
-        return bind(forward, key);
+        return bind(forwardAction, key);
     } else if (strcmp(tmp, "backward") == 0) {
-        return bind(backward, key);
+        return bind(backwardAction, key);
     } else if (strcmp(tmp, "left") == 0) {
-        return bind(left, key);
+        return bind(leftAction, key);
     } else if (strcmp(tmp, "right") == 0) {
-        return bind(right, key);
+        return bind(rightAction, key);
     } else if (strcmp(tmp, "jump") == 0) {
-        return bind(jump, key);
+        return bind(jumpAction, key);
     } else if (strcmp(tmp, "crouch") == 0) {
-        return bind(crouch, key);
+        return bind(crouchAction, key);
     } else if (strcmp(tmp, "use") == 0) {
-        return bind(use, key);
+        return bind(useAction, key);
     } else if (strcmp(tmp, "holster") == 0) {
-        return bind(holster, key);
+        return bind(holsterAction, key);
     } else {
         mConsole->print("bind-Error: Unknown action (%s --> %s)", key, action);
         return -1;
@@ -590,18 +599,24 @@ void OpenRaider::run() {
     while (mRunning) {
         clock_t startTime = systemTimerGet();
 
+        // Get keyboard and mouse input
         mWindow->eventHandling();
 
-        // Temp Debug
-        glClearColor(0.25f, 0.75f, 0.25f, 1.0f);
+        // Clear screen
+        glClearColor(0.00f, 0.00f, 0.00f, 1.0f);
         glClear(GL_COLOR_BUFFER_BIT);
 
+        // Draw game scene
+        if (mGame)
+            mGame->display();
+
+        // Draw 2D overlays (console and menu)
         mWindow->glEnter2D();
         mConsole->display();
         mMenu->display();
         mWindow->glExit2D();
 
-        // Put on screen
+        // Put new frame on screen
         mWindow->swapBuffersGL();
 
         // Fill map list after first render pass,
@@ -609,6 +624,8 @@ void OpenRaider::run() {
         if (!mMapListFilled)
             fillMapList();
 
+        // Check time it took to compute the last frame
+        // and delay for an appropriate amount of time
         clock_t stopTime = systemTimerGet();
         if (MAX_MS_PER_FRAME > (stopTime - startTime))
             mWindow->delay(MAX_MS_PER_FRAME - (stopTime - startTime));
@@ -616,28 +633,17 @@ void OpenRaider::run() {
 }
 
 void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
-    if ((keyBindings[menu] == key) && pressed) {
+    if ((keyBindings[menuAction] == key) && pressed) {
         mMenu->setVisible(!mMenu->isVisible());
     } else if (!mMenu->isVisible()) {
-        if ((keyBindings[console] == key) && pressed) {
+        if ((keyBindings[consoleAction] == key) && pressed) {
             mConsole->setVisible(!mConsole->isVisible());
         } else if (!mConsole->isVisible()) {
-            if (keyBindings[forward] == key) {
-
-            } else if (keyBindings[backward] == key) {
-
-            } else if (keyBindings[left] == key) {
-
-            } else if (keyBindings[right] == key) {
-
-            } else if (keyBindings[jump] == key) {
-
-            } else if (keyBindings[crouch] == key) {
-
-            } else if (keyBindings[use] == key) {
-
-            } else if (keyBindings[holster] == key) {
-
+            for (int i = forwardAction; i < ActionEventCount; i++) {
+                if (keyBindings[i] == key) {
+                    if (mGame)
+                        mGame->handleAction((ActionEvents)i, pressed);
+                }
             }
         } else {
             mConsole->handleKeyboard(key, pressed);
@@ -660,7 +666,10 @@ 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);
+    }
 }
 
 void OpenRaider::handleMouseScroll(int xrel, int yrel) {

src/main.cpp

@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
 
     // Create globals
     atexit(cleanupHandler);
-    printf("Initializing %s", VERSION);
+    printf("Initializing %s\n", VERSION);
     gOpenRaider = new OpenRaider();
 
     // Try to load a configuration