X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FOpenGL_Windows.cpp;h=e5e45492648294d632e9636f8b323ade4223a866;hb=0ca5e88eabdd3aa3eb010460a73d10d8ebde61d8;hp=77f0c305162f129d027c723b9238c3f55c2d5cd3;hpb=d9bff07d8752bf235679170c94faf3501ccd7627;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 77f0c30..e5e4549 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -134,6 +134,43 @@ typedef struct tagPOINT {
 #endif
 
 #if USE_SDL
+#define GL_FUNC(ret,fn,params,call,rt) \
+    extern "C" { \
+        static ret GLAPIENTRY (*p##fn) params = NULL; \
+        ret GLAPIENTRY fn params { rt p##fn call; } \
+    }
+#include "glstubs.h"
+#undef GL_FUNC
+
+static bool lookup_glsym(const char *funcname, void **func, const char *libname)
+{
+    *func = SDL_GL_GetProcAddress(funcname);
+    if (*func == NULL)
+    {
+        fprintf(stderr, "Failed to find OpenGL symbol \"%s\" in \"%s\"\n",
+                 funcname, libname);
+        return false;
+    }
+    return true;
+}
+
+static bool lookup_all_glsyms(const char *libname)
+{
+    bool retval = true;
+    #define GL_FUNC(ret,fn,params,call,rt) \
+        if (!lookup_glsym(#fn, (void **) &p##fn, libname)) retval = false;
+    #include "glstubs.h"
+    #undef GL_FUNC
+    return retval;
+}
+
+static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textures)
+{
+    // no-op.
+}
+
+
+
 void sdlGetCursorPos(POINT *pt)
 {
     int x, y;
@@ -186,8 +223,6 @@ Boolean gDone = false, gfFrontProcess = true;
 
 Game * pgame = 0;
 
-static bool gMouseGrabbed = true;
-
 // --------------------------------------------------------------------------
 
 void ReportError (char * strError)
@@ -390,16 +425,26 @@ static void initSDLKeyTable(void)
 
 static inline int clamp_sdl_mouse_button(Uint8 button)
 {
+    if (button == 2)   // right mouse button is button 3 in SDL.
+        button = 3;
+    else if (button == 3)
+        button = 2;
+
     if ((button >= 1) && (button <= 3))
         return button - 1;
     return -1;
 }
 
-static void sdlEventProc(const SDL_Event &e)
+static void sdlEventProc(const SDL_Event &e, Game &game)
 {
     int val;
     switch(e.type)
 	{
+        case SDL_MOUSEMOTION:
+            game.deltah += e.motion.xrel;
+            game.deltav += e.motion.yrel;
+            return;
+
 		case SDL_MOUSEBUTTONDOWN:
 			{
                 val = clamp_sdl_mouse_button(e.button.button);
@@ -442,7 +487,15 @@ static void sdlEventProc(const SDL_Event &e)
             if (e.key.keysym.sym == SDLK_g)
             {
                 if (e.key.keysym.mod & KMOD_CTRL)
-                    gMouseGrabbed = !gMouseGrabbed;
+                {
+                    SDL_GrabMode mode = SDL_GRAB_ON;
+                    if ((SDL_GetVideoSurface()->flags & SDL_FULLSCREEN) == 0)
+                    {
+                        mode = SDL_WM_GrabInput(SDL_GRAB_QUERY);
+                        mode = (mode==SDL_GRAB_ON) ? SDL_GRAB_OFF:SDL_GRAB_ON;
+                    }
+                    SDL_WM_GrabInput(mode);
+                }
             }
 
             else if (e.key.keysym.sym == SDLK_RETURN)
@@ -501,8 +554,7 @@ Boolean SetUp (Game & game)
 	randSeed = UpTime().lo;
 
 	osx = 0;
-//	ifstream ipstream(":Data:config.txt", std::ios::in /*| std::ios::nocreate*/);
-	ifstream ipstream("./Data/config.txt", std::ios::in /*| std::ios::nocreate*/);
+	ifstream ipstream(ConvertFileName(":Data:config.txt"), std::ios::in /*| std::ios::nocreate*/);
 	detail=1;
 	ismotionblur=0;
 	usermousesensitivity=1;
@@ -552,8 +604,7 @@ Boolean SetUp (Game & game)
 	selectDetail(kContextWidth, kContextHeight, kBitsPerPixel, detail);
 
 	if(!ipstream) {
-		//ofstream opstream(":Data:config.txt"); 
-		ofstream opstream("./Data/config.txt"); 
+		ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
 		opstream << "Screenwidth:\n";
 		opstream << kContextWidth;
 		opstream << "\nScreenheight:\n";
@@ -798,9 +849,20 @@ Boolean SetUp (Game & game)
             fprintf(stderr, "SDL_Init() failed: %s\n", SDL_GetError());
             return false;
         }
+
+        const char *libname = "libGL.so.1";  // !!! FIXME: Linux specific!
+        if (SDL_GL_LoadLibrary(libname) == -1)
+        {
+            fprintf(stderr, "SDL_GL_LoadLibrary(\"%s\") failed: %s\n",
+                    libname, SDL_GetError());
+            return false;
+        }
+
+        if (!lookup_all_glsyms(libname))
+            return false;
     }
 
-    Uint32 sdlflags = SDL_OPENGL;
+    Uint32 sdlflags = SDL_OPENGL;  // !!! FIXME: SDL_FULLSCREEN?
     SDL_WM_SetCaption("Lugaru", "lugaru");
     SDL_ShowCursor(0);
     if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
@@ -809,6 +871,8 @@ Boolean SetUp (Game & game)
         return false;
     }
 
+
+
 #elif (defined WIN32)
 	//------------------------------------------------------------------
 	// create window
@@ -999,6 +1063,23 @@ Boolean SetUp (Game & game)
 
 static void DoMouse(Game & game)
 {
+#if USE_SDL
+	if(mainmenu||(abs(game.deltah)<10*realmultiplier*1000&&abs(game.deltav)<10*realmultiplier*1000))
+	{
+		game.deltah *= usermousesensitivity;
+		game.deltav *= usermousesensitivity;
+		game.mousecoordh += game.deltah;
+		game.mousecoordv += game.deltav;
+        if (game.mousecoordh < 0)
+            game.mousecoordh = 0;
+        else if (game.mousecoordh >= kContextWidth)
+            game.mousecoordh = kContextWidth - 1;
+        if (game.mousecoordv < 0)
+            game.mousecoordv = 0;
+        else if (game.mousecoordv >= kContextHeight)
+            game.mousecoordv = kContextHeight - 1;
+	}
+#else
 	static Point lastMouse = {-1,-1};
 	Point globalMouse;
 
@@ -1030,7 +1111,7 @@ static void DoMouse(Game & game)
 			game.mousecoordv=globalMouse.v;
 		}
 
-		if((!mainmenu)&&(gMouseGrabbed))
+		if(!mainmenu)
 		{
 			if(lastMouse.h>gMidPoint.h+100||lastMouse.h<gMidPoint.h-100||lastMouse.v>gMidPoint.v+100||lastMouse.v<gMidPoint.v-100){
 				pos.x = gMidPoint.h;
@@ -1042,6 +1123,7 @@ static void DoMouse(Game & game)
 			}
 		}
 	}
+#endif
 }
 
 
@@ -1183,6 +1265,12 @@ void CleanUp (void)
 
 #if USE_SDL
     SDL_Quit();
+    #define GL_FUNC(ret,fn,params,call,rt) p##fn = NULL;
+    #include "glstubs.h"
+    #undef GL_FUNC
+    // cheat here...static destructors are calling glDeleteTexture() after
+    //  the context is destroyed and libGL unloaded by SDL_Quit().
+    pglDeleteTextures = glDeleteTextures_doNothing;
 
 #elif (defined WIN32)
 	if (hRC)
@@ -1254,7 +1342,8 @@ int main (void)
 			//ofstream os("log.txt");
 			//os.close();
 
-			SetUp (game);
+			if (!SetUp (game))
+                return 42;
 
 			while (!gDone&&!game.quit&&(!game.tryquit||!game.registered))
 			{
@@ -1263,7 +1352,9 @@ int main (void)
 					gameFocused = true;
 
 					// check windows messages
-                    #if USE_SDL
+					#if USE_SDL
+					game.deltah = 0;
+					game.deltav = 0;
 					SDL_Event e;
 					// message pump
 					while( SDL_PollEvent( &e ) )
@@ -1273,9 +1364,10 @@ int main (void)
 							gDone=true;
 							break;
 						}
-                        sdlEventProc(e);
+						sdlEventProc(e, game);
 					}
-                    #elif (defined WIN32)
+
+					#elif (defined WIN32)
 					MSG msg;
 					// message pump
 					while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE | PM_NOYIELD ) )
@@ -1291,7 +1383,7 @@ int main (void)
 							DispatchMessage( &msg );
 						}
 					}
-                    #endif
+					#endif
 
 					// game
 					DoUpdate(game);