diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 0cf15d68e7496a62fe4389700811d9bd2dec47b1..03b7dd0144192d857d1a5dee7ffec5411daa5ae7 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
interface
uses
- wadreader;
+ utils;
function SDLMain(): Integer;
function GetTimer(): Int64;
procedure ReDrawWindow();
procedure SwapBuffers();
procedure Sleep(ms: LongWord);
-function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SArray;
+function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SSArray;
function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean;
function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean;
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, xprofiler;
flag: Boolean;
wTitle: PChar = nil;
wNeedTimeReset: Boolean = False;
- //wWindowCreated: Boolean = False;
- //wCursorShown: Boolean = False;
wMinimized: Boolean = False;
- //wNeedFree: Boolean = True;
wLoadingProgress: Boolean = False;
wLoadingQuit: Boolean = False;
- {wWinPause: Byte = 0;}
{$IFNDEF WINDOWS}
ticksOverflow: Int64 = -1;
lastTicks: Uint32 = 0; // to detect overflow
{$ENDIF}
+{$IF not DEFINED(HEADLESS)}
curMsButState: Word = 0;
curKbState: Word = 0;
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;
+{$ENDIF}
function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean;
var
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;
// TODO: what was this for?
end;
-function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SArray;
+function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SSArray;
var
mode: TSDL_DisplayMode;
res, i, k, n, pw, ph: Integer;
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);
end;
end;
+procedure resetKMState ();
+begin
+{$IF not DEFINED(HEADLESS)}
+ curMsButState := 0;
+ curKbState := 0;
+{$ENDIF}
+end;
+
function WindowEventHandler(ev: TSDL_WindowEvent): Boolean;
var
wActivate, wDeactivate: Boolean;
SDL_WINDOWEVENT_MINIMIZED:
begin
- curMsButState := 0;
- curKbState := 0;
+ resetKMState();
e_UnpressAllKeys();
if not wMinimized then
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;
SDL_WINDOWEVENT_RESIZED:
begin
- curMsButState := 0;
- curKbState := 0;
+ resetKMState();
gScreenWidth := ev.data1;
gScreenHeight := ev.data2;
ChangeWindowSize();
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;
SDL_WINDOWEVENT_MAXIMIZED:
begin
- curMsButState := 0;
- curKbState := 0;
+ resetKMState();
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
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;
SDL_WINDOWEVENT_RESTORED:
begin
- curMsButState := 0;
- curKbState := 0;
+ resetKMState();
if wMinimized then
begin
e_ResizeWindow(gScreenWidth, gScreenHeight);
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;
SDL_WINDOWEVENT_FOCUS_GAINED:
begin
- curMsButState := 0;
- curKbState := 0;
+ resetKMState();
wActivate := True;
//e_WriteLog('window gained focus!', MSG_NOTIFY);
g_Holmes_WindowFocused();
SDL_WINDOWEVENT_FOCUS_LOST:
begin
- curMsButState := 0;
- curKbState := 0;
+ resetKMState();
wDeactivate := True;
e_UnpressAllKeys();
//e_WriteLog('window lost focus!', MSG_NOTIFY);
begin
if gWinActive then
begin
- e_WriteLog('deactivating window', MSG_NOTIFY);
+ e_WriteLog('deactivating window', TMsgType.Notify);
e_EnableInput := False;
e_ClearInputBuffer();
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;
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;
key, keychr: Word;
uc: UnicodeChar;
//joy: Integer;
+ {$IF not DEFINED(HEADLESS)}
msev: THMouseEvent;
kbev: THKeyEvent;
+ {$ENDIF}
function buildBut (b: Byte): Word;
begin
end;
end;
+ {$IF not DEFINED(HEADLESS)}
procedure updateKBState ();
var
kbstate: PUint8;
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;
+ {$ENDIF}
begin
Result := False;
+ {$IF not DEFINED(HEADLESS)}
updateKBState();
+ {$ENDIF}
case ev.type_ of
SDL_WINDOWEVENT:
SDL_KEYDOWN, SDL_KEYUP:
begin
key := ev.key.keysym.scancode;
+ {$IF not DEFINED(HEADLESS)}
if (g_holmes_enabled) then
begin
if (ev.type_ = SDL_KEYDOWN) then kbev.kind := THKeyEvent.Press else kbev.kind := THKeyEvent.Release;
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;
+ {$ENDIF}
if (ev.type_ = SDL_KEYDOWN) then KeyPress(key);
e_KeyUpDown(ev.key.keysym.scancode, (ev.type_ = SDL_KEYDOWN));
end;
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
procedure SwapBuffers();
begin
- {$IFDEF HEADLESS}Exit;{$ENDIF}
+ {$IF not DEFINED(HEADLESS)}
SDL_GL_SwapWindow(h_Wnd);
+ {$ENDIF}
end;
procedure KillGLWindow();
if h_GL <> nil then SDL_GL_DeleteContext(h_GL);
h_Wnd := nil;
h_GL := nil;
- //wWindowCreated := False;
end;
function CreateGLWindow(Title: PChar): Boolean;
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;
h_Gl := SDL_GL_CreateContext(h_Wnd);
if h_Gl = nil then Exit;
{$ENDIF}
- //wWindowCreated := True;
e_ResizeWindow(gScreenWidth, gScreenHeight);
e_InitGL();
stt: UInt64;
begin
FillChar(ev, SizeOf(ev), 0);
- //wNeedFree := False;
wLoadingProgress := True;
while SDL_PollEvent(@ev) > 0 do
begin
if (ev.type_ = SDL_QUITEV) then
break;
end;
- //wNeedFree := True;
if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then
begin
begin
if forceUpdate then
begin
- prevLoadingUpdateTime := curTimeMilli();
+ prevLoadingUpdateTime := getTimeMilli();
end
else
begin
- stt := curTimeMilli();
+ stt := getTimeMilli();
if (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= 400) then
begin
prevLoadingUpdateTime := stt;
if wNeedTimeReset then
begin
- Time_Delta := 28{(27777 div 1000)};
+ Time_Delta := 28;
wNeedTimeReset := False;
end;
g_Map_ProfilersBegin();
g_Mons_ProfilersBegin();
- t := Time_Delta div 28{(27777 div 1000)};
+ t := Time_Delta div 28;
if t > 0 then
begin
flag := True;
// Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ:
if flag then
begin
- Time_Old := Time - (Time_Delta mod 28{(27777 div 1000)});
+ Time_Old := Time-(Time_Delta mod 28);
if (not wMinimized) then
begin
Draw();
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;
function SDLMain(): Integer;
var
idx: Integer;
+ {$IF not DEFINED(HEADLESS)}
ltmp: Integer;
+ {$ENDIF}
arg: AnsiString;
+ mdfo: TStream;
begin
{$IFDEF HEADLESS}
e_NoGraphics := True;
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 DEFINED(D2F_DEBUG)}
+ if arg = '--aimline' then g_dbg_aimline_on := true;
+ {.$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
end;
end;
- {$IF DEFINED(D2F_DEBUG)}
if (arg = '--game-scale') or (arg = '-game-scale') then
begin
if (idx <= ParamCount) then
Inc(idx);
end;
end;
- {$ENDIF}
+
+ 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;
{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
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();
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 } ;