index 4a4a3cb34c92799203e3db627d004a33d2d7769a..1f4061abf7fdc4ba9ff74475e09d7ece908356e1 100644 (file)
procedure sys_Delay (ms: Integer);
(* --- Graphics --- *)
procedure sys_Delay (ms: Integer);
(* --- Graphics --- *)
- function sys_GetDispalyModes (bpp: Integer): SSArray;
- function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen: Boolean): Boolean;
+ function sys_GetDisplayModes (bpp: Integer): SSArray;
+ function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean;
procedure sys_EnableVSync (yes: Boolean);
procedure sys_Repaint;
procedure sys_EnableVSync (yes: Boolean);
procedure sys_Repaint;
SysUtils, SDL, Math,
{$INCLUDE ../nogl/noGLuses.inc}
e_log, e_graphics, e_input, e_sound,
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_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic;
const
const
- GameTitle = 'Doom 2D: Forever (SDL 1.2)';
+ GameTitle = 'Doom 2D: Forever (SDL 1.2, %s)';
var
userResize: Boolean;
var
userResize: Boolean;
(* --------- 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;
gWinSizeY := h;
procedure UpdateSize (w, h: Integer);
begin
gWinSizeX := w;
gWinSizeY := h;
- gWinRealPosX := 0;
- gWinRealPosY := 0;
+ 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}
gScreenWidth := w;
gScreenHeight := h;
{$IFDEF ENABLE_HOLMES}
g_Game_ClearLoading;
end;
g_Game_ClearLoading;
end;
+ function GetTitle (): PChar;
+ var info: AnsiString;
+ begin
+ info := g_GetBuildHash(false);
+ if info = 'custom build' then
+ info := info + ' by ' + g_GetBuilderName() + ' ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME;
+ result := PChar(Format(GameTitle, [info]))
+ end;
+
function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean;
var flags: Uint32;
begin
e_LogWritefln('InitWindow %s %s %s %s', [w, h, bpp, fullScreen]);
function InitWindow (w, h, bpp: Integer; fullScreen: Boolean): Boolean;
var flags: Uint32;
begin
e_LogWritefln('InitWindow %s %s %s %s', [w, h, bpp, fullScreen]);
- result := False;
+ result := false;
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
screen := SDL_SetVideoMode(w, h, bpp, flags);
if screen <> nil then
begin
screen := SDL_SetVideoMode(w, h, bpp, flags);
if screen <> nil then
begin
- {$IFDEF USE_NOGL}
- nogl_Init;
- {$ENDIF}
- SDL_WM_SetCaption(GameTitle, nil);
+ 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);
result := True
end
UpdateSize(w, h);
result := True
end
(* ??? *)
end;
(* ??? *)
end;
- function sys_GetDispalyModes (bpp: Integer): SSArray;
+ function sys_GetDisplayModes (bpp: Integer): SSArray;
var m: PPSDL_Rect; f: TSDL_PixelFormat; i, count: Integer;
begin
SetLength(result, 0);
var m: PPSDL_Rect; f: TSDL_PixelFormat; i, count: Integer;
begin
SetLength(result, 0);
f.BitsPerPixel := bpp;
f.BytesPerPixel := (bpp + 7) div 8;
m := SDL_ListModes(@f, SDL_OPENGL or SDL_FULLSCREEN);
f.BitsPerPixel := bpp;
f.BytesPerPixel := (bpp + 7) div 8;
m := SDL_ListModes(@f, SDL_OPENGL or SDL_FULLSCREEN);
- if (m <> NIL) and (IntPtr(m) <> -1) then
+ if (m <> NIL) and (UIntPtr(m) <> UIntPtr(-1)) then
begin
count := 0;
while m[count] <> nil do inc(count);
begin
count := 0;
while m[count] <> nil do inc(count);
end
end;
end
end;
- function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen: Boolean): Boolean;
+ function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean;
begin
result := InitWindow(w, h, bpp, fullscreen)
end;
begin
result := InitWindow(w, h, bpp, fullscreen)
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
+ g_Console_ProcessBindRepeat(key)
end;
if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
CharPress(ch)
end;
if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
CharPress(ch)
RemoveJoystick(i);
if screen <> nil then
begin
RemoveJoystick(i);
if screen <> nil then
begin
- {$IFDEF USE_NOGL}
- nogl_Quit;
- {$ENDIF}
+ FreeGL;
SDL_FreeSurface(screen)
end;
SDL_Quit
SDL_FreeSurface(screen)
end;
SDL_Quit