Port to SDL2

ChangeLog

@@ -7,6 +7,8 @@
 
 	[ 20140210 ]
 	* Finished the Tomb Raider 1 Item/State definitions
+	* Ported to SDL2 and SDL2-TTF using the Migration Guide:
+	  https://wiki.libsdl.org/MigrationGuide
 
 	[ 20140209 ]
 	* Renamed OpenGLMesh to Mesh

Makefile

@@ -29,9 +29,9 @@ UNAME=$(shell uname -s)
 # -DUNICODE_SUPPORT			Add unicode/internation keyboard support
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
 
-BASE_DEFS=$(shell sdl-config --cflags) -Iinclude -DUSING_EMITTER
+BASE_DEFS=$(shell sdl2-config --cflags) -Iinclude -DUSING_EMITTER
 
-BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
+BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
 	-lpthread -lSDL_ttf
 
 # -DDEBUG_GL
@@ -362,9 +362,9 @@ TombRaider.test:
 GLString.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
-	$(shell sdl-config --cflags) $(shell sdl-config --libs) \
-	$(GL_LIBS) $(GL_DEFS) -lSDL_ttf -lm -lstdc++ \
-	src/Texture.cpp src/GLString.cpp \
+	$(shell sdl2-config --cflags) $(shell sdl2-config --libs) \
+	$(GL_LIBS) $(GL_DEFS) -lSDL2_ttf -lm -lstdc++ \
+	src/Texture.cpp src/tga.cpp src/GLString.cpp \
 	test/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
 
 #################################################################

README.md

