diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 450afde4334c352e216dab131aaf1ae687d647b3..1b60950e0acfa4a33a15fcc31c220dc4842d63e3 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
procedure KillGLWindow();
procedure PushExitEvent();
function ProcessMessage(): Boolean;
-procedure ProcessLoading();
+procedure ProcessLoading (forceUpdate: Boolean=false);
procedure ReDrawWindow();
procedure SwapBuffers();
procedure Sleep(ms: LongWord);
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
+
implementation
uses
SDL2, GL, GLExt, e_graphics, e_log, g_main,
g_console, SysUtils, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
- g_map;
+ g_map, g_gfx, g_monsters, g_holmes, xprofiler;
var
h_Wnd: PSDL_Window;
ticksOverflow: Int64 = -1;
lastTicks: Uint32 = 0; // to detect overflow
{$ENDIF}
+ curMsButState: Word = 0;
+ curKbState: Word = 0;
+ curMsX: Integer = 0;
+ curMsY: Integer = 0;
const
// TODO: move this to a separate file
g_Game_SetupScreenSize();
g_Menu_Reset();
g_Game_ClearLoading();
+ g_Holmes_VidModeChanged();
end;
function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean;
SDL_WINDOWEVENT_MINIMIZED:
begin
+ curMsButState := 0;
+ curKbState := 0;
+ e_UnpressAllKeys();
if not wMinimized then
begin
e_ResizeWindow(0, 0);
SDL_WINDOWEVENT_RESIZED:
begin
+ curMsButState := 0;
+ curKbState := 0;
gScreenWidth := ev.data1;
gScreenHeight := ev.data2;
ChangeWindowSize();
SDL_WINDOWEVENT_MAXIMIZED:
begin
+ curMsButState := 0;
+ curKbState := 0;
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
SDL_WINDOWEVENT_RESTORED:
begin
+ curMsButState := 0;
+ curKbState := 0;
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
SDL_WINDOWEVENT_FOCUS_GAINED:
begin
+ curMsButState := 0;
+ curKbState := 0;
wActivate := True;
//e_WriteLog('window gained focus!', MSG_NOTIFY);
+ g_Holmes_WindowFocused();
end;
SDL_WINDOWEVENT_FOCUS_LOST:
begin
+ curMsButState := 0;
+ curKbState := 0;
wDeactivate := True;
+ e_UnpressAllKeys();
//e_WriteLog('window lost focus!', MSG_NOTIFY);
+ g_Holmes_WindowBlured();
end;
end;
key, keychr: Word;
uc: UnicodeChar;
//joy: Integer;
+ msev: THMouseEvent;
+ kbev: THKeyEvent;
+
+ function buildBut (b: Byte): Word;
+ begin
+ result := 0;
+ case b of
+ SDL_BUTTON_LEFT: result := result or THMouseEvent.Left;
+ SDL_BUTTON_MIDDLE: result := result or THMouseEvent.Middle;
+ SDL_BUTTON_RIGHT: result := result or THMouseEvent.Right;
+ end;
+ end;
+
+ procedure updateKBState ();
+ var
+ kbstate: PUint8;
+ begin
+ curKbState := 0;
+ kbstate := SDL_GetKeyboardState(nil);
+ if (kbstate[SDL_SCANCODE_LCTRL] <> 0) or (kbstate[SDL_SCANCODE_RCTRL] <> 0) then curKbState := curKbState or THKeyEvent.ModCtrl;
+ if (kbstate[SDL_SCANCODE_LALT] <> 0) or (kbstate[SDL_SCANCODE_RALT] <> 0) then curKbState := curKbState or THKeyEvent.ModAlt;
+ if (kbstate[SDL_SCANCODE_LSHIFT] <> 0) or (kbstate[SDL_SCANCODE_RSHIFT] <> 0) then curKbState := curKbState or THKeyEvent.ModShift;
+ end;
+
begin
Result := False;
+ updateKBState();
+
case ev.type_ of
SDL_WINDOWEVENT:
Result := WindowEventHandler(ev.window);
SDL_QUITEV:
- begin
- if gExit <> EXIT_QUIT then
begin
- if not wLoadingProgress then
+ if gExit <> EXIT_QUIT then
begin
- g_Game_Free();
- g_Game_Quit();
- end
- else
- wLoadingQuit := True;
+ if not wLoadingProgress then
+ begin
+ g_Game_Free();
+ g_Game_Quit();
+ end
+ else
+ wLoadingQuit := True;
+ end;
+ Result := True;
end;
- Result := True;
- end;
- SDL_KEYDOWN:
- begin
- key := ev.key.keysym.scancode;
- KeyPress(key);
- end;
+ SDL_KEYDOWN, SDL_KEYUP:
+ begin
+ key := ev.key.keysym.scancode;
+ if (g_holmes_enabled) then
+ begin
+ if (ev.type_ = SDL_KEYDOWN) then kbev.kind := THKeyEvent.Press else kbev.kind := THKeyEvent.Release;
+ kbev.scan := ev.key.keysym.scancode;
+ kbev.sym := ev.key.keysym.sym;
+ kbev.bstate := curMsButState;
+ kbev.kstate := curKbState;
+ {$IF not DEFINED(HEADLESS)}
+ if g_Holmes_keyEvent(kbev) then
+ begin
+ if (ev.type_ <> SDL_KEYDOWN) then e_KeyUpDown(ev.key.keysym.scancode, false);
+ exit;
+ end;
+ {$ENDIF}
+ end;
+ if (ev.type_ = SDL_KEYDOWN) then KeyPress(key);
+ e_KeyUpDown(ev.key.keysym.scancode, (ev.type_ = SDL_KEYDOWN));
+ end;
+
+ {$IF not DEFINED(HEADLESS)}
+ SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP:
+ begin
+ msev.dx := ev.button.x-curMsX;
+ msev.dy := ev.button.y-curMsY;
+ curMsX := ev.button.x;
+ curMsY := ev.button.y;
+ if (ev.type_ = SDL_MOUSEBUTTONDOWN) then msev.kind := THMouseEvent.Press else msev.kind := THMouseEvent.Release;
+ msev.but := buildBut(ev.button.button);
+ msev.x := curMsX;
+ msev.y := curMsY;
+ if (msev.but <> 0) then
+ begin
+ // ev.button.clicks: Byte
+ if (ev.type_ = SDL_MOUSEBUTTONDOWN) then curMsButState := curMsButState or msev.but else curMsButState := curMsButState and (not msev.but);
+ msev.bstate := curMsButState;
+ msev.kstate := curKbState;
+ if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
+ end;
+ end;
+ SDL_MOUSEWHEEL:
+ begin
+ if (ev.wheel.y <> 0) then
+ begin
+ msev.dx := 0;
+ msev.dy := ev.wheel.y;
+ msev.kind := THMouseEvent.Press;
+ if (ev.wheel.y < 0) then msev.but := THMouseEvent.WheelUp else msev.but := THMouseEvent.WheelDown;
+ msev.x := curMsX;
+ msev.y := curMsY;
+ msev.bstate := curMsButState;
+ msev.kstate := curKbState;
+ if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
+ end;
+ end;
+ SDL_MOUSEMOTION:
+ begin
+ msev.dx := ev.button.x-curMsX;
+ msev.dy := ev.button.y-curMsY;
+ curMsX := ev.button.x;
+ curMsY := ev.button.y;
+ msev.kind := THMouseEvent.Motion;
+ msev.but := 0;
+ msev.x := curMsX;
+ msev.y := curMsY;
+ msev.bstate := curMsButState;
+ msev.kstate := curKbState;
+ if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
+ end;
+ {$ENDIF}
SDL_TEXTINPUT:
- begin
- Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
- keychr := Word(uc);
- if (keychr > 127) then
- keychr := WCharToCP1251(keychr);
- CharPress(Chr(keychr));
- end;
+ begin
+ Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
+ keychr := Word(uc);
+ if (keychr > 127) then keychr := WCharToCP1251(keychr);
+ CharPress(Chr(keychr));
+ end;
// other key presses and joysticks are handled in e_input
end;
SDL_PushEvent(@ev);
end;
-procedure ProcessLoading();
+
+var
+ prevLoadingUpdateTime: UInt64 = 0;
+
+procedure ProcessLoading (forceUpdate: Boolean=false);
var
ev: TSDL_Event;
ID: DWORD;
+ stt: UInt64;
begin
FillChar(ev, SizeOf(ev), 0);
//wNeedFree := False;
if not wMinimized then
begin
- if g_Texture_Get('INTER', ID) then
- e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
+ if forceUpdate then
+ begin
+ prevLoadingUpdateTime := curTimeMilli();
+ end
else
- e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+ begin
+ stt := curTimeMilli();
+ if (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= 400) then
+ begin
+ prevLoadingUpdateTime := stt;
+ forceUpdate := true;
+ end;
+ end;
+
+ if forceUpdate then
+ begin
+ if g_Texture_Get('INTER', ID) then
+ begin
+ e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
+ end
+ else
+ begin
+ e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+ end;
- DrawLoadingStat();
- SwapBuffers();
+ DrawLoadingStat();
+ SwapBuffers();
- ReShowCursor();
+ ReShowCursor();
+ end;
end;
e_SoundUpdate();
if NetMode = NET_SERVER then
- g_Net_Host_Update
+ begin
+ g_Net_Host_Update();
+ end
else
- if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then
- g_Net_Client_UpdateWhileLoading;
+ begin
+ if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
+ end;
wLoadingProgress := False;
end;
end;
g_Map_ProfilersBegin();
+ g_Mons_ProfilersBegin();
t := Time_Delta div 28{(27777 div 1000)};
if t > 0 then
end;
g_Map_ProfilersEnd();
+ g_Mons_ProfilersEnd();
if wLoadingQuit then
begin
if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true;
if ParamStr(idx) = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
if ParamStr(idx) = '--jah' then g_profile_history_size := 100;
+ if ParamStr(idx) = '--no-particles' then gpart_dbg_enabled := false;
+ if ParamStr(idx) = '--no-los' then gmon_dbg_los_enabled := false;
+
+ if ParamStr(idx) = '--profile-render' then g_profile_frame_draw := true;
+ if ParamStr(idx) = '--profile-coldet' then g_profile_collision := true;
+ if ParamStr(idx) = '--profile-los' then g_profile_los := true;
+
+ if ParamStr(idx) = '--no-part-phys' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-part-physics' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particles-phys' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particles-physics' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
+ if ParamStr(idx) = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
+
+ if ParamStr(idx) = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
end;
e_WriteLog('Initializing OpenGL', MSG_NOTIFY);