X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_system.pas;h=5468afb36645a728039d44582cae616022672cf9;hb=f8c006bbcbec547e9a3beda8372076a10ed049ae;hp=bfb76fb5bae1f5a69f01ff3f575ade72c80c2810;hpb=5301ecea6db1b7e6e3de991b8a8d420e53ee220f;p=d2df-sdl.git diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas index bfb76fb..5468afb 100644 --- a/src/game/sdl2/g_system.pas +++ b/src/game/sdl2/g_system.pas @@ -37,16 +37,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, + e_log, r_graphics, e_input, e_sound, {$INCLUDE ../nogl/noGLuses.inc} {$IFDEF ENABLE_HOLMES} g_holmes, sdlcarcass, fui_ctls, {$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_menu, g_gui, g_basic; const GameTitle = 'Doom 2D: Forever (SDL 2, %s)'; @@ -74,28 +78,25 @@ implementation (* --------- Graphics --------- *) - procedure UpdateSize (w, h: Integer); + function LoadGL: Boolean; begin - gWinSizeX := w; - gWinSizeY := h; - gScreenWidth := w; - gScreenHeight := h; - gRC_Width := w; - gRC_Height := 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; + 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} - g_Game_ClearLoading; - {$IFDEF ENABLE_HOLMES} - if assigned(oglInitCB) then oglInitCB; + 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; @@ -149,9 +150,12 @@ implementation context := SDL_GL_CreateContext(window); if context <> nil then begin - {$IFDEF NOGL_INIT} - nogl_Init; - {$ENDIF} + if not LoadGL then + begin + e_LogWriteln('GL: unable to load OpenGL functions', TMsgType.Fatal); + SDL_GL_DeleteContext(context); context := nil; + exit; + end; if (fullscreen = false) and (maximized = false) and (wc = false) then begin SDL_GetWindowPosition(window, @x, @y); @@ -161,7 +165,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 @@ -177,8 +182,12 @@ implementation end else begin + if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0; + SDL_SetWindowFullscreen(window, flags); SDL_SetWindowSize(window, w, h); - if wc then + if maximized then SDL_MaximizeWindow(window); + // always reset to center when changing fullscreen->windowed for safety purposes + if wc or (gFullscreen and not fullscreen) or (gWinMaximized and not maximized) then begin x := SDL_WINDOWPOS_CENTERED; y := SDL_WINDOWPOS_CENTERED @@ -194,15 +203,12 @@ implementation SDL_GetWindowPosition(window, @x, @y); wx := x; wy := y end; - if maximized then - SDL_MaximizeWindow(window); - if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0; - SDL_SetWindowFullscreen(window, flags); gFullScreen := fullscreen; gWinMaximized := maximized; gRC_FullScreen := fullscreen; gRC_Maximized := maximized; - UpdateSize(w, h); + if @sys_ScreenResize <> nil then + sys_ScreenResize(w, h); result := true end end; @@ -410,7 +416,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: @@ -469,9 +477,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; @@ -482,8 +492,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; @@ -531,11 +542,15 @@ implementation flags := SDL_INIT_TIMER or $00004000; {$ENDIF} {$ELSE} - flags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO; + flags := SDL_INIT_TIMER or SDL_INIT_VIDEO; {$ENDIF} SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0'); if SDL_Init(flags) <> 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError); + {$IFNDEF HEADLESS} + if SDL_InitSubSystem(SDL_INIT_JOYSTICK) <> 0 then + e_LogWritefln('SDL: Init subsystem failed: %s', [SDL_GetError()]); + {$ENDIF} SDL_ShowCursor(SDL_DISABLE); end; @@ -544,9 +559,7 @@ implementation e_WriteLog('Releasing SDL2', TMsgType.Notify); if context <> nil then begin - {$IFDEF NOGL_INIT} - nogl_Quit; - {$ENDIF} + FreeGL; SDL_GL_DeleteContext(context); context := nil; end;