Minor bugfixes

ChangeLog.md

@@ -4,6 +4,10 @@
 
     [ 20141008 ]
     * Added freeGLUT windowing system to use if SDL2 is not available. Not yet working 100%.
+    * Moved unnecessarily duplicated code to Window base class
+    * Fixed Bug in new GLUT implementation: Console now working properly
+    * Fixed Bug where the debug overlay was flashing for a frame if it’s key is used in
+      combination with a modifier (in this case CMD + Q to quit)
 
     [ 20141007 ]
     * Set all RunTime vars to sensible defaults, so OpenRaider can try to start

TODO.md

@@ -16,6 +16,7 @@
 
 * Screenshots are sometimes not written, sometimes distorted?
     * Seems to happen if OpenRaider.ini sets a resolution larger than the window can be
+* When the freeGLUT windowing interface is used, the first pressed button seems to be repeated
 
 ## Cmake
 

include/UI.h

@@ -38,6 +38,7 @@ private:
     static unsigned int fontTex;
     static std::string iniFilename;
     static std::string logFilename;
+    static bool metaKeyIsActive;
 
     static std::list<std::tuple<KeyboardButton, bool>> keyboardEvents;
     static std::list<std::tuple<unsigned int, unsigned int, KeyboardButton, bool>> clickEvents;

include/Window.h

@@ -22,7 +22,7 @@ public:
 
     virtual void setMousegrab(bool grab) = 0;
 
-    virtual bool getMousegrab() = 0;
+    virtual bool getMousegrab() { return mMousegrab; }
 
     virtual int initialize() = 0;
 
@@ -30,13 +30,13 @@ public:
 
     virtual void setTextInput(bool on) = 0;
 
-    virtual bool getTextInput() = 0;
+    virtual bool getTextInput() { return mTextInput; }
 
     virtual void swapBuffersGL() = 0;
 
-    virtual unsigned int getWidth();
+    virtual unsigned int getWidth() { return mWidth; }
 
-    virtual unsigned int getHeight();
+    virtual unsigned int getHeight() { return mHeight; }
 
     virtual int initializeGL();
 
@@ -46,7 +46,7 @@ public:
 
     virtual void glExit2D();
 
