Added Menu

data/OpenRaider.ini

@@ -7,7 +7,7 @@ set audiodir   "$(basedir)/music"
 set datadir    "$(basedir)/data"
 set font       "$(datadir)/test.ttf"
 
- # Not needed for Mac OS X
+# Not needed for Mac OS X
 set gldriver   "/usr/lib/libGL.so.1"
 
 # Windowing

include/Menu.h

@@ -0,0 +1,40 @@
+/*!
+ * \file include/Menu.h
+ * \brief Menu 'overlay'
+ *
+ * \author xythobuz
+ */
+
+#ifndef _MENU_H_
+#define _MENU_H_
+
+#include "Window.h"
+
+/*!
+ * \brief Menu 'overlay'
+ */
+class Menu {
+public:
+
+    /*!
+     * \brief Constructs an object of Menu
+     */
+    Menu();
+
+    /*!
+     * \brief Deconstructs an object of Menu
+     */
+    ~Menu();
+
+    void setVisible(bool visible);
+
+    bool isVisible();
+
+    void display();
+
+private:
+    bool mVisible;
+    WindowString mainText;
+};
+
+#endif

include/OpenRaider.h

@@ -10,6 +10,7 @@
 
 #include <vector>
 
+#include "Menu.h"
 #include "Sound.h"
 #include "Window.h"
 
@@ -49,12 +50,13 @@ public:
 
     void run();
 
+    Window *mWindow;
+    Sound *mSound;
+    Menu *mMenu;
+
 private:
     bool mInit;
     bool mRunning;
-    Window *mWindow;
-
-    Sound *mSound;
 
     char *mBaseDir;
     char *mPakDir;

include/Window.h

@@ -14,6 +14,8 @@ typedef struct {
     char *text;
     unsigned int x;
     unsigned int y;
+    int w;
+    int h;
     float scale;
     unsigned char color[3];
 } WindowString;
@@ -47,9 +49,9 @@ public:
 
     virtual int initializeGL();
 
-    virtual void resizeGL(unsigned int w, unsigned int h);
+    virtual void resizeGL();
 
-    virtual void glEnter2D(unsigned int width, unsigned int height);
+    virtual void glEnter2D();
 
     virtual void glExit2D();
 
@@ -58,6 +60,18 @@ public:
     virtual int initializeFont() = 0;
 
     virtual void writeString(WindowString *s) = 0;
+
+    unsigned int mWidth;
+    unsigned int mHeight;
+
+protected:
+    bool mInit;
+    char *mDriver;
+    bool mFullscreen;
+    bool mMousegrab;
+
+    bool mFontInit;
+    char *mFontName;
 };
 
 #endif

include/WindowSDL.h

@@ -60,17 +60,10 @@ public:
     virtual void writeString(WindowString *s);
 
 private:
-    bool mInit;
-    char *mDriver;
-    unsigned int mWidth;
-    unsigned int mHeight;
-    bool mFullscreen;
-    bool mMousegrab;
+
     SDL_Window *mWindow;      //!< This is the pointer to the SDL surface
     SDL_GLContext mGLContext; //!< The OpenGL Context
 
-    bool mFontInit;
-    char *mFontName;
     TTF_Font *mFont;
     GLuint mFontTexture;
 };

include/main.h

@@ -7,6 +7,8 @@
 #ifndef _MAIN_H_
 #define _MAIN_H_
 
+#include "OpenRaider.h"
+
 extern OpenRaider *gOpenRaider; //!< Main Game Singleton
 
 /*!

include/utils/strings.h

@@ -12,6 +12,8 @@
 #include <cstdarg>
 #include <vector>
 
+char *stringRemoveQuotes(const char *s);
+
 char *stringReplace(const char *s, const char *search, const char *replace);
 
 void printStringVector(std::vector<char *> *args);

src/CMakeLists.txt

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

src/Menu.cpp

@@ -0,0 +1,53 @@
+/*!
+ * \file src/Menu.cpp
+ * \brief Menu 'overlay'
+ *
+ * \author xythobuz
+ */
+
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
+
+#include "config.h"
+#include "main.h"
+#include "Menu.h"
+#include "utils/strings.h"
+
+Menu::Menu() {
+    mVisible = false;
+    mainText.text = bufferString(VERSION);
+    mainText.color[0] = 0xFF;
+    mainText.color[1] = 0xFF;
+    mainText.color[2] = 0xFF;
+    mainText.scale = 1.2f;
+    mainText.w = 0;
+    mainText.h = 0;
+}
+
+Menu::~Menu() {
+
+}
+
+void Menu::setVisible(bool visible) {
+    mVisible = visible;
+}
+
+bool Menu::isVisible() {
+    return mVisible;
+}
+
+void Menu::display() {
+    Window *window = gOpenRaider->mWindow;
+
+    if (mVisible) {
+        mainText.x = (window->mWidth / 2) - (mainText.w / 2);
+        mainText.y = 10;
+        window->writeString(&mainText);
+    }
+}
+

