Started porting SDL code

CMakeLists.txt

@@ -30,7 +30,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 #################################################################
 
 # Build warnings
-set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed -Wno-weak-vtables")
+set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
 set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
 set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
 set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")

cmake/Config.h.in → include/Config.h.in

@@ -1,3 +1,7 @@
 #define VERSION "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@ (@CMAKE_BUILD_TYPE@)"
 #define BUILD_HOST "@OpenRaider_BUILD_HOST@"
 
+#define DEFAULT_CONFIG_PATH "~/.OpenRaider/"
+#define DEFAULT_CONFIG_FILE "OpenRaider.init"
+#define DEFAULT_WIDTH 640
+#define DEFAULT_HEIGHT 480

include/Window.h

@@ -8,6 +8,12 @@
 #ifndef _WINDOW_H_
 #define _WINDOW_H_
 
+typedef struct {
+    char *text;
+    unsigned int x;
+    unsigned int y;
+} WindowString;
+
 /*!
  * \brief Windowing interface
  */
@@ -26,6 +32,10 @@ public:
     virtual void setMousegrab(bool grab) = 0;
 
     virtual int initialize() = 0;
+
+    virtual void writeString(WindowString *s) = 0;
+
+    virtual void resizeGL(unsigned int width, unsigned int height);
 };
 
 #endif

include/WindowSDL.h

@@ -36,7 +36,10 @@ public:
 
     virtual int initialize();
 
+    virtual void writeString(WindowString *s);
+
 private:
+    bool mInit;
     unsigned int mWidth;
     unsigned int mHeight;
     bool mFullscreen;

src/CMakeLists.txt

@@ -34,6 +34,7 @@ set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Sound.cpp")
+set (SRCS ${SRCS} "Window.cpp")
 
 # Select available Windowing library
 if (SDL2_FOUND AND SDL2TTF_FOUND)
@@ -47,7 +48,7 @@ endif (SDL2_FOUND AND SDL2TTF_FOUND)
 
 # Configuration Header file
 configure_file (
-    "${PROJECT_SOURCE_DIR}/cmake/Config.h.in"
+    "${PROJECT_SOURCE_DIR}/include/Config.h.in"
     "${PROJECT_BINARY_DIR}/Config.h"
 )
 
@@ -105,7 +106,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
     # Display message if something is enabled
     if (NOT "${SSE_FOUND_MSG}" STREQUAL "")
-        message ("Enabled${SSE_FOUND_MSG}...")
+        message (STATUS "Enabled${SSE_FOUND_MSG}...")
     endif (NOT "${SSE_FOUND_MSG}" STREQUAL "")
 endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 

src/Window.cpp

@@ -0,0 +1,14 @@
+/*!
+ * \file src/Window.cpp
+ * \brief windowing implementation
+ *
+ * \author xythobuz
+ */
+
+
+#include "Window.h"
+
+void Window::resizeGL(unsigned int width, unsigned int height) {
+
+}
+

src/WindowSDL.cpp

@@ -7,10 +7,17 @@
 
 #include <assert.h>
 
+#include "config.h"
 #include "WindowSDL.h"
 
 WindowSDL::WindowSDL() {
-
+    mInit = false;
+    mWidth = DEFAULT_WIDTH;
+    mHeight = DEFAULT_HEIGHT;
+    mFullscreen = false;
+    mMousegrab = false;
+    mWindow = NULL;
+    mGLContext = NULL;
 }
 
 WindowSDL::~WindowSDL() {
@@ -23,17 +30,65 @@ void WindowSDL::setSize(unsigned int width, unsigned int height) {
 
     mWidth = width;
     mHeight = height;
+
+    if (mInit == true) {
+        SDL_SetWindowSize(mWindow, mWidth, mHeight);
+        resizeGL(mWidth, mHeight);
+    }
 }
 
 void WindowSDL::setFullscreen(bool fullscreen) {
     mFullscreen = fullscreen;
+
+    if (mInit == true) {
+        if (mFullscreen)
+            SDL_SetWindowFullscreen(mWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
+        else
+            SDL_SetWindowFullscreen(mWindow, 0);
+    }
 }
 
 void WindowSDL::setMousegrab(bool grab) {
     mMousegrab = grab;
+
+    if (mInit == true) {
+        if (mMousegrab) {
+            SDL_SetRelativeMouseMode(SDL_TRUE);
+        } else {
+            SDL_SetRelativeMouseMode(SDL_FALSE);
+            SDL_ShowCursor(1);
+        }
+    }
 }
 
 int WindowSDL::initialize() {
-    return -1;
+    SDL_Init(SDL_INIT_VIDEO);
+
+    mInit = true;
+
+    int flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
+    if (mFullscreen)
+        flags |= SDL_WINDOW_FULLSCREEN;
+
+    setMousegrab(mMousegrab);
+
+    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
+    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+    SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+    mWindow = SDL_CreateWindow(VERSION, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+                mWidth, mHeight, flags);
+    mGLContext = SDL_GL_CreateContext(mWindow);
+    setSize(mWidth, mHeight);
+
+    return 0;
+}
+
+void WindowSDL::writeString(WindowString *s) {
+    assert(s != NULL);
+    assert(s->text != NULL);
+    assert(mInit == true);
 }
 

src/main.cpp

@@ -13,9 +13,6 @@
 #include "OpenRaider.h"
 #include "main.h"
 
-#define DEFAULT_CONFIG_PATH "~/.OpenRaider/"
-#define DEFAULT_CONFIG_FILE "OpenRaider.init"
-
 OpenRaider *gOpenRaider = NULL;
 
 void cleanupHandler() {