index 29a81b01e0a38102289a515cf5500aa2156530ef..ff52b1dc98ba163f82a82ed391c6564462da24bd 100644 (file)
procedure sys_Init;
procedure sys_Final;
procedure sys_Init;
procedure sys_Final;
+ var (* hooks *)
+ sys_CharPress: procedure (ch: AnsiChar) = nil;
+
implementation
uses
SysUtils, SDL2, Math, ctypes,
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}
{$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)';
const
GameTitle = 'Doom 2D: Forever (SDL 2, %s)';
(* --------- Graphics --------- *)
(* --------- 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;
procedure UpdateSize (w, h: Integer);
begin
gWinSizeX := w;
// store real window size in gWinSize, downscale resolution now
w := round(w / r_pixel_scale);
h := round(h / r_pixel_scale);
// 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);
+ 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;
end;
gScreenWidth := w;
gScreenHeight := h;
e_ResizeWindow(w, h);
e_InitGL;
g_Game_SetupScreenSize;
e_ResizeWindow(w, h);
e_InitGL;
g_Game_SetupScreenSize;
- {$IFNDEF ANDOIRD}
+ {$IFNDEF ANDROID}
(* This will fix menu reset on keyboard showing *)
g_Menu_Reset;
{$ENDIF}
(* This will fix menu reset on keyboard showing *)
g_Menu_Reset;
{$ENDIF}
context := SDL_GL_CreateContext(window);
if context <> nil then
begin
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}
+ if not LoadGL then
begin
begin
- e_LogWriteln('SDL: no framebuffer object support detected');
- glRenderToFBO := False
+ 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
end;
if (fullscreen = false) and (maximized = false) and (wc = false) then
begin
procedure sys_Repaint;
begin
procedure sys_Repaint;
begin
- if glRenderToFBO then
- e_BlitFramebuffer(gWinSizeX, gWinSizeY);
SDL_GL_SwapWindow(window)
end;
SDL_GL_SwapWindow(window)
end;
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
end
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
end
- else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+ else
begin
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;
end
end;
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)]);
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;
end;
function sys_HandleInput (): Boolean;
e_WriteLog('Releasing SDL2', TMsgType.Notify);
if context <> nil then
begin
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;
SDL_GL_DeleteContext(context);
context := nil;
end;