-    virtual void lookAt(float eyeX, float eyeY, float eyeZ,
+    static void lookAt(float eyeX, float eyeY, float eyeZ,
                         float lookAtX, float lookAtY, float lookAtZ,
                         float upX, float upY, float upZ);
 

include/WindowGLUT.h

@@ -24,16 +24,12 @@ public:
 
     virtual void setMousegrab(bool grab);
 
-    virtual bool getMousegrab();
-
     virtual int initialize();
 
     virtual void eventHandling();
 
     virtual void setTextInput(bool on);
 
-    virtual bool getTextInput();
-
     virtual void swapBuffersGL();
 
 private:

include/WindowSDL.h

@@ -34,16 +34,12 @@ public:
 
     virtual void setMousegrab(bool grab);
 
-    virtual bool getMousegrab();
-
     virtual int initialize();
 
     virtual void eventHandling();
 
     virtual void setTextInput(bool on);
 
-    virtual bool getTextInput();
-
     virtual void swapBuffersGL();
 
 private:

src/Render.cpp

@@ -267,7 +267,7 @@ void Render::display()
     getCamera().update();
     getCamera().getTarget(atPos);
     // Mongoose 2002.08.13, Quick fix to render OpenRaider upside down
-    getWindow().lookAt(camPos[0], camPos[1], camPos[2], atPos[0], atPos[1], atPos[2], 0.0f, -1.0f, 0.0f);
+    Window::lookAt(camPos[0], camPos[1], camPos[2], atPos[0], atPos[1], atPos[2], 0.0f, -1.0f, 0.0f);
 
     // Update view volume for vising
     updateViewVolume();

src/UI.cpp

@@ -26,6 +26,7 @@ bool UI::visible = false;
 unsigned int UI::fontTex;
 std::string UI::iniFilename;
 std::string UI::logFilename;
+bool UI::metaKeyIsActive = false;
 
 std::list<std::tuple<KeyboardButton, bool>> UI::keyboardEvents;
 std::list<std::tuple<unsigned int, unsigned int, KeyboardButton, bool>> UI::clickEvents;
@@ -72,7 +73,7 @@ int UI::initialize() {
     void* tex_data = stbi_load_from_memory((const unsigned char*)png_data,
             (int)png_size, &tex_x, &tex_y, &tex_comp, 0);
 
-     //! \fixme TODO use proper slot
+     //! \fixme TODO use proper texture slot
     fontTex = getTextureManager().loadBufferSlot((unsigned char *)tex_data,
             tex_x, tex_y, RGBA, 32, 0, false);
 
@@ -141,7 +142,8 @@ void UI::eventsFinished() {
                     getMenu().setVisible(!getMenu().isVisible());
                     visible = false;
                 } else if (getRunTime().getKeyBinding(debugAction) == std::get<0>(i)) {
-                    visible = !visible;
+                    if (!metaKeyIsActive)
+                        visible = !visible;
                 }
             }
 
@@ -201,6 +203,9 @@ void UI::handleKeyboard(KeyboardButton key, bool pressed) {
     io.KeyShift = io.KeysDown[leftshiftKey] | io.KeysDown[rightshiftKey];
 
     keyboardEvents.push_back(std::make_tuple(key, pressed));
+
+    if ((key == leftguiKey) || (key == rightguiKey))
+        metaKeyIsActive = pressed;
 }
 
 void UI::handleText(char *text, bool notFinished) {

src/Window.cpp

@@ -15,14 +15,6 @@
 #include "utils/strings.h"
 #include "Window.h"
 
-unsigned int Window::getWidth() {
-    return mWidth;
-}
-
-unsigned int Window::getHeight() {
-    return mHeight;
-}
-
 int Window::initializeGL() {
     // Print driver support information
     //printf("GL Vendor  : %s\n", glGetString(GL_VENDOR));

src/WindowGLUT.cpp

@@ -15,6 +15,8 @@
 #include "utils/strings.h"
 #include "WindowGLUT.h"
 
+//! \todo Modifier keys currently don't create keyboard events...
+
 static int lastMouseX = 0;
 static int lastMouseY = 0;
 
@@ -61,10 +63,6 @@ void WindowGLUT::setMousegrab(bool grab) {
     }
 }
 
-bool WindowGLUT::getMousegrab() {
-    return mMousegrab;
-}
-
 int WindowGLUT::initialize() {
     assert(mInit == false);
 
@@ -105,11 +103,6 @@ void WindowGLUT::setTextInput(bool on) {
     mTextInput = on;
 }
 
-bool WindowGLUT::getTextInput() {
-    assert(mInit == true);
-    return mTextInput;
-}
-
 void WindowGLUT::swapBuffersGL() {
     assert(mInit == true);
     glutSwapBuffers();
@@ -126,17 +119,15 @@ void WindowGLUT::keyboardCallback(unsigned char key, int x, int y) {
             char s[2] = { static_cast<char>(key), '\0' };
             UI::handleText(s, false);
         }
-    } else {
-        KeyboardButton b = convertAsciiButton(key);
-        UI::handleKeyboard(b, true);
     }
+
+    KeyboardButton b = convertAsciiButton(key);
+    UI::handleKeyboard(b, true);
 }
 
 void WindowGLUT::keyboardUpCallback(unsigned char key, int x, int y) {
-    if (!getWindow().getTextInput()) {
-        KeyboardButton b = convertAsciiButton(key);
-        UI::handleKeyboard(b, false);
-    }
+    KeyboardButton b = convertAsciiButton(key);
+    UI::handleKeyboard(b, false);
 }
 
 void WindowGLUT::specialCallback(int key, int x, int y) {

src/WindowSDL.cpp

@@ -5,8 +5,7 @@
  * \author xythobuz
  */
 
-#include <cstdio>
-#include <ctime>
+#include <iostream>
 
 #include "global.h"
 #include "RunTime.h"
@@ -71,15 +70,11 @@ void WindowSDL::setMousegrab(bool grab) {
     }
 }
 
-bool WindowSDL::getMousegrab() {
-    return mMousegrab;
-}
-
 int WindowSDL::initialize() {
     assert(mInit == false);
 
     if (SDL_Init(SUBSYSTEMS_USED) != 0) {
-        printf("SDL_Init Error: %s\n", SDL_GetError());
+        std::cout << "SDL_Init Error: " << SDL_GetError() << std::endl;
         return -1;
     }
 
@@ -87,35 +82,31 @@ int WindowSDL::initialize() {
     if (mFullscreen)
         flags |= SDL_WINDOW_FULLSCREEN;
 
-    mInit = true;
-    setMousegrab(mMousegrab);
-
     if ((SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5) != 0)
         || (SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5) != 0)
         || (SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5) != 0)
         || (SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16) != 0)
         || (SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1) != 0)) {
-        printf("SDL_GL_SetAttribute Error: %s\n", SDL_GetError());
-        mInit = false;
-        return -3;
+        std::cout << "SDL_GL_SetAttribute Error: " << SDL_GetError() << std::endl;
+        return -2;
     }
 
     mWindow = SDL_CreateWindow(VERSION, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
                 mWidth, mHeight, flags);
     if (mWindow == NULL) {
-        printf("SDL_CreateWindow Error: %s\n", SDL_GetError());
-        mInit = false;
-        return -4;
+        std::cout << "SDL_CreateWindow Error: " << SDL_GetError() << std::endl;
+        return -3;
     }
 
     mGLContext = SDL_GL_CreateContext(mWindow);
     if (mGLContext == NULL) {
-        printf("SDL_GL_CreateContext Error: %s\n", SDL_GetError());
-        mInit = false;
-        return -5;
+        std::cout << "SDL_GL_CreateContext Error: " << SDL_GetError() << std::endl;
+        return -4;
     }
 
+    mInit = true;
     setSize(mWidth, mHeight);
+    setMousegrab(mMousegrab);
 
     return 0;
 }
@@ -455,14 +446,8 @@ void WindowSDL::setTextInput(bool on) {
         SDL_StopTextInput();
 }
 
-bool WindowSDL::getTextInput() {
-    assert(mInit == true);
-    return mTextInput;
-}
-
 void WindowSDL::swapBuffersGL() {
     assert(mInit == true);
-
     SDL_GL_SwapWindow(mWindow);
 }