src/OpenRaider.cpp

@@ -26,11 +26,15 @@ OpenRaider::OpenRaider() {
     mAudioDir = NULL;
     mDataDir = NULL;
 
+    mMenu = new Menu();
     mSound = new Sound();
     mWindow = new WindowSDL();
 }
 
 OpenRaider::~OpenRaider() {
+    if (mMenu)
+        delete mMenu;
+
     if (mSound)
         delete mSound;
 
@@ -171,6 +175,18 @@ char *OpenRaider::expandDirectoryNames(const char *s) {
     return NULL;
 }
 
+#define CHANGE_DIR_WITH_EXPANSION(a) do {     \
+    char *quotes = stringRemoveQuotes(value); \
+    char *tmp = expandDirectoryNames(quotes); \
+    if (tmp == NULL) {                        \
+        a = fullPath(quotes, 0);              \
+    } else {                                  \
+        a = fullPath(tmp, 0);                 \
+        delete [] tmp;                        \
+    }                                         \
+    delete [] quotes;                         \
+} while(false)
+
 int OpenRaider::set(const char *var, const char *value) {
     if (strcmp(var, "size") == 0) {
         // value has format like "\"1024x768\""
@@ -204,49 +220,27 @@ int OpenRaider::set(const char *var, const char *value) {
         }
         mSound->setVolume(vol);
     } else if (strcmp(var, "mouse_x") == 0) {
-        // TODO mouse support
+        float sense = 1.0f;
+        if (sscanf(value, "%f", &sense) != 1) {
+            printf("set-mouse_x-Error: Invalid value (%s)\n", value);
+            return -6;
+        }
+        //! \todo mouse support
     } else if (strcmp(var, "mouse_y") == 0) {
-        // TODO mouse support
-    } else if (strcmp(var, "basedir") == 0) {
-        char *quotes = stringReplace(value, "\"", "");
-        char *tmp = expandDirectoryNames(quotes);
-        if (tmp == NULL) {
-            mBaseDir = fullPath(quotes, 0);
-        } else {
-            mBaseDir = fullPath(tmp, 0);
-            delete [] tmp;
+        float sense = 1.0f;
+        if (sscanf(value, "%f", &sense) != 1) {
+            printf("set-mouse_y-Error: Invalid value (%s)\n", value);
+            return -7;
         }
-        delete [] quotes;
+        //! \todo mouse support
+    } else if (strcmp(var, "basedir") == 0) {
+        CHANGE_DIR_WITH_EXPANSION(mBaseDir);
     } else if (strcmp(var, "pakdir") == 0) {
-        char *quotes = stringReplace(value, "\"", "");
-        char *tmp = expandDirectoryNames(quotes);
-        if (tmp == NULL) {
-            mPakDir = fullPath(quotes, 0);
-        } else {
-            mPakDir = fullPath(tmp, 0);
-            delete [] tmp;
-        }
-        delete [] quotes;
+        CHANGE_DIR_WITH_EXPANSION(mPakDir);
     } else if (strcmp(var, "audiodir") == 0) {
-        char *quotes = stringReplace(value, "\"", "");
-        char *tmp = expandDirectoryNames(quotes);
-        if (tmp == NULL) {
-            mAudioDir = fullPath(quotes, 0);
-        } else {
-            mAudioDir = fullPath(tmp, 0);
-            delete [] tmp;
-        }
-        delete [] quotes;
+        CHANGE_DIR_WITH_EXPANSION(mAudioDir);
     } else if (strcmp(var, "datadir") == 0) {
-        char *quotes = stringReplace(value, "\"", "");
-        char *tmp = expandDirectoryNames(quotes);
-        if (tmp == NULL) {
-            mDataDir = fullPath(quotes, 0);
-        } else {
-            mDataDir = fullPath(tmp, 0);
-            delete [] tmp;
-        }
-        delete [] quotes;
+        CHANGE_DIR_WITH_EXPANSION(mDataDir);
     } else if (strcmp(var, "font") == 0) {
         char *quotes = stringReplace(value, "\"", "");
         char *tmp = expandDirectoryNames(quotes);
@@ -266,19 +260,23 @@ int OpenRaider::set(const char *var, const char *value) {
 }
 
 int OpenRaider::bind(const char *action, const char *key) {
-    if (strcmp(action, "console") == 0) {
+    const char *tmp = action;
+    if (action[0] == '+')
+        tmp++;
 
-    } else if (strcmp(action, "forward") == 0) {
+    if (strcmp(tmp, "console") == 0) {
 
-    } else if (strcmp(action, "backward") == 0) {
+    } else if (strcmp(tmp, "forward") == 0) {
 
-    } else if (strcmp(action, "jump") == 0) {
+    } else if (strcmp(tmp, "backward") == 0) {
 
-    } else if (strcmp(action, "crouch") == 0) {
+    } else if (strcmp(tmp, "jump") == 0) {
 
-    } else if (strcmp(action, "left") == 0) {
+    } else if (strcmp(tmp, "crouch") == 0) {
 
-    } else if (strcmp(action, "right") == 0) {
+    } else if (strcmp(tmp, "left") == 0) {
+
+    } else if (strcmp(tmp, "right") == 0) {
 
     } else {
         printf("bind-Error: Unknown action (%s --> %s)\n", key, action);
@@ -307,6 +305,8 @@ int OpenRaider::initialize() {
     if (mSound->initialize() != 0)
         return -4;
 
+    mMenu->setVisible(true);
+
     mInit = true;
 
     return 0;
@@ -322,15 +322,15 @@ void OpenRaider::run() {
 
         mWindow->eventHandling();
 
+        // Temp Debug
+        glClearColor(0.25f, 0.75f, 0.25f, 1.0f);
         glClear(GL_COLOR_BUFFER_BIT);
 
-        WindowString s;
-        s.text = bufferString("This text is not fixed-width...");
-        s.x = 100;
-        s.y = 100;
-        s.scale = 1.5f;
-        s.color[0] = s.color[1] = s.color[2] = 0xFF;
-        mWindow->writeString(&s);
+        mWindow->glEnter2D();
+
+        mMenu->display();
+
+        mWindow->glExit2D();
 
         mWindow->swapBuffersGL();
 

src/Window.cpp

@@ -25,13 +25,14 @@ Window::~Window() {
 
 int Window::initializeGL() {
     // 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("GL Vendor  : %s\n", glGetString(GL_VENDOR));
+    //printf("GL Renderer: %s\n", glGetString(GL_RENDERER));
+    //printf("GL Version : %s\n", glGetString(GL_VERSION));
 
     // Testing for goodies
     const char *s = (const char *)glGetString(GL_EXTENSIONS);
     if ((s != NULL) && (s[0] != '\0')) {
+        //! \todo MultiTexture flag
         //if (strstr(s, "GL_ARB_multitexture"))
             //mFlags |= Render::fMultiTexture;
     }
@@ -95,28 +96,25 @@ int Window::initializeGL() {
     return 0;
 }
 
-void Window::resizeGL(unsigned int w, unsigned int h) {
+void Window::resizeGL() {
     float fovY = 45.0f;
     float clipNear = 4.0f;
     float clipFar = 4000.0f;
 
-    assert(w > 0);
-    assert(h > 0);
-
-    glViewport(0, 0, w, h);
+    glViewport(0, 0, mWidth, mHeight);
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
 
     // Adjust clipping
     GLfloat fH = tanf(fovY * OR_PI / 360.0f) * clipNear;
-    GLfloat fW = fH * ((GLfloat)w) / ((GLfloat)h);
+    GLfloat fW = fH * ((GLfloat)mWidth) / ((GLfloat)mHeight);
     glFrustum(-fW, fW, -fH, fH, clipNear, clipFar);
 
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
 }
 
-void Window::glEnter2D(unsigned int width, unsigned int height) {
+void Window::glEnter2D() {
     glPushAttrib(GL_ENABLE_BIT);
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_CULL_FACE);
@@ -126,13 +124,13 @@ void Window::glEnter2D(unsigned int width, unsigned int height) {
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    glViewport(0, 0, width, height);
+    glViewport(0, 0, mWidth, mHeight);
 
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
     glLoadIdentity();
 
-    glOrtho(0.0, (GLdouble)width, (GLdouble)height, 0.0, 0.0, 1.0);
+    glOrtho(0.0, (GLdouble)mWidth, (GLdouble)mHeight, 0.0, 0.0, 1.0);
 
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();

src/WindowSDL.cpp

@@ -70,7 +70,7 @@ void WindowSDL::setSize(unsigned int width, unsigned int height) {
 
     if (mInit == true) {
         SDL_SetWindowSize(mWindow, mWidth, mHeight);
-        resizeGL(mWidth, mHeight);
+        resizeGL();
     }
 }
 
@@ -250,6 +250,13 @@ void WindowSDL::writeString(WindowString *s) {
         return;
     }
 
+    if (TTF_SizeUTF8(mFont, s->text, &s->w, &s->h) != 0) {
+        printf("TTF_SizeUTF8 Error: %s\n", TTF_GetError());
+        // Don't need to abort
+    }
+    s->w = (int)((float)s->w * s->scale);
+    s->h = (int)((float)s->h * s->scale);
+
     GLenum textureFormat;
     if (surface->format->BytesPerPixel == 4) {
         if (surface->format->Rmask == 0x000000FF)
@@ -265,24 +272,25 @@ void WindowSDL::writeString(WindowString *s) {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexImage2D(GL_TEXTURE_2D, 0, surface->format->BytesPerPixel, surface->w, surface->h, 0, textureFormat, GL_UNSIGNED_BYTE, surface->pixels);
 
-    glEnter2D(mWidth, mHeight);
+    GLuint xMin = s->x;
+    GLuint yMin = s->y;
+    GLuint xMax = xMin + (int)((float)surface->w * s->scale);
+    GLuint yMax = yMin + (int)((float)surface->h * s->scale);
 
     glBegin(GL_QUADS);
         glTexCoord2f(0.0f, 0.0f);
-        glVertex2i(s->x, s->y);
+        glVertex2i(xMin, yMin);
 
         glTexCoord2f(0.0f, 1.0f);
-        glVertex2i(s->x, (int)((float)surface->h * s->scale));
+        glVertex2i(xMin, yMax);
 
         glTexCoord2f(1.0f, 1.0f);
-        glVertex2i((int)((float)surface->w * s->scale), (int)((float)surface->h * s->scale));
+        glVertex2i(xMax, yMax);
 
         glTexCoord2f(1.0f, 0.0f);
-        glVertex2i((int)((float)surface->w * s->scale), s->y);
+        glVertex2i(xMax, yMin);
     glEnd();
 
-    glExit2D();
-
     SDL_FreeSurface(surface);
 }
 

src/main.cpp

@@ -10,7 +10,6 @@
 #include <cstring>
 
 #include "config.h"
-#include "OpenRaider.h"
 #include "main.h"
 
 OpenRaider *gOpenRaider = NULL;

src/utils/strings.cpp

@@ -17,6 +17,19 @@
 
 #include "utils/strings.h"
 
+char *stringRemoveQuotes(const char *s) {
+    size_t length = strlen(s);
+    if ((s[0] == '"') && (s[length - 1] == '"')) {
+        char *buf = new char[length - 1];
+        for (size_t i = 1; i < (length - 1); i++)
+            buf[i - 1] = s[i];
+        buf[length - 2] = '\0';
+        return buf;
+    } else {
+        return bufferString("%s", s);
+    }
+}
+
 char *stringReplace(const char *s, const char *search, const char *replace) {
     char *tmp = strstr(s, search);
     if (tmp == NULL)