X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_system.pas;h=85b8b6d089ac4b931a8928957e32a8d1aea96f28;hb=e29288453fa69bd586c70120e148ff85e4b24df2;hp=29a81b01e0a38102289a515cf5500aa2156530ef;hpb=939a343cdc93545211b37de24e9d406bf54dcaf0;p=d2df-sdl.git

diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas
index 29a81b0..85b8b6d 100644
--- a/src/game/sdl2/g_system.pas
+++ b/src/game/sdl2/g_system.pas
@@ -19,10 +19,6 @@ interface
 
   uses Utils;
 
-  (* --- Utils --- *)
-  function sys_GetTicks (): Int64;
-  procedure sys_Delay (ms: Integer);
-
   (* --- Graphics --- *)
   function sys_GetDisplayModes (bpp: Integer): SSArray;
   function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean;
@@ -37,16 +33,20 @@ 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, SDL2, Math, ctypes,
-    e_log, e_graphics, e_input, e_sound,
-    {$INCLUDE ../nogl/noGLuses.inc}
+    e_log, e_input, e_sound,
     {$IFDEF ENABLE_HOLMES}
-      g_holmes, sdlcarcass, fui_ctls,
+      sdlcarcass,
     {$ENDIF}
-    g_touch, g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic;
+    g_touch, g_options, g_console, g_game, g_basic
+  ;
 
   const
     GameTitle = 'Doom 2D: Forever (SDL 2, %s)';
@@ -60,52 +60,8 @@ implementation
     JoystickHatState: array [0..e_MaxJoys - 1, 0..e_MaxJoyHats - 1, HAT_LEFT..HAT_DOWN] of Boolean;
     JoystickZeroAxes: array [0..e_MaxJoys - 1, 0..e_MaxJoyAxes - 1] of Integer;
 
-  (* --------- Utils --------- *)
-
-  function sys_GetTicks (): Int64;
-  begin
-    result := SDL_GetTicks()
-  end;
-
-  procedure sys_Delay (ms: Integer);
-  begin
-    SDL_Delay(ms)
-  end;
-
   (* --------- Graphics --------- *)
 
-  procedure UpdateSize (w, h: Integer);
-  begin
-    gWinSizeX := w;
-    gWinSizeY := h;
-    gRC_Width := w;
-    gRC_Height := h;
-    if glRenderToFBO then
-    begin
-      // store real window size in gWinSize, downscale resolution now
-      w := round(w / r_pixel_scale);
-      h := round(h / r_pixel_scale);
-      e_ResizeFramebuffer(w, h);
-    end;
-    gScreenWidth := w;
-    gScreenHeight := h;
-    {$IFDEF ENABLE_HOLMES}
-      fuiScrWdt := w;
-      fuiScrHgt := h;
-    {$ENDIF}
-    e_ResizeWindow(w, h);
-    e_InitGL;
-    g_Game_SetupScreenSize;
-    {$IFNDEF ANDOIRD}
-      (* This will fix menu reset on keyboard showing *)
-      g_Menu_Reset;
-    {$ENDIF}
-    g_Game_ClearLoading;
-    {$IFDEF ENABLE_HOLMES}
-      if assigned(oglInitCB) then oglInitCB;
-    {$ENDIF}
-  end;
-
   function GetTitle (): PChar;
     var info: AnsiString;
   begin
@@ -156,16 +112,6 @@ implementation
         context := SDL_GL_CreateContext(window);
         if context <> nil then
         begin
-          {$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('SDL: no framebuffer object support detected');
-            glRenderToFBO := False
-          end;
           if (fullscreen = false) and (maximized = false) and (wc = false) then
           begin
             SDL_GetWindowPosition(window, @x, @y);
@@ -175,7 +121,8 @@ implementation
           gWinMaximized := maximized;
           gRC_FullScreen := fullscreen;
           gRC_Maximized := maximized;
-          UpdateSize(w, h);
+          if @sys_ScreenResize <> nil then
+            sys_ScreenResize(w, h);
           result := true
         end
         else
@@ -216,15 +163,14 @@ implementation
       gWinMaximized := maximized;
       gRC_FullScreen := fullscreen;
       gRC_Maximized := maximized;
-      UpdateSize(w, h);
+      if @sys_ScreenResize <> nil then
+        sys_ScreenResize(w, h);
       result := true
     end
   end;
 
   procedure sys_Repaint;
   begin
-    if glRenderToFBO then
-      e_BlitFramebuffer(gWinSizeX, gWinSizeY);
     SDL_GL_SwapWindow(window)
   end;
 
@@ -426,7 +372,9 @@ implementation
     if g_dbg_input then
       e_LogWritefln('Window Event: event = %s, data1 = %s, data2 = %s', [ev.event, ev.data1, ev.data2]);
     case ev.event of
-      SDL_WINDOWEVENT_RESIZED: UpdateSize(ev.data1, ev.data2);
+      SDL_WINDOWEVENT_RESIZED:
+        if @sys_ScreenResize <> nil then
+          sys_ScreenResize(ev.data1, ev.data2);
       SDL_WINDOWEVENT_EXPOSED: sys_Repaint;
       SDL_WINDOWEVENT_CLOSE: result := true;
       SDL_WINDOWEVENT_MOVED:
@@ -485,9 +433,11 @@ 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
+      if g_dbg_input then
+        e_LogWritefln('Input Debug: keyrep, scancode=%s', [key]);
+      g_Console_ProcessBindRepeat(key);
     end
   end;
 
@@ -498,8 +448,9 @@ implementation
     sch := AnsiChar(wchar2win(ch));
     if g_dbg_input then
       e_LogWritefln('Input Debug: text, text="%s", ch = %s, sch = %s', [ev.text, Ord(ch), Ord(sch)]);
-    if IsValid1251(Word(ch)) and IsPrintable1251(ch) then
-      CharPress(sch);
+    if @sys_CharPress <> nil then
+      if IsValid1251(Word(ch)) and IsPrintable1251(ch) then
+        sys_CharPress(sch)
   end;
 
   function sys_HandleInput (): Boolean;
@@ -564,9 +515,6 @@ implementation
     e_WriteLog('Releasing SDL2', TMsgType.Notify);
     if context <> nil then
     begin
-      {$IFDEF NOGL_INIT}
-        nogl_Quit;
-      {$ENDIF}
       SDL_GL_DeleteContext(context);
       context := nil;
     end;