diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 998c681e91992f8722c847c3546e4a162afc8b78..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);
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_gfx, g_monsters, g_holmes;
+ g_map, g_gfx, g_monsters, g_holmes, xprofiler;
var
h_Wnd: PSDL_Window;
begin
curMsButState := 0;
curKbState := 0;
+ e_UnpressAllKeys();
if not wMinimized then
begin
e_ResizeWindow(0, 0);
curMsButState := 0;
curKbState := 0;
wDeactivate := True;
+ e_UnpressAllKeys();
//e_WriteLog('window lost focus!', MSG_NOTIFY);
g_Holmes_WindowBlured();
end;
uc: UnicodeChar;
//joy: Integer;
msev: THMouseEvent;
+ kbev: THKeyEvent;
function buildBut (b: Byte): Word;
begin
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;
if (msev.but <> 0) then
begin
// ev.button.clicks: Byte
- curMsButState := curMsButState or msev.but;
+ if (ev.type_ = SDL_MOUSEBUTTONDOWN) then curMsButState := curMsButState or msev.but else curMsButState := curMsButState and (not msev.but);
msev.bstate := curMsButState;
msev.kstate := curKbState;
- g_Holmes_mouseEvent(msev);
+ if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
end;
end;
SDL_MOUSEWHEEL:
msev.y := curMsY;
msev.bstate := curMsButState;
msev.kstate := curKbState;
- g_Holmes_mouseEvent(msev);
+ if (g_holmes_enabled) then g_Holmes_mouseEvent(msev);
end;
end;
SDL_MOUSEMOTION:
msev.y := curMsY;
msev.bstate := curMsButState;
msev.kstate := curKbState;
- g_Holmes_mouseEvent(msev);
+ 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;
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) = '--tree-draw' then gdbg_map_use_tree_draw := true;
- //if ParamStr(idx) = '--grid-draw' then gdbg_map_use_tree_draw := false;
- //if ParamStr(idx) = '--tree-coldet' then gdbg_map_use_tree_coldet := true;
- //if ParamStr(idx) = '--grid-coldet' then gdbg_map_use_tree_coldet := false;
if ParamStr(idx) = '--no-particles' then gpart_dbg_enabled := false;
if ParamStr(idx) = '--no-los' then gmon_dbg_los_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;
- end;
- //if gdbg_map_use_tree_draw then e_WriteLog('using TREE renderer', MSG_NOTIFY);
- //if not gdbg_map_use_tree_draw then e_WriteLog('using GRID renderer', MSG_NOTIFY);
-
- //if gdbg_map_use_tree_coldet then e_WriteLog('using TREE coldet', MSG_NOTIFY);
- //if not gdbg_map_use_tree_coldet then e_WriteLog('using GRID coldet', MSG_NOTIFY);
+ if ParamStr(idx) = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
+ end;
e_WriteLog('Initializing OpenGL', MSG_NOTIFY);
InitOpenGL(gVSync);