X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=e5f62750ea6b0ca2c993025d4f7ab23125eb1d35;hp=5fe730283d1c6384f36ba8d46abcabca7a1a1abe;hb=e452d337f0620b50d8d978b534437b2732134d8f;hpb=724d5405f0f3fe166b931b1b8b5745b2eb340651 diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index 5fe7302..e5f6275 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -17,10 +17,6 @@ unit g_system; interface - (* To fix: - * - Joystick support - *) - uses Utils; (* --- Utils --- *) @@ -28,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; @@ -44,17 +40,21 @@ interface implementation uses - SysUtils, SDL, GL, - e_log, e_graphics, e_input, - g_options, g_window, g_console, g_game, g_menu, g_gui, g_main; + 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_basic; const - GameTitle = 'Doom 2D: Forever (SDL 1.2)'; + GameTitle = 'Doom 2D: Forever (SDL 1.2, %s)'; var userResize: Boolean; modeResize: Integer; screen: PSDL_Surface; + JoystickHandle: array [0..e_MaxJoys - 1] of PSDL_Joystick; + JoystickHatState: array [0..e_MaxJoys - 1, 0..e_MaxJoyHats - 1, HAT_LEFT..HAT_DOWN] of Boolean; + JoystickZeroAxes: array [0..e_MaxJoys - 1, 0..e_MaxJoyAxes - 1] of Integer; (* --------- Utils --------- *) @@ -74,8 +74,15 @@ implementation 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); + e_ResizeFramebuffer(w, h); + end; gScreenWidth := w; gScreenHeight := h; {$IFDEF ENABLE_HOLMES} @@ -89,11 +96,20 @@ implementation 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); @@ -109,7 +125,21 @@ implementation screen := SDL_SetVideoMode(w, h, bpp, flags); if screen <> nil then begin - SDL_WM_SetCaption(GameTitle, nil); + {$IFDEF NOGL_INIT} + nogl_Init; + glRenderToFBO := False; // TODO: check for GL_OES_framebuffer_object + {$ELSE} + if glRenderToFBO then + if not Load_GL_ARB_framebuffer_object() then + if not Load_GL_EXT_framebuffer_object() then + begin + e_LogWriteln('SDL: no framebuffer support detected'); + glRenderToFBO := False + end; + {$ENDIF} + SDL_WM_SetCaption(GetTitle(), nil); + gFullScreen := fullscreen; + gRC_FullScreen := fullscreen; UpdateSize(w, h); result := True end @@ -122,6 +152,8 @@ implementation procedure sys_Repaint; begin + if glRenderToFBO then + e_BlitFramebuffer(gWinSizeX, gWinSizeY); SDL_GL_SwapBuffers end; @@ -130,7 +162,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); @@ -139,7 +171,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); @@ -149,11 +181,148 @@ 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; + (* --------- Joystick --------- *) + + procedure HandleJoyButton (var ev: TSDL_JoyButtonEvent); + var down: Boolean; key: Integer; + begin + if (ev.which < e_MaxJoys) and (ev.button < e_MaxJoyBtns) then + begin + key := e_JoyButtonToKey(ev.which, ev.button); + down := ev.type_ = SDL_JOYBUTTONDOWN; + if g_dbg_input then + e_LogWritefln('Input Debug: jbutton, joy=%s, button=%s, keycode=%s, press=%s', [ev.which, ev.button, key, down]); + e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down) + end + else + begin + if g_dbg_input then + begin + down := ev.type_ = SDL_JOYBUTTONDOWN; + e_LogWritefln('Input Debug: NOT IN RANGE! jbutton, joy=%s, button=%s, press=%s', [ev.which, ev.button, down]) + end + end + end; + + procedure HandleJoyAxis (var ev: TSDL_JoyAxisEvent); + var key, minuskey: Integer; + begin + if (ev.which < e_MaxJoys) and (ev.axis < e_MaxJoyAxes) then + begin + key := e_JoyAxisToKey(ev.which, ev.axis, AX_PLUS); + minuskey := e_JoyAxisToKey(ev.which, ev.axis, AX_MINUS); + + if g_dbg_input then + e_LogWritefln('Input Debug: jaxis, joy=%s, axis=%s, value=%s, zeroaxes=%s, deadzone=%s', [ev.which, ev.axis, ev.value, JoystickZeroAxes[ev.which, ev.axis], e_JoystickDeadzones[ev.which]]); + + if ev.value < JoystickZeroAxes[ev.which, ev.axis] - e_JoystickDeadzones[ev.which] then + begin + if (e_KeyPressed(key)) then + begin + e_KeyUpDown(key, False); + g_Console_ProcessBind(key, False) + end; + e_KeyUpDown(minuskey, True); + g_Console_ProcessBind(minuskey, True) + end + else if ev.value > JoystickZeroAxes[ev.which, ev.axis] + e_JoystickDeadzones[ev.which] then + begin + if (e_KeyPressed(minuskey)) then + begin + e_KeyUpDown(minuskey, False); + g_Console_ProcessBind(minuskey, False) + end; + e_KeyUpDown(key, True); + g_Console_ProcessBind(key, True) + end + else + begin + if (e_KeyPressed(minuskey)) then + begin + e_KeyUpDown(minuskey, False); + g_Console_ProcessBind(minuskey, False) + end; + if (e_KeyPressed(key)) then + begin + e_KeyUpDown(key, False); + g_Console_ProcessBind(key, False) + end + end + end + else + begin + if g_dbg_input then + e_LogWritefln('Input Debug: NOT IN RANGE! jaxis, joy=%s, axis=%s, value=%s, zeroaxes=%s, deadzone=%s', [ev.which, ev.axis, ev.value, JoystickZeroAxes[ev.which, ev.axis], e_JoystickDeadzones[ev.which]]) + end + end; + + procedure HandleJoyHat (var ev: TSDL_JoyHatEvent); + var + down: Boolean; + i, key: Integer; + hat: array [HAT_LEFT..HAT_DOWN] of Boolean; + begin + if (ev.which < e_MaxJoys) and (ev.hat < e_MaxJoyHats) then + begin + if g_dbg_input then + e_LogWritefln('Input Debug: jhat, joy=%s, hat=%s, value=%s', [ev.which, ev.hat, ev.value]); + hat[HAT_UP] := LongBool(ev.value and SDL_HAT_UP); + hat[HAT_DOWN] := LongBool(ev.value and SDL_HAT_DOWN); + hat[HAT_LEFT] := LongBool(ev.value and SDL_HAT_LEFT); + hat[HAT_RIGHT] := LongBool(ev.value and SDL_HAT_RIGHT); + for i := HAT_LEFT to HAT_DOWN do + begin + if JoystickHatState[ev.which, ev.hat, i] <> hat[i] then + begin + down := hat[i]; + key := e_JoyHatToKey(ev.which, ev.hat, i); + e_KeyUpDown(key, down); + g_Console_ProcessBind(key, down) + end + end; + JoystickHatState[ev.which, ev.hat] := hat + end + else + begin + if g_dbg_input then + e_LogWritefln('Input Debug: NOT IN RANGE! jhat, joy=%s, hat=%s, value=%s', [ev.which, ev.hat, ev.value]) + end + end; + + procedure AddJoystick (which: Integer); + var i: Integer; + begin + assert(which < e_MaxJoys); + JoystickHandle[which] := SDL_JoystickOpen(which); + if JoystickHandle[which] <> nil then + begin + e_LogWritefln('Added Joystick %s', [which]); + e_JoystickAvailable[which] := True; + for i := 0 to Min(SDL_JoystickNumAxes(JoystickHandle[which]), e_MaxJoyAxes) - 1 do + JoystickZeroAxes[which, i] := SDL_JoystickGetAxis(JoystickHandle[which], i) + end + else + begin + e_LogWritefln('Failed to open Joystick %s', [which]) + end + end; + + procedure RemoveJoystick (which: Integer); + begin + assert(which < e_MaxJoys); + e_LogWritefln('Remove Joystick %s', [which]); + e_JoystickAvailable[which] := False; + if JoystickHandle[which] <> nil then + SDL_JoystickClose(JoystickHandle[which]); + JoystickHandle[which] := nil + end; + (* --------- Input --------- *) function Key2Stub (key: Integer): Integer; @@ -269,6 +438,16 @@ implementation 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) + else if modeResize > 1 then + InitWindow(ev.w, ev.h, gBPP, gFullscreen) + end; + function sys_HandleInput (): Boolean; var ev: TSDL_Event; begin @@ -277,17 +456,13 @@ implementation begin case ev.type_ of SDL_QUITEV: result := true; - SDL_VIDEORESIZE: - begin - if g_dbg_input then - e_LogWritefln('Input Debug: SDL_VIDEORESIZE %s %s', [ev.resize.w, ev.resize.h]); - if modeResize = 1 then - UpdateSize(ev.resize.w, ev.resize.h) - else if modeResize > 1 then - InitWindow(ev.resize.w, ev.resize.h, gBPP, gFullscreen) - end; + SDL_VIDEORESIZE: HandleResize(ev.resize); SDL_KEYUP, SDL_KEYDOWN: HandleKeyboard(ev.key); + SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP: HandleJoyButton(ev.jbutton); + SDL_JOYAXISMOTION: HandleJoyAxis(ev.jaxis); + SDL_JOYHATMOTION: HandleJoyHat(ev.jhat); SDL_VIDEOEXPOSE: sys_Repaint; + SDL_ACTIVEEVENT: e_MuteChannels((ev.active.gain = 0) and gMuteWhenInactive); end end end; @@ -302,7 +477,7 @@ implementation (* --------- Init --------- *) procedure sys_Init; - var flags: Uint32; ok: Boolean; + var flags: Uint32; i: Integer; begin e_WriteLog('Init SDL', TMsgType.Notify); flags := SDL_INIT_VIDEO or SDL_INIT_AUDIO or @@ -310,17 +485,25 @@ 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 + AddJoystick(i) end; procedure sys_Final; + var i: Integer; begin e_WriteLog('Releasing SDL', TMsgType.Notify); - SDL_FreeSurface(screen); + for i := 0 to e_MaxJoys - 1 do + RemoveJoystick(i); + if screen <> nil then + begin + {$IFDEF NOGL_INIT} + nogl_Quit; + {$ENDIF} + SDL_FreeSurface(screen) + end; SDL_Quit end;