@@ -32,14 +32,14 @@ A more or less recent [Doxygen documentation](http://xythobuz.github.io/OpenRaid
 Basically, OpenRaider depends on the following:
 
 * OpenGL
-* SDL & SDL-TTF
+* SDL2 & SDL2-TTF
 * OpenAL & ALUT
 * Posix Threads
 * zlib
 
 On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
 
-    sudo port install zlib cmake libsdl libsdl_ttf
+    sudo port install zlib cmake libsdl2 libsdl2_ttf
 
 A similar command for the package manager of your favorite Linux Distribution should do the trick.
 

include/SDLSystem.h

@@ -8,7 +8,7 @@
 #ifndef _SDLSYSTEM_H_
 #define _SDLSYSTEM_H_
 
-#include <SDL/SDL.h>
+#include <SDL2/SDL.h>
 #include <System.h>
 
 /*!
@@ -121,7 +121,8 @@ protected:
     bool mFullscreen;      //!< Current Fullscreen/Windowed mode
 
 private:
-    SDL_Surface *mWindow;  //!< This is the pointer to the SDL surface
+    SDL_Window *mWindow;      //!< This is the pointer to the SDL surface
+    SDL_GLContext mGLContext; //!< The OpenGL Context
 };
 
 #endif

src/SDLSystem.cpp

@@ -14,7 +14,7 @@
 #include <memory_test.h>
 #endif
 
-#include <SDL/SDL_opengl.h>
+#include <SDL2/SDL_opengl.h>
 
 #include <MatMath.h>
 #include <SDLSystem.h>
@@ -51,7 +51,7 @@ void SDLSystem::bindKeyCommand(const char *cmd, int key, int event) {
 #endif
 
 void SDLSystem::setGrabMouse(bool on) {
-    SDL_WM_GrabInput(on ? SDL_GRAB_ON : SDL_GRAB_OFF);
+    SDL_SetRelativeMouseMode(on ? SDL_TRUE : SDL_FALSE);
 }
 
 void SDLSystem::initVideo(unsigned int width, unsigned int height, bool fullscreen) {
@@ -83,13 +83,12 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height, bool fullscre
     }
 #endif
 
-    flags |= SDL_OPENGL;
+    flags |= SDL_WINDOW_OPENGL;
 
     mFullscreen = fullscreen;
     if (mFullscreen)
-        flags |= SDL_FULLSCREEN;
+        flags |= SDL_WINDOW_FULLSCREEN;
 
-    SDL_ShowCursor(SDL_DISABLE);
     setGrabMouse(true); // Always grab mouse!
 
     SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
@@ -97,10 +96,13 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height, bool fullscre
     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_SetVideoMode(width, height, 16, flags);
-    SDL_WM_SetCaption(VERSION, VERSION);
+
+    mWindow = SDL_CreateWindow(VERSION, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+            width, height, flags);
+    mGLContext = SDL_GL_CreateContext(mWindow);
+
     //SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
-    SDL_EnableKeyRepeat(100, SDL_DEFAULT_REPEAT_INTERVAL);
+    //SDL_EnableKeyRepeat(100, SDL_DEFAULT_REPEAT_INTERVAL);
 
 #ifdef UNICODE_SUPPORT
     //@JML get Unicode value of key for international keyboard
@@ -115,8 +117,6 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height, bool fullscre
 }
 
 void SDLSystem::resize(unsigned int width, unsigned int height) {
-    int flags = 0;
-
     GLfloat aspect;
 
     m_width = width;
@@ -139,14 +139,6 @@ void SDLSystem::resize(unsigned int width, unsigned int height) {
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
 
-    // Resize window
-    flags |= SDL_OPENGL;
-
-    if (mFullscreen)
-        flags |= SDL_FULLSCREEN;
-
-    mWindow = SDL_SetVideoMode(width, height, 16, flags);
-
     // Resize context
     resizeGL(width, height);
 }
@@ -222,10 +214,10 @@ void SDLSystem::runGame() {
                     if (mkeys & KMOD_RALT)
                         mod |= SYS_MOD_KEY_RALT;
 
-                    if (mkeys & KMOD_LMETA)
+                    if (mkeys & KMOD_LGUI)
                         mod |= SYS_MOD_KEY_LMETA;
 
-                    if (mkeys & KMOD_RMETA)
+                    if (mkeys & KMOD_RGUI)
                         mod |= SYS_MOD_KEY_RMETA;
 
                     key = event.key.keysym.sym;
@@ -369,9 +361,13 @@ void SDLSystem::runGame() {
                         }
                     }
                     break;
-                case SDL_VIDEORESIZE:
-                    resizeGL(event.resize.w, event.resize.h);
-                    gameFrame();
+                case SDL_WINDOWEVENT:
+                    switch(event.window.event) {
+                        case SDL_WINDOWEVENT_RESIZED:
+                            resizeGL(event.window.data1, event.window.data2);
+                            gameFrame();
+                            break;
+                    }
                     break;
             }
         }
@@ -394,41 +390,19 @@ void SDLSystem::shutdown(int i) {
 }
 
 void SDLSystem::toggleFullscreen() {
-    int width = m_width;
-    int height = m_height;
     if (mWindow) {
         mFullscreen = !mFullscreen;
 
-        // SDL_WM_ToggleFullScreen does not work on all platforms
-        // eg. Mac OS X
-        // SDL_WM_ToggleFullScreen(mWindow);
-
-        // I added a mFullscreen flag to this class. Then I modified it's
-        // resize() method to use the SDL_FULLSCREEN flag in the
-        // SetVideoMode() call based on the mFullscreen flag.
-        // Then, I modified this method to find out an available
-        // resolution for the fullscreen mode.
-        // Now you can see something when switching to Fullscreen,
-        // but it's full of graphical glitches...? I don't know...
-        // -- xythobuz 2013-12-31
-
-        if (mFullscreen) {
-            SDL_Rect **dimensions = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);
-            if (dimensions == NULL) {
-                printf("Can't enter fullscreen!\n");
-                mFullscreen = false;
-            } else if (dimensions != (SDL_Rect **)-1) {
-                //! \fixme Don't just use first available resolution...
-                width = dimensions[0]->w;
-                height = dimensions[0]->h;
-            }
-        }
+        if (mFullscreen)
+            SDL_SetWindowFullscreen(mWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
+        else
+            SDL_SetWindowFullscreen(mWindow, 0);
 
-        resize(width, height);
+        // resize(width, height); // not needed with desktop fullscreen
     }
 }
 
 void SDLSystem::swapBuffersGL() {
-    SDL_GL_SwapBuffers();
+    SDL_GL_SwapWindow(mWindow);
 }
 

src/Texture.cpp

@@ -37,7 +37,7 @@
 #include <memory_test.h>
 #endif
 
-#include <SDL/SDL_ttf.h>
+#include <SDL2/SDL_ttf.h>
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>

test/GLString.cpp

@@ -3,10 +3,11 @@
  * \brief Open GL rendering font/string Unit Test
  *
  * \author Mongoose
+ * \author xythobuz
  */
 
 #include <math.h>
-#include <SDL/SDL.h>
+#include <SDL2/SDL.h>
 #ifdef __APPLE__
 #include <OpenGL/glu.h>
 #else
@@ -17,7 +18,8 @@
 #include <GLString.h>
 
 GLString *TEXT;
-SDL_Surface *SDL_WINDOW = NULL;
+SDL_Window *sdlWindow;
+SDL_GLContext glContext;
 Texture gTexture;
 
 void swap_buffers();
@@ -39,7 +41,8 @@ void event_resize(int width, int height) {
 }
 
 void event_display(int width, int height) {
-    static float x = 0.0f, y = 0.0f, z = -150.0f, r = 0.0f;
+    static float r = 0.0f;
+    float x = 0.0f, y = 0.0f, z = -150.0f;
 
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
@@ -65,7 +68,7 @@ void event_display(int width, int height) {
     glDisable(GL_CULL_FACE);
     glEnable(GL_BLEND);
     glEnable(GL_TEXTURE_2D);
-    glColor3f(0.75, 0.5, 1.0);
+    glColor3f(0.5f, 0.7f, 1.0f);
 
     glEnterMode2d(width, height);
     TEXT->Render();
@@ -76,18 +79,17 @@ void event_display(int width, int height) {
 }
 
 void swap_buffers() {
-    SDL_GL_SwapBuffers();
+    SDL_GL_SwapWindow(sdlWindow);
 }
 
 
 void shutdown_gl() {
+    SDL_GL_DeleteContext(glContext);
+    SDL_DestroyWindow(sdlWindow);
     SDL_Quit();
 }
 
-void init_gl(unsigned int width, unsigned int height) {
-    int i;
-    const char *errorText = "TEXT->glPrintf> ERROR code %i\n";
-
+void init_gl() {
     // Setup GL
     glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glShadeModel(GL_SMOOTH);
@@ -95,8 +97,11 @@ void init_gl(unsigned int width, unsigned int height) {
     glDepthFunc(GL_LESS);
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+}
 
-    event_resize(width, height);
+void init_text() {
+    int i;
+    const char *errorText = "TEXT->glPrintf> ERROR code %i\n";
 
     // Mongoose 2002.01.01, Texture setup
     gTexture.reset();
@@ -106,20 +111,20 @@ void init_gl(unsigned int width, unsigned int height) {
     gTexture.loadFontTTF("data/test.ttf", 32, 126 - 32);  // ASCII
 
     TEXT->Init(4);
-    i = TEXT->glPrintf((width/2)-50, height/2-32, "OpenRaider");
+    i = TEXT->glPrintf(50, 50, "OpenRaider GLString");
     if (i) {
         printf(errorText, i);
     }
-    i = TEXT->glPrintf((width/2)-50, height/2, "GLString");
+    i = TEXT->glPrintf(50, 100, "Unit Test by Mongoose");
     if (i) {
         printf(errorText, i);
     }
     TEXT->Scale(1.2f);
-    i = TEXT->glPrintf((width/2)-100, height/2+32, "Unit Test by Mongoose");
+    i = TEXT->glPrintf(50, 150, "ported to SDL2 & TTF");
     if (i) {
         printf(errorText, i);
     }
-    i = TEXT->glPrintf((width/2)-100, height/2+64, "ported to TTF by xythobuz");
+    i = TEXT->glPrintf(50, 200, "by xythobuz");
     if (i) {
         printf(errorText, i);
     }
@@ -164,10 +169,10 @@ void init_gl(unsigned int width, unsigned int height) {
     }
 #endif
 
-    flags = SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
+    flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
 
     if (fullscreen) {
-        flags |= SDL_FULLSCREEN;
+        flags |= SDL_WINDOW_FULLSCREEN;
         SDL_ShowCursor(SDL_DISABLE);
     }
 
@@ -176,12 +181,14 @@ void init_gl(unsigned int width, unsigned int height) {
     SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
     SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-    SDL_WINDOW = SDL_SetVideoMode(width, height, 16, flags);
-    SDL_WM_SetCaption("GLString Test", "GLString Test");
-    SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+    sdlWindow = SDL_CreateWindow("GLString Test", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
+    glContext = SDL_GL_CreateContext(sdlWindow);
 
     // Init rendering
-    init_gl(width, height);
+    init_gl();
+    event_resize(width, height);
+    init_text();
 
     for (;;) {
         // Pause for 10-20 ms
@@ -220,11 +227,11 @@ void init_gl(unsigned int width, unsigned int height) {
                     if (mkeys & KMOD_RALT)
                         mod |= KMOD_RALT;
 
-                    if (mkeys & KMOD_LMETA)
-                        mod |= KMOD_LMETA;
+                    if (mkeys & KMOD_LGUI)
+                        mod |= KMOD_LGUI;
 
-                    if (mkeys & KMOD_RMETA)
-                        mod |= KMOD_RMETA;
+                    if (mkeys & KMOD_RGUI)
+                        mod |= KMOD_RGUI;
 
                     key = event.key.keysym.sym;
 
@@ -234,21 +241,23 @@ void init_gl(unsigned int width, unsigned int height) {
                             exit(0);
 #ifdef __APPLE__
                         case 113: // q
-                            if ((mod & KMOD_RMETA) || (mod & KMOD_LMETA))
+                            if ((mod & KMOD_RGUI) || (mod & KMOD_LGUI))
                                 exit(0);
                             break;
 #endif
-                        case 114: // r
-                            break;
                     }
                     break;
                 case SDL_KEYUP:
                     break;
-                case SDL_VIDEORESIZE:
-                    width = event.resize.w;
-                    height = event.resize.h;
-                    event_resize(width, height);
-                    event_display(width, height);
+                case SDL_WINDOWEVENT:
+                    switch(event.window.event) {
+                        case SDL_WINDOWEVENT_RESIZED:
+                            width = event.window.data1;
+                            height = event.window.data2;
+                            event_resize(width, height);
+                            event_display(width, height);
+                            break;
+                    }
                     break;
             }
         }