X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=d61dd32687131875cb94971afe76b3e6380e3425;hb=f8c006bbcbec547e9a3beda8372076a10ed049ae;hp=00770890eb99be483c7e1f2b6cfe3e7cad38efaf;hpb=91448a18a3dad8151acb610601f79bf82bca6c91;p=d2df-sdl.git

diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas
index 0077089..d61dd32 100644
--- a/src/game/sdl/g_system.pas
+++ b/src/game/sdl/g_system.pas
@@ -37,13 +37,17 @@ interface
   procedure sys_Init;
   procedure sys_Final;
 
+  var (* hooks *)
+    sys_CharPress: procedure (ch: AnsiChar) = nil;
+    sys_ScreenResize: procedure (w, h: Integer) = nil;
+
 implementation
 
   uses
     SysUtils, SDL, Math,
     {$INCLUDE ../nogl/noGLuses.inc}
-    e_log, e_graphics, e_input, e_sound,
-    g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic;
+    e_log, r_graphics, e_input, e_sound,
+    g_options, g_console, g_game, g_menu, g_gui, g_basic;
 
   const
     GameTitle = 'Doom 2D: Forever (SDL 1.2, %s)';
@@ -70,23 +74,26 @@ implementation
 
   (* --------- Graphics --------- *)
 
-  procedure UpdateSize (w, h: Integer);
+  function LoadGL: Boolean;
+  begin
+    result := true;
+    {$IFDEF NOGL_INIT}
+    nogl_Init;
+    if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
+    {$ELSE}
+    if glRenderToFBO and (not Load_GL_ARB_framebuffer_object) then
+    {$ENDIF}
+    begin
+      e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering');
+      glRenderToFBO := false;
+    end;
+  end;
+
+  procedure FreeGL;
   begin
-    gWinSizeX := w;
-    gWinSizeY := h;
-    gScreenWidth := w;
-    gScreenHeight := h;
-    gRC_Width := w;
-    gRC_Height := h;
-    {$IFDEF ENABLE_HOLMES}
-      fuiScrWdt := w;
-      fuiScrHgt := h;
+    {$IFDEF NOGL_INIT}
+    nogl_Quit();
     {$ENDIF}
-    e_ResizeWindow(w, h);
-    e_InitGL;
-    g_Game_SetupScreenSize;
-    g_Menu_Reset;
-    g_Game_ClearLoading;
   end;
 
   function GetTitle (): PChar;
@@ -118,13 +125,16 @@ implementation
       screen := SDL_SetVideoMode(w, h, bpp, flags);
       if screen <> nil then
       begin
-        {$IFDEF NOGL_INIT}
-          nogl_Init;
-        {$ENDIF}
+        if not LoadGL then
+        begin
+          e_LogWriteln('GL: unable to load OpenGL functions', TMsgType.Fatal);
+          exit;
+        end;
         SDL_WM_SetCaption(GetTitle(), nil);
         gFullScreen := fullscreen;
         gRC_FullScreen := fullscreen;
-        UpdateSize(w, h);
+        if @sys_ScreenResize <> nil then
+          sys_ScreenResize(w, h);
         result := True
       end
     end
@@ -412,20 +422,21 @@ implementation
       e_KeyUpDown(key, down);
       g_Console_ProcessBind(key, down);
     end
-    else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+    else
     begin
-      KeyPress(key) // key repeat in menus and shit
+      g_Console_ProcessBindRepeat(key)
     end;
-    if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
-      CharPress(ch)
+    if @sys_CharPress <> nil then
+      if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
+        sys_CharPress(ch)
   end;
 
   procedure HandleResize (var ev: TSDL_ResizeEvent);
   begin
     if g_dbg_input then
       e_LogWritefln('Input Debug: SDL_VIDEORESIZE %s %s', [ev.w, ev.h]);
-    if modeResize = 1 then
-      UpdateSize(ev.w, ev.h)
+    if (modeResize = 1) and (@sys_ScreenResize <> nil) then
+      sys_ScreenResize(ev.w, ev.h);
     else if modeResize > 1 then
       InitWindow(ev.w, ev.h, gBPP, gFullscreen)
   end;
@@ -481,9 +492,7 @@ implementation
       RemoveJoystick(i);
     if screen <> nil then
     begin
-      {$IFDEF NOGL_INIT}
-        nogl_Quit;
-      {$ENDIF}
+      FreeGL;
       SDL_FreeSurface(screen)
     end;
     SDL_Quit