X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=0ac255fd0c580c5682ab6653929a7a9c2a2be679;hb=bab60f8ad58f03e8a35dbb44aba77bb9ff9201f9;hp=1ac9c9e097f6300ae7d8b33874e657a05d41f52b;hpb=d354cd7a11af564156b13568eac5b4ff94a2c4a3;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 1ac9c9e..0ac255f 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -28,7 +28,7 @@ function CreateGLWindow(Title: PChar): Boolean; procedure KillGLWindow(); procedure PushExitEvent(); function ProcessMessage(): Boolean; -procedure ProcessLoading(); +procedure ProcessLoading (forceUpdate: Boolean=false); procedure ReDrawWindow(); procedure SwapBuffers(); procedure Sleep(ms: LongWord); @@ -49,7 +49,7 @@ 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_gfx, g_monsters, g_holmes; + g_map, g_gfx, g_monsters, g_holmes, xprofiler; var h_Wnd: PSDL_Window; @@ -250,6 +250,7 @@ begin begin curMsButState := 0; curKbState := 0; + e_UnpressAllKeys(); if not wMinimized then begin e_ResizeWindow(0, 0); @@ -336,6 +337,7 @@ begin curMsButState := 0; curKbState := 0; wDeactivate := True; + e_UnpressAllKeys(); //e_WriteLog('window lost focus!', MSG_NOTIFY); g_Holmes_WindowBlured(); end; @@ -394,6 +396,7 @@ var uc: UnicodeChar; //joy: Integer; msev: THMouseEvent; + kbev: THKeyEvent; function buildBut (b: Byte): Word; begin @@ -425,26 +428,43 @@ 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; @@ -458,7 +478,7 @@ begin 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; if (g_holmes_enabled) then g_Holmes_mouseEvent(msev); @@ -493,15 +513,15 @@ begin 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; @@ -603,10 +623,15 @@ begin 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; @@ -626,24 +651,48 @@ begin 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; - DrawLoadingStat(); - SwapBuffers(); + 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; - ReShowCursor(); + DrawLoadingStat(); + SwapBuffers(); + + 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; @@ -795,43 +844,45 @@ function SDLMain(): Integer; var idx: Integer; ltmp: Integer; + arg: AnsiString; begin {$IFDEF HEADLESS} e_NoGraphics := True; {$ENDIF} - for idx := 1 to ParamCount do - 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) = '--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) = '--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 g_holmes_enabled := false; + idx := 1; + while (idx <= ParamCount) do + begin + arg := ParamStr(idx); + Inc(idx); + if arg = '--opengl-dump-exts' then gwin_dump_extensions := true; + if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true; + if arg = '--jah' then g_profile_history_size := 100; + if arg = '--no-particles' then gpart_dbg_enabled := false; + if arg = '--no-los' then gmon_dbg_los_enabled := false; + + if arg = '--profile-render' then g_profile_frame_draw := true; + if arg = '--profile-coldet' then g_profile_collision := true; + if arg = '--profile-los' then g_profile_los := true; + + if arg = '--no-part-phys' then gpart_dbg_phys_enabled := false; + if arg = '--no-part-physics' then gpart_dbg_phys_enabled := false; + if arg = '--no-particles-phys' then gpart_dbg_phys_enabled := false; + if arg = '--no-particles-physics' then gpart_dbg_phys_enabled := false; + if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false; + if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false; + + if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end; + if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then + begin + if (idx <= ParamCount) then + begin + if not conParseFloat(g_holmes_ui_scale, ParamStr(idx)) then g_holmes_ui_scale := 1.0; + Inc(idx); + end; + end; 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); - e_WriteLog('Initializing OpenGL', MSG_NOTIFY); InitOpenGL(gVSync);