X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=11fd1e08917bc047cf7e3bc60f9f16508f1176d2;hb=2d08438ad214136a161af303cc896e0d5ff706b8;hp=fe7225f6573ebfdaa68a1649600b74e12b600b66;hpb=5c816a8e702fd39c65d0928a3315d81e979f30fb;p=d2df-sdl.git diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index fe7225f..11fd1e0 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -37,13 +37,16 @@ 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, r_graphics, e_input, e_sound, - g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic; + e_log, 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,60 +73,6 @@ implementation (* --------- Graphics --------- *) - 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 - {$IFDEF NOGL_INIT} - nogl_Quit(); - {$ENDIF} - end; - - 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); - if not e_ResizeFramebuffer(w, h) then - begin - e_LogWriteln('GL: could not create framebuffer, falling back to --no-fbo'); - glRenderToFBO := False; - w := gWinSizeX; - h := gWinSizeY; - end; - end; - gScreenWidth := w; - gScreenHeight := h; - {$IFDEF ENABLE_HOLMES} - fuiScrWdt := w; - fuiScrHgt := h; - {$ENDIF} - e_ResizeWindow(w, h); - e_InitGL; - g_Game_SetupScreenSize; - g_Menu_Reset; - g_Game_ClearLoading; - end; - function GetTitle (): PChar; var info: AnsiString; begin @@ -153,15 +102,11 @@ implementation screen := SDL_SetVideoMode(w, h, bpp, flags); if screen <> nil then begin - 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 @@ -453,16 +398,17 @@ implementation begin 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; @@ -517,10 +463,7 @@ implementation for i := 0 to e_MaxJoys - 1 do RemoveJoystick(i); if screen <> nil then - begin - FreeGL; - SDL_FreeSurface(screen) - end; + SDL_FreeSurface(screen); SDL_Quit end;