Prepared to add glut

include/WindowGLUT.h

@@ -0,0 +1,53 @@
+/*!
+ * \file include/WindowGLUT.h
+ * \brief GLUT windowing implementation
+ *
+ * \author xythobuz
+ */
+
+#ifndef _WINDOW_GLUT_H_
+#define _WINDOW_GLUT_H_
+
+#include "Window.h"
+
+/*!
+ * \brief GLUT windowing implementation
+ */
+class WindowGLUT : public Window {
+public:
+
+    /*!
+     * \brief Constructs an object of WindowGLUT
+     */
+    WindowGLUT();
+
+    /*!
+     * \brief Deconstructs an object of WindowGLUT
+     */
+    virtual ~WindowGLUT();
+
+    virtual void setSize(unsigned int width, unsigned int height);
+
+    virtual void setFullscreen(bool fullscreen);
+
+    virtual void setMousegrab(bool grab);
+
+    virtual bool getMousegrab();
+
+    virtual int initialize();
+
+    virtual void eventHandling();
+
+    virtual void setTextInput(bool on);
+
+    virtual bool getTextInput();
+
+    virtual void delay(unsigned int ms);
+
+    virtual void swapBuffersGL();
+
+private:
+};
+
+#endif
+

src/CMakeLists.txt

@@ -1,3 +1,7 @@
+# Options
+option (ENABLE_AUDIO "Enable Sound Output" YES)
+option (FORCE_GLUT "Use freeGLUT even if SDL2 was found" NO)
+
 # Add OpenGL Library
 find_package (OpenGL REQUIRED)
 include_directories (SYSTEM ${OPENGL_INCLUDE_DIRS})
@@ -10,7 +14,7 @@ set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 
 # Add SDL2 Library
 find_package (SDL2)
-if (SDL2_FOUND)
+if (SDL2_FOUND AND NOT FORCE_GLUT)
     include_directories (SYSTEM ${SDL2_INCLUDE_DIR})
     set (LIBS ${LIBS} ${SDL2_LIBRARY})
 
@@ -20,7 +24,14 @@ if (SDL2_FOUND)
         include_directories (SYSTEM ${SDL2TTF_INCLUDE_DIR})
         set (LIBS ${LIBS} ${SDL2TTF_LIBRARY})
     endif (SDL2TTF_FOUND)
-endif (SDL2_FOUND)
+else (SDL2_FOUND AND NOT FORCE_GLUT)
+    # Add freeglut Library
+    find_package (GLUT)
+    if (GLUT_FOUND)
+        include_directories (SYSTEM ${GLUT_INCLUDE_DIR})
+        set (LIBS ${LIBS} ${GLUT_LIBRARY})
+    endif (GLUT_FOUND)
+endif (SDL2_FOUND AND NOT FORCE_GLUT)
 
 # Add OpenAL Library
 find_package (OpenAL)
@@ -77,7 +88,6 @@ set (SRCS ${SRCS} "Window.cpp")
 set (SRCS ${SRCS} "World.cpp")
 
 # Select available Sound library
-option (ENABLE_AUDIO "Enable Sound Output" YES)
 if (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
     set (SRCS ${SRCS} "SoundAL.cpp")
     set (USING_AL TRUE)
@@ -88,16 +98,21 @@ else (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 endif (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 
 # Select available Windowing library
-if (SDL2_FOUND)
+if (SDL2_FOUND AND NOT FORCE_GLUT)
     set (SRCS ${SRCS} "WindowSDL.cpp")
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL")
     if (SDL2TTF_FOUND)
         set (SRCS ${SRCS} "FontSDL.cpp")
         set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL_FONT")
     endif (SDL2TTF_FOUND)
-else (SDL2_FOUND)
-    message (FATAL_ERROR "SDL2 is required at the moment!")
-endif (SDL2_FOUND)
+else (SDL2_FOUND AND NOT FORCE_GLUT)
+    if (GLUT_FOUND)
+        set (SRCS ${SRCS} "WindowGLUT.cpp")
+        set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_GLUT")
+    else (GLUT_FOUND)
+        message (FATAL_ERROR "SDL2 or freeGLUT are required!")
+    endif (GLUT_FOUND)
+endif (SDL2_FOUND AND NOT FORCE_GLUT)
 
 if (PNG_FOUND)
     set (USING_PNG TRUE)

src/WindowGLUT.cpp

@@ -0,0 +1,97 @@
+/*!
+ * \file src/WindowGLUT.cpp
+ * \brief GLUT windowing implementation
+ *
+ * \author xythobuz
+ */
+
+#include <cstdio>
+#include <ctime>
+
+#include "global.h"
+#include "RunTime.h"
+#include "UI.h"
+#include "utils/strings.h"
+#include "WindowGLUT.h"
+
+WindowGLUT::WindowGLUT() {
+    mInit = false;
+    mWidth = DEFAULT_WIDTH;
+    mHeight = DEFAULT_HEIGHT;
+    mFullscreen = false;
+    mMousegrab = false;
+    mTextInput = false;
+}
+
+WindowGLUT::~WindowGLUT() {
+    if (mInit) {
+    }
+}
+
+void WindowGLUT::setSize(unsigned int width, unsigned int height) {
+    assert(width > 0);
+    assert(height > 0);
+
+    mWidth = width;
+    mHeight = height;
+
+    if (mInit == true) {
+        resizeGL();
+    }
+}
+
+void WindowGLUT::setFullscreen(bool fullscreen) {
+    mFullscreen = fullscreen;
+
+    if (mInit == true) {
+    }
+}
+
+void WindowGLUT::setMousegrab(bool grab) {
+    mMousegrab = grab;
+
+    if (mInit == true) {
+    }
+}
+
+bool WindowGLUT::getMousegrab() {
+    return mMousegrab;
+}
+
+int WindowGLUT::initialize() {
+    assert(mInit == false);
+
+
+    mInit = true;
+
+
+    return 0;
+}
+
+void WindowGLUT::eventHandling() {
+    assert(mInit == true);
+
+
+
+    UI::eventsFinished();
+}
+
+void WindowGLUT::setTextInput(bool on) {
+    assert(mInit == true);
+
+    mTextInput = on;
+}
+
+bool WindowGLUT::getTextInput() {
+    assert(mInit == true);
+    return mTextInput;
+}
+
+void WindowGLUT::delay(unsigned int ms) {
+    assert(mInit == true);
+}
+
+void WindowGLUT::swapBuffersGL() {
+    assert(mInit == true);
+}
+

src/main.cpp

@@ -37,6 +37,8 @@
 
 #ifdef USING_SDL
 #include "WindowSDL.h"
+#elif defined(USING_GLUT)
+#include "WindowGLUT.h"
 #else
 #error No Windowing Library selected!
 #endif
@@ -129,6 +131,8 @@ int main(int argc, char* argv[]) {
 
 #ifdef USING_SDL
     gWindow.reset(new WindowSDL());
+#elif defined(USING_GLUT)
+    gWindow.reset(new WindowGLUT());
 #endif
 
     Command::fillCommandList();