X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=97d359ea088d269019be92376800c7401dbc6557;hb=d7d166dc3cd287276202e862746208892c4cc89f;hp=8578b70eabec5e305e83931ea42578ffb0663e58;hpb=a17222535319cb4089e3f9a92711731c015819b3;p=d2df-sdl.git diff --git a/src/game/g_window.pas b/src/game/g_window.pas index 8578b70..97d359e 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); @@ -40,16 +40,18 @@ var gwin_dump_extensions: Boolean = false; gwin_has_stencil: Boolean = false; gwin_k8_enable_light_experiments: Boolean = false; + g_dbg_aimline_on: Boolean = false; implementation uses {$IFDEF WINDOWS}Windows,{$ENDIF} - SDL2, GL, GLExt, e_graphics, e_log, g_main, - g_console, SysUtils, e_input, g_options, g_game, + SysUtils, Classes, MAPDEF, + SDL2, GL, GLExt, e_graphics, e_log, e_texture, g_main, + g_console, 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, utils; var h_Wnd: PSDL_Window; @@ -75,30 +77,6 @@ var curMsX: Integer = 0; curMsY: Integer = 0; -const - // TODO: move this to a separate file - CP1251: array [0..127] of Word = ( - $0402,$0403,$201A,$0453,$201E,$2026,$2020,$2021,$20AC,$2030,$0409,$2039,$040A,$040C,$040B,$040F, - $0452,$2018,$2019,$201C,$201D,$2022,$2013,$2014,$003F,$2122,$0459,$203A,$045A,$045C,$045B,$045F, - $00A0,$040E,$045E,$0408,$00A4,$0490,$00A6,$00A7,$0401,$00A9,$0404,$00AB,$00AC,$00AD,$00AE,$0407, - $00B0,$00B1,$0406,$0456,$0491,$00B5,$00B6,$00B7,$0451,$2116,$0454,$00BB,$0458,$0405,$0455,$0457, - $0410,$0411,$0412,$0413,$0414,$0415,$0416,$0417,$0418,$0419,$041A,$041B,$041C,$041D,$041E,$041F, - $0420,$0421,$0422,$0423,$0424,$0425,$0426,$0427,$0428,$0429,$042A,$042B,$042C,$042D,$042E,$042F, - $0430,$0431,$0432,$0433,$0434,$0435,$0436,$0437,$0438,$0439,$043A,$043B,$043C,$043D,$043E,$043F, - $0440,$0441,$0442,$0443,$0444,$0445,$0446,$0447,$0448,$0449,$044A,$044B,$044C,$044D,$044E,$044F - ); - -// TODO: make a transition table or something -function WCharToCP1251(wc: Word): Word; -var - n: Word; -begin - Result := 0; - for n := 0 to 127 do - if CP1251[n] = wc then begin Result := n; break end; - Result := Result + 128; -end; - function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean; var mode, cmode: TSDL_DisplayMode; @@ -110,7 +88,7 @@ begin Result := False; - e_WriteLog('Setting display mode...', MSG_NOTIFY); + e_WriteLog('Setting display mode...', TMsgType.Notify); wFlags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE; if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN; @@ -179,7 +157,7 @@ begin pw := mode.w; ph := mode.h end; - e_WriteLog('SDL: Got ' + IntToStr(k) + ' resolutions.', MSG_NOTIFY); + e_WriteLog('SDL: Got ' + IntToStr(k) + ' resolutions.', TMsgType.Notify); end; procedure Sleep(ms: LongWord); @@ -250,6 +228,7 @@ begin begin curMsButState := 0; curKbState := 0; + e_UnpressAllKeys(); if not wMinimized then begin e_ResizeWindow(0, 0); @@ -258,7 +237,7 @@ begin if g_debug_WinMsgs then begin g_Console_Add('Now minimized'); - e_WriteLog('[DEBUG] WinMsgs: Now minimized', MSG_NOTIFY); + e_WriteLog('[DEBUG] WinMsgs: Now minimized', TMsgType.Notify); end; wDeactivate := True; end; @@ -275,7 +254,7 @@ begin if g_debug_WinMsgs then begin g_Console_Add('Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2)); - e_WriteLog('[DEBUG] WinMsgs: Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2), MSG_NOTIFY); + e_WriteLog('[DEBUG] WinMsgs: Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2), TMsgType.Notify); end; end; @@ -298,7 +277,7 @@ begin if g_debug_WinMsgs then begin g_Console_Add('Now maximized'); - e_WriteLog('[DEBUG] WinMsgs: Now maximized', MSG_NOTIFY); + e_WriteLog('[DEBUG] WinMsgs: Now maximized', TMsgType.Notify); end; end; end; @@ -318,7 +297,7 @@ begin if g_debug_WinMsgs then begin g_Console_Add('Now restored'); - e_WriteLog('[DEBUG] WinMsgs: Now restored', MSG_NOTIFY); + e_WriteLog('[DEBUG] WinMsgs: Now restored', TMsgType.Notify); end; end; @@ -336,6 +315,7 @@ begin curMsButState := 0; curKbState := 0; wDeactivate := True; + e_UnpressAllKeys(); //e_WriteLog('window lost focus!', MSG_NOTIFY); g_Holmes_WindowBlured(); end; @@ -345,7 +325,7 @@ begin begin if gWinActive then begin - e_WriteLog('deactivating window', MSG_NOTIFY); + e_WriteLog('deactivating window', TMsgType.Notify); e_EnableInput := False; e_ClearInputBuffer(); @@ -358,7 +338,7 @@ begin if g_debug_WinMsgs then begin g_Console_Add('Now inactive'); - e_WriteLog('[DEBUG] WinMsgs: Now inactive', MSG_NOTIFY); + e_WriteLog('[DEBUG] WinMsgs: Now inactive', TMsgType.Notify); end; gWinActive := False; @@ -380,7 +360,7 @@ begin if g_debug_WinMsgs then begin g_Console_Add('Now active'); - e_WriteLog('[DEBUG] WinMsgs: Now active', MSG_NOTIFY); + e_WriteLog('[DEBUG] WinMsgs: Now active', TMsgType.Notify); end; gWinActive := True; @@ -450,11 +430,19 @@ begin kbev.sym := ev.key.keysym.sym; kbev.bstate := curMsButState; kbev.kstate := curKbState; - if g_Holmes_keyEvent(kbev) then exit; + {$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; @@ -468,7 +456,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); @@ -503,13 +491,14 @@ 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)); + if (keychr > 127) then keychr := Word(wchar2win(WideChar(keychr))); + CharPress(AnsiChar(keychr)); end; // other key presses and joysticks are handled in e_input @@ -541,12 +530,12 @@ begin gWinSizeY := gScreenHeight; wTitle := Title; - e_WriteLog('Creating window', MSG_NOTIFY); + e_WriteLog('Creating window', TMsgType.Notify); if not g_Window_SetDisplay() then begin KillGLWindow(); - e_WriteLog('Window creation error (resolution not supported?)', MSG_FATALERROR); + e_WriteLog('Window creation error (resolution not supported?)', TMsgType.Fatal); exit; end; @@ -612,10 +601,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; @@ -635,24 +629,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 := getTimeMilli(); + end else - e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); + begin + stt := getTimeMilli(); + 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; @@ -779,13 +797,13 @@ begin while (exts[i] <> #0) and (exts[i] <> ' ') do Inc(i); if i > 255 then begin - e_WriteLog('FUUUUUUUUUUUUU', MSG_WARNING); + e_WriteLog('FUUUUUUUUUUUUU', TMsgType.Warning); end else begin Move(exts^, extName[1], i); extName[0] := Char(i); - e_WriteLog(Format('EXT: %s', [extName]), MSG_NOTIFY); + e_WriteLog(Format('EXT: %s', [extName]), TMsgType.Notify); end; end; found := true; @@ -804,47 +822,71 @@ function SDLMain(): Integer; var idx: Integer; ltmp: Integer; + arg: AnsiString; + mdfo: TStream; 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 begin g_holmes_enabled := true; g_Game_SetDebugMode(); end; - end; + 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 DEFINED(D2F_DEBUG)} + if arg = '--aimline' then g_dbg_aimline_on := false; + {$ENDIF} + + 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; - //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 (arg = '--game-scale') or (arg = '-game-scale') then + begin + if (idx <= ParamCount) then + begin + if not conParseFloat(g_dbg_scale, ParamStr(idx)) then g_dbg_scale := 1.0; + Inc(idx); + end; + end; - //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 (arg = '--write-mapdef') or (arg = '-write-mapdef') then + begin + mdfo := createDiskFile('mapdef.txt'); + mdfo.WriteBuffer(defaultMapDef[1], Length(defaultMapDef)); + mdfo.Free(); + Halt(0); + end; + end; - e_WriteLog('Initializing OpenGL', MSG_NOTIFY); + e_WriteLog('Initializing OpenGL', TMsgType.Notify); InitOpenGL(gVSync); - e_WriteLog('Creating GL window', MSG_NOTIFY); + e_WriteLog('Creating GL window', TMsgType.Notify); if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then begin Result := 0; @@ -853,10 +895,16 @@ begin {EnumDisplayModes();} + {$IFDEF HEADLESS} + gwin_k8_enable_light_experiments := false; + gwin_has_stencil := false; + glLegacyNPOT := false; + gwin_dump_extensions := false; + {$ELSE} if gwin_k8_enable_light_experiments then begin SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, @ltmp); - e_WriteLog(Format('stencil buffer size: %d', [ltmp]), MSG_WARNING); + e_WriteLog(Format('stencil buffer size: %d', [ltmp]), TMsgType.Warning); gwin_has_stencil := (ltmp > 0); end else @@ -866,15 +914,16 @@ begin if not glHasExtension('GL_ARB_texture_non_power_of_two') then begin - e_WriteLog('Driver DID''T advertised NPOT textures support', MSG_WARNING); + e_WriteLog('Driver DID''T advertised NPOT textures support', TMsgType.Warning); glLegacyNPOT := true; end else begin - e_WriteLog('Driver advertised NPOT textures support', MSG_NOTIFY); + e_WriteLog('Driver advertised NPOT textures support', TMsgType.Notify); glLegacyNPOT := false; end; gwin_dump_extensions := false; + {$ENDIF} Init(); Time_Old := GetTimer(); @@ -887,7 +936,7 @@ begin if (not gGameOn) and gAskLanguage then g_Menu_AskLanguage(); - e_WriteLog('Entering the main loop', MSG_NOTIFY); + e_WriteLog('Entering the main loop', TMsgType.Notify); while not ProcessMessage() do { Main Loop } ;