X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=d61dd32687131875cb94971afe76b3e6380e3425;hb=f8c006bbcbec547e9a3beda8372076a10ed049ae;hp=4120c0271cc8f29f3ec32f284105990b41bad66e;hpb=dbf81afaefeb52e53d2b8af3a782277229c5adaa;p=d2df-sdl.git diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index 4120c02..d61dd32 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -24,8 +24,8 @@ interface 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; @@ -37,15 +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, SDL, Math, - e_log, e_graphics, e_input, e_sound, - g_options, g_window, g_console, g_game, g_menu, g_gui, g_main; + {$INCLUDE ../nogl/noGLuses.inc} + e_log, r_graphics, e_input, e_sound, + g_options, g_console, g_game, g_menu, g_gui, g_basic; const - GameTitle = 'Doom 2D: Forever (SDL 1.2)'; + GameTitle = 'Doom 2D: Forever (SDL 1.2, %s)'; var userResize: Boolean; @@ -69,30 +74,42 @@ implementation (* --------- Graphics --------- *) - procedure UpdateSize (w, h: Integer); + 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 - gWinSizeX := w; - gWinSizeY := h; - gWinRealPosX := 0; - gWinRealPosY := 0; - gScreenWidth := w; - gScreenHeight := h; - {$IFDEF ENABLE_HOLMES} - fuiScrWdt := w; - fuiScrHgt := h; + {$IFDEF NOGL_INIT} + nogl_Quit(); {$ENDIF} - e_ResizeWindow(w, h); - e_InitGL; - g_Game_SetupScreenSize; - g_Menu_Reset; - 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]); - 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); @@ -108,8 +125,16 @@ implementation screen := SDL_SetVideoMode(w, h, bpp, flags); if screen <> nil then begin - SDL_WM_SetCaption(GameTitle, nil); - UpdateSize(w, h); + 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; + if @sys_ScreenResize <> nil then + sys_ScreenResize(w, h); result := True end end @@ -129,7 +154,7 @@ implementation (* ??? *) 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); @@ -138,7 +163,7 @@ implementation 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); @@ -148,7 +173,7 @@ implementation 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; @@ -397,20 +422,21 @@ 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 + 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; @@ -444,7 +470,7 @@ implementation (* --------- Init --------- *) procedure sys_Init; - var flags: Uint32; ok: Boolean; i: Integer; + var flags: Uint32; i: Integer; begin e_WriteLog('Init SDL', TMsgType.Notify); flags := SDL_INIT_VIDEO or SDL_INIT_AUDIO or @@ -452,9 +478,6 @@ implementation (*or SDL_INIT_NOPARACHUTE*); if SDL_Init(flags) <> 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError); - ok := InitWindow(gScreenWidth, gScreenHeight, gBPP, gFullScreen); - if not ok then - raise Exception.Create('SDL: Failed to set videomode: ' + SDL_GetError); SDL_EnableUNICODE(1); SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); for i := 0 to e_MaxJoys - 1 do @@ -467,7 +490,11 @@ implementation e_WriteLog('Releasing SDL', TMsgType.Notify); for i := 0 to e_MaxJoys - 1 do RemoveJoystick(i); - SDL_FreeSurface(screen); + if screen <> nil then + begin + FreeGL; + SDL_FreeSurface(screen) + end; SDL_Quit end;