diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 998c681e91992f8722c847c3546e4a162afc8b78..720be1b85ce934a2ec0e834939402d0ca2f4c743 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
uses
interface
uses
- wadreader;
-
-function SDLMain(): Integer;
-function GetTimer(): Int64;
-procedure ResetTimer();
-function CreateGLWindow(Title: PChar): Boolean;
-procedure KillGLWindow();
-procedure PushExitEvent();
-function ProcessMessage(): Boolean;
-procedure ProcessLoading();
-procedure ReDrawWindow();
-procedure SwapBuffers();
-procedure Sleep(ms: LongWord);
-function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SArray;
-function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean;
-function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean;
+ utils;
+
+function SDLMain (): Integer;
+procedure ResetTimer ();
+procedure ProcessLoading (forceUpdate: Boolean = False);
var
var
- gwin_dump_extensions: Boolean = false;
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
gwin_has_stencil: Boolean = false;
gwin_k8_enable_light_experiments: Boolean = false;
-
+ g_dbg_aimline_on: Boolean = false;
+ g_dbg_input: Boolean = False;
implementation
uses
{$IFDEF WINDOWS}Windows,{$ENDIF}
implementation
uses
{$IFDEF WINDOWS}Windows,{$ENDIF}
- SDL2, GL, GLExt, e_graphics, e_log, g_main,
- g_console, SysUtils, e_input, g_options, g_game,
+{$IFDEF ENABLE_HOLMES}
+ g_holmes, sdlcarcass, fui_ctls,
+{$ENDIF}
+{$INCLUDE ../nogl/noGLuses.inc}
+ SysUtils, Classes, MAPDEF, Math,
+ e_graphics, e_log, e_texture, g_main,
+ g_console, r_console, e_input, g_options, g_game, r_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
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, xprofiler,
+ g_touch, g_gui, g_system, g_netmaster;
-var
- h_Wnd: PSDL_Window;
- h_GL: TSDL_GLContext;
- wFlags: LongWord = 0;
- Time, Time_Delta, Time_Old: Int64;
- 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}
- curMsButState: Word = 0;
- curKbState: Word = 0;
- curMsX: Integer = 0;
- curMsY: Integer = 0;
const
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;
-begin
-{$IFDEF HEADLESS}
- Result := True;
- Exit;
-{$ENDIF}
-
- Result := False;
-
- e_WriteLog('Setting display mode...', MSG_NOTIFY);
-
- wFlags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE;
- if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN;
- if gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED;
+ ProgressUpdateMSecs = 35; //1;//100;
- if h_Wnd <> nil then
- begin
- SDL_DestroyWindow(h_Wnd);
- h_Wnd := nil;
- end;
-
- if gFullscreen then
- begin
- mode.w := gScreenWidth;
- mode.h := gScreenHeight;
- mode.format := 0;
- mode.refresh_rate := 0;
- mode.driverdata := nil;
- if SDL_GetClosestDisplayMode(0, @mode, @cmode) = nil then
- begin
- gScreenWidth := 800;
- gScreenHeight := 600;
- end
- else
- begin
- gScreenWidth := cmode.w;
- gScreenHeight := cmode.h;
- end;
- end;
-
- h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
- if h_Wnd = nil then Exit;
-
- SDL_GL_MakeCurrent(h_Wnd, h_GL);
- SDL_ShowCursor(SDL_DISABLE);
-
- Result := True;
-end;
-
-procedure ReShowCursor();
-begin
- // TODO: what was this for?
-end;
-
-function GetDisplayModes(dBPP: DWORD; var SelRes: DWORD): SArray;
var
var
- mode: TSDL_DisplayMode;
- res, i, k, n, pw, ph: Integer;
-begin
- SetLength(Result, 0);
- {$IFDEF HEADLESS}Exit;{$ENDIF}
- k := 0; SelRes := 0;
- n := SDL_GetNumDisplayModes(0);
- pw := 0; ph := 0;
- for i := 0 to n do
- begin
- res := SDL_GetDisplayMode(0, i, @mode);
- if res < 0 then continue;
- if SDL_BITSPERPIXEL(mode.format) = gBPP then continue;
- if (mode.w = pw) and (mode.h = ph) then continue;
- if (mode.w = gScreenWidth) and (mode.h = gScreenHeight) then
- SelRes := k;
- Inc(k);
- SetLength(Result, k);
- Result[k-1] := IntToStr(mode.w) + 'x' + IntToStr(mode.h);
- pw := mode.w; ph := mode.h
- end;
-
- e_WriteLog('SDL: Got ' + IntToStr(k) + ' resolutions.', MSG_NOTIFY);
-end;
-
-procedure Sleep(ms: LongWord);
-begin
- SDL_Delay(ms);
-end;
+ Time, Time_Delta, Time_Old: Int64;
+ Frame: Int64;
+ flag: Boolean;
+ wNeedTimeReset: Boolean = false;
+ wMinimized: Boolean = false;
+ wLoadingQuit: Boolean = false;
-procedure ChangeWindowSize();
+procedure ResetTimer ();
begin
begin
- gWinSizeX := gScreenWidth;
- gWinSizeY := gScreenHeight;
- {$IFDEF HEADLESS}Exit;{$ENDIF}
- e_ResizeWindow(gScreenWidth, gScreenHeight);
- g_Game_SetupScreenSize();
- g_Menu_Reset();
- g_Game_ClearLoading();
- g_Holmes_VidModeChanged();
+ wNeedTimeReset := true;
end;
end;
-function g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean;
+{$IFNDEF HEADLESS}
var
var
- Preserve: Boolean;
-begin
- Result := False;
- {$IFDEF HEADLESS}Exit;{$ENDIF}
- Preserve := False;
-
- if (gScreenWidth <> W) or (gScreenHeight <> H) then
- begin
- Result := True;
- gScreenWidth := W;
- gScreenHeight := H;
- end;
-
- if gFullscreen <> FScreen then
- begin
- Result := True;
- gFullscreen := FScreen;
- Preserve := True;
- end;
-
- if Result then
- begin
- g_Window_SetDisplay(Preserve);
- ChangeWindowSize();
- end;
-end;
+ prevLoadingUpdateTime: UInt64 = 0;
+{$ENDIF}
-function WindowEventHandler(ev: TSDL_WindowEvent): Boolean;
+procedure ProcessLoading (forceUpdate: Boolean);
+{$IFNDEF HEADLESS}
var
var
- wActivate, wDeactivate: Boolean;
+ stt: UInt64;
+{$ENDIF}
begin
begin
- Result := False;
- wActivate := False;
- wDeactivate := False;
-
- case ev.event of
- SDL_WINDOWEVENT_MOVED:
- begin
- if not (gFullscreen or gWinMaximized) then
- begin
- gWinRealPosX := ev.data1;
- gWinRealPosY := ev.data2;
- end;
- end;
-
- SDL_WINDOWEVENT_MINIMIZED:
- begin
- curMsButState := 0;
- curKbState := 0;
- if not wMinimized then
- begin
- e_ResizeWindow(0, 0);
- wMinimized := True;
-
- if g_debug_WinMsgs then
- begin
- g_Console_Add('Now minimized');
- e_WriteLog('[DEBUG] WinMsgs: Now minimized', MSG_NOTIFY);
- end;
- wDeactivate := True;
- end;
- end;
-
- SDL_WINDOWEVENT_RESIZED:
- begin
- curMsButState := 0;
- curKbState := 0;
- gScreenWidth := ev.data1;
- gScreenHeight := ev.data2;
- ChangeWindowSize();
- SwapBuffers();
- 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);
- end;
- end;
-
- SDL_WINDOWEVENT_EXPOSED:
- SwapBuffers();
-
- SDL_WINDOWEVENT_MAXIMIZED:
- begin
- curMsButState := 0;
- curKbState := 0;
- if wMinimized then
- begin
- e_ResizeWindow(gScreenWidth, gScreenHeight);
- wMinimized := False;
- wActivate := True;
- end;
- if not gWinMaximized then
- begin
- gWinMaximized := True;
- if g_debug_WinMsgs then
- begin
- g_Console_Add('Now maximized');
- e_WriteLog('[DEBUG] WinMsgs: Now maximized', MSG_NOTIFY);
- end;
- end;
- end;
-
- SDL_WINDOWEVENT_RESTORED:
- begin
- curMsButState := 0;
- curKbState := 0;
- if wMinimized then
- begin
- e_ResizeWindow(gScreenWidth, gScreenHeight);
- wMinimized := False;
- wActivate := True;
- end;
- if gWinMaximized then
- gWinMaximized := False;
- if g_debug_WinMsgs then
- begin
- g_Console_Add('Now restored');
- e_WriteLog('[DEBUG] WinMsgs: Now restored', MSG_NOTIFY);
- end;
- end;
-
- 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_WriteLog('window lost focus!', MSG_NOTIFY);
- g_Holmes_WindowBlured();
- end;
- end;
-
- if wDeactivate then
- begin
- if gWinActive then
- begin
- e_WriteLog('deactivating window', MSG_NOTIFY);
- e_EnableInput := False;
- e_ClearInputBuffer();
-
- if gMuteWhenInactive then
- begin
- //e_WriteLog('deactivating sounds', MSG_NOTIFY);
- e_MuteChannels(True);
- end;
-
- if g_debug_WinMsgs then
- begin
- g_Console_Add('Now inactive');
- e_WriteLog('[DEBUG] WinMsgs: Now inactive', MSG_NOTIFY);
- end;
-
- gWinActive := False;
- end;
- end
- else if wActivate then
- begin
- if not gWinActive then
- begin
- //e_WriteLog('activating window', MSG_NOTIFY);
- e_EnableInput := True;
-
- if gMuteWhenInactive then
- begin
- //e_WriteLog('activating sounds', MSG_NOTIFY);
- e_MuteChannels(False);
- end;
-
- if g_debug_WinMsgs then
- begin
- g_Console_Add('Now active');
- e_WriteLog('[DEBUG] WinMsgs: Now active', MSG_NOTIFY);
- end;
-
- gWinActive := True;
- end;
- end;
-end;
-
-function EventHandler(ev: TSDL_Event): Boolean;
-var
- key, keychr: Word;
- uc: UnicodeChar;
- //joy: Integer;
- msev: THMouseEvent;
-
- 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;
+ if sys_HandleInput() = True then
+ Exit;
- procedure updateKBState ();
- var
- kbstate: PUint8;
+{$IFNDEF HEADLESS}
+ if not wMinimized then
begin
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
- begin
- g_Game_Free();
- g_Game_Quit();
- end
- else
- wLoadingQuit := True;
- end;
- Result := True;
- end;
-
- SDL_KEYDOWN:
+ if not forceUpdate then
begin
begin
- key := ev.key.keysym.scancode;
- KeyPress(key);
+ stt := getTimeMilli();
+ forceUpdate := (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs);
end;
end;
- 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
- curMsButState := curMsButState or msev.but;
- msev.bstate := curMsButState;
- msev.kstate := curKbState;
- 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;
- 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;
- g_Holmes_mouseEvent(msev);
- end;
-
- SDL_TEXTINPUT:
+ if forceUpdate then
begin
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;
-end;
+ e_SetRendertarget(True);
+ e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
-procedure SwapBuffers();
-begin
- {$IFDEF HEADLESS}Exit;{$ENDIF}
- SDL_GL_SwapWindow(h_Wnd);
-end;
-
-procedure KillGLWindow();
-begin
- if h_Wnd <> nil then SDL_DestroyWindow(h_Wnd);
- if h_GL <> nil then SDL_GL_DeleteContext(h_GL);
- h_Wnd := nil;
- h_GL := nil;
- //wWindowCreated := False;
-end;
-
-function CreateGLWindow(Title: PChar): Boolean;
-//var
-// flags: LongWord;
-begin
- Result := False;
-
- gWinSizeX := gScreenWidth;
- gWinSizeY := gScreenHeight;
-
- wTitle := Title;
- e_WriteLog('Creating window', MSG_NOTIFY);
+ DrawMenuBackground('INTER');
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ DrawLoadingStat();
+ r_Console_Draw(True);
- if not g_Window_SetDisplay() then
- begin
- KillGLWindow();
- e_WriteLog('Window creation error (resolution not supported?)', MSG_FATALERROR);
- exit;
- end;
-
-{$IFNDEF HEADLESS}
- h_Gl := SDL_GL_CreateContext(h_Wnd);
- if h_Gl = nil then Exit;
-{$ENDIF}
- //wWindowCreated := True;
-
- e_ResizeWindow(gScreenWidth, gScreenHeight);
- e_InitGL();
-
- Result := True;
-end;
+ e_SetRendertarget(False);
+ e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
+ e_BlitFramebuffer(gWinSizeX, gWinSizeY);
-{$IFDEF WINDOWS}
-// windoze sux; in headless mode `GetTickCount()` (and SDL) returns shit
-function GetTimer(): Int64;
-var
- F, C: Int64;
-begin
- QueryPerformanceFrequency(F);
- QueryPerformanceCounter(C);
- Result := Round(C/F*1000{000});
-end;
-{$ELSE}
-function GetTimer(): Int64;
-var
- t: Uint32;
- tt: Int64;
-begin
- t := SDL_GetTicks() {* 1000}; // TODO: do we really need microseconds here? k8: NOPE!
- if ticksOverflow = -1 then
- begin
- ticksOverflow := 0;
- lastTicks := t;
- end
- else
- begin
- if lastTicks > t then
- begin
- // overflow, increment overflow ;-)
- ticksOverflow := ticksOverflow+(Int64($ffffffff)+Int64(1));
- tt := (Int64($ffffffff)+Int64(1))+Int64(t);
- t := Uint32(tt-lastTicks);
+ sys_Repaint;
+ prevLoadingUpdateTime := getTimeMilli();
end;
end;
end;
end;
- lastTicks := t;
- result := ticksOverflow+Int64(t);
-end;
{$ENDIF}
{$ENDIF}
-procedure ResetTimer();
-begin
- wNeedTimeReset := True;
-end;
-
-procedure PushExitEvent();
-var
- ev: TSDL_Event;
-begin
- ev.type_ := SDL_QUITEV;
- SDL_PushEvent(@ev);
-end;
-
-procedure ProcessLoading();
-var
- ev: TSDL_Event;
- ID: DWORD;
-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
- wLoadingProgress := False;
- exit;
- end;
-
- if not wMinimized then
- begin
- if g_Texture_Get('INTER', ID) then
- e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
- else
- e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
-
- DrawLoadingStat();
- SwapBuffers();
-
- ReShowCursor();
- end;
-
e_SoundUpdate();
e_SoundUpdate();
- if NetMode = NET_SERVER then
- g_Net_Host_Update
- else
- if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then
- g_Net_Client_UpdateWhileLoading;
- wLoadingProgress := False;
+ // TODO: At the moment, I left here only host network processing, because the client code must
+ // handle network events on its own. Otherwise separate network cases that use different calls to
+ // enet_host_service() WILL lose their packets (for example, resource downloading). So they have
+ // to handle everything by themselves. But in general, this MUST be removed completely, since
+ // updating the window should never affect the network. Use single enet_host_service(), period.
+ if NetMode = NET_SERVER
+ then g_Net_Host_Update();
end;
end;
-function ProcessMessage(): Boolean;
+
+function ProcessMessage (): Boolean;
var
i, t: Integer;
var
i, t: Integer;
- ev: TSDL_Event;
begin
begin
- Result := False;
- FillChar(ev, SizeOf(ev), 0);
+ result := sys_HandleInput();
- while SDL_PollEvent(@ev) > 0 do
- begin
- Result := EventHandler(ev);
- if ev.type_ = SDL_QUITEV then exit;
- end;
+ Time := sys_GetTicks();
+ Time_Delta := Time-Time_Old;
- Time := GetTimer();
- Time_Delta := Time - Time_Old;
-
- flag := False;
+ flag := false;
if wNeedTimeReset then
begin
if wNeedTimeReset then
begin
- Time_Delta := 28{(27777 div 1000)};
- wNeedTimeReset := False;
+ Frame := 0;
+ Time_Delta := 28;
+ wNeedTimeReset := false;
end;
g_Map_ProfilersBegin();
g_Mons_ProfilersBegin();
end;
g_Map_ProfilersBegin();
g_Mons_ProfilersBegin();
- t := Time_Delta div 28{(27777 div 1000)};
- if t > 0 then
+ t := Time_Delta div 28;
+ if (t > 0) then
begin
begin
- flag := True;
+ flag := true;
for i := 1 to t do
for i := 1 to t do
- begin
- if NetMode = NET_SERVER then g_Net_Host_Update()
- else if NetMode = NET_CLIENT then g_Net_Client_Update();
Update();
Update();
- end;
- end
- else
- begin
- if NetMode = NET_SERVER then g_Net_Host_Update()
- else if NetMode = NET_CLIENT then g_Net_Client_Update();
end;
g_Map_ProfilersEnd();
end;
g_Map_ProfilersEnd();
g_Game_Quit();
end;
g_Game_Quit();
end;
- if gExit = EXIT_QUIT then
+ if (gExit = EXIT_QUIT) then
begin
begin
- Result := True;
- Exit;
+ result := true;
+ exit;
end;
end;
-// Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ:
+ // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ
+ if flag then
+ Time_Old := Time - (Time_Delta mod 28);
+
+ // don't wait if VSync is on, GL already probably waits enough
+ if gLerpActors then
+ flag := (Time - Frame >= gFrameTime) or gVSync;
+
if flag then
begin
if flag then
begin
- Time_Old := Time - (Time_Delta mod 28{(27777 div 1000)});
if (not wMinimized) then
begin
if (not wMinimized) then
begin
- Draw();
- SwapBuffers();
- ReShowCursor();
+ if gPause or (not gLerpActors) or (gState = STATE_FOLD) then
+ gLerpFactor := 1.0
+ else
+ gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
+ Draw;
+ sys_Repaint
end;
end;
+ Frame := Time
end
else
end
else
- Sleep(1);
+ sys_Delay(1);
e_SoundUpdate();
end;
e_SoundUpdate();
end;
-procedure ReDrawWindow;
-begin
- SwapBuffers();
- ReShowCursor();
-end;
-
-procedure InitOpenGL(VSync: Boolean);
+function GLExtensionList (): SSArray;
var
var
- v: Byte;
+ s: PChar;
+ i, j, num: GLint;
begin
begin
- {$IFDEF HEADLESS}Exit;{$ENDIF}
- if VSync then v := 1 else v := 0;
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
- SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- if gwin_k8_enable_light_experiments then
+ result := nil;
+ s := glGetString(GL_EXTENSIONS);
+ if s <> nil then
begin
begin
- SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1); // lights; it is enough to have 1-bit stencil buffer for lighting
+ num := 0;
+ i := 0;
+ j := 0;
+ while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
+ while (s[i] <> #0) do
+ begin
+ while (s[i] <> #0) and (s[i] <> ' ') do Inc(i);
+ SetLength(result, num+1);
+ result[num] := Copy(s, j+1, i-j);
+ while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
+ j := i;
+ Inc(num);
+ end;
end;
end;
- SDL_GL_SetSwapInterval(v);
end;
end;
-function glHasExtension (name: AnsiString): Boolean;
+function GLExtensionSupported (ext: AnsiString): Boolean;
var
var
- exts: PChar;
- i: Integer;
- found: Boolean;
- extName: ShortString;
+ exts: SSArray;
+ e: AnsiString;
begin
result := false;
begin
result := false;
- if length(name) = 0 then exit;
- exts := glGetString(GL_EXTENSIONS);
- if exts = nil then exit;
- while (exts[0] <> #0) and (exts[0] = ' ') do Inc(exts);
- while exts[0] <> #0 do
+ exts := GLExtensionList();
+ for e in exts do
begin
begin
- if gwin_dump_extensions then
- begin
- i := 0;
- while (exts[i] <> #0) and (exts[i] <> ' ') do Inc(i);
- if i > 255 then
- begin
- e_WriteLog('FUUUUUUUUUUUUU', MSG_WARNING);
- end
- else
- begin
- Move(exts^, extName[1], i);
- extName[0] := Char(i);
- e_WriteLog(Format('EXT: %s', [extName]), MSG_NOTIFY);
- end;
- end;
- found := true;
- for i := 0 to length(name)-1 do
- begin
- if exts[i] = #0 then begin found := false; break; end;
- if exts[i] <> name[i+1] then begin found := false; break; end;
- end;
- if found and ((exts[length(name)] = #0) or (exts[length(name)] = ' ')) then begin result := true; exit; end;
- while (exts[0] <> #0) and (exts[0] <> ' ') do Inc(exts);
- while (exts[0] <> #0) and (exts[0] = ' ') do Inc(exts);
+ //writeln('<', e, '> : [', ext, '] = ', strEquCI1251(e, ext));
+ if (strEquCI1251(e, ext)) then begin result := true; exit; end;
end;
end;
end;
end;
-function SDLMain(): Integer;
+procedure PrintGLSupportedExtensions;
+begin
+ e_LogWritefln('GL Vendor: %s', [glGetString(GL_VENDOR)]);
+ e_LogWritefln('GL Renderer: %s', [glGetString(GL_RENDERER)]);
+ e_LogWritefln('GL Version: %s', [glGetString(GL_VERSION)]);
+ e_LogWritefln('GL Shaders: %s', [glGetString(GL_SHADING_LANGUAGE_VERSION)]);
+ e_LogWritefln('GL Extensions: %s', [glGetString(GL_EXTENSIONS)]);
+end;
+
+function SDLMain (): Integer;
var
idx: Integer;
var
idx: Integer;
- ltmp: Integer;
+ arg: AnsiString;
+ mdfo: TStream;
+ {$IFDEF ENABLE_HOLMES}
+ itmp: Integer;
+ valres: Word;
+ {$ENDIF}
begin
{$IFDEF HEADLESS}
begin
{$IFDEF HEADLESS}
- e_NoGraphics := True;
+ e_NoGraphics := true;
{$ENDIF}
{$ENDIF}
- for idx := 1 to ParamCount do
+ idx := 1;
+ while (idx <= ParamCount) do
begin
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;
- end;
+ arg := ParamStr(idx);
+ Inc(idx);
+ 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 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 = '--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 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 = '--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;
- e_WriteLog('Initializing OpenGL', MSG_NOTIFY);
- InitOpenGL(gVSync);
+ if arg = '--debug-input' then g_dbg_input := True;
- e_WriteLog('Creating GL window', MSG_NOTIFY);
- if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then
- begin
- Result := 0;
- exit;
- end;
+ {.$IF DEFINED(D2F_DEBUG)}
+ if arg = '--aimline' then g_dbg_aimline_on := true;
+ {.$ENDIF}
- {EnumDisplayModes();}
+{$IFDEF ENABLE_HOLMES}
+ if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
- 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);
- gwin_has_stencil := (ltmp > 0);
- end
- else
- begin
- gwin_has_stencil := false;
+ if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
+ begin
+ if (idx <= ParamCount) then
+ begin
+ if not conParseFloat(fuiRenderScale, ParamStr(idx)) then fuiRenderScale := 1.0;
+ Inc(idx);
+ end;
+ end;
+
+ if (arg = '--holmes-font') or (arg = '-holmes-font') then
+ begin
+ if (idx <= ParamCount) then
+ begin
+ itmp := 0;
+ val(ParamStr(idx), itmp, valres);
+ {$IFNDEF HEADLESS}
+ if (valres = 0) and (not g_holmes_imfunctional) then
+ begin
+ case itmp of
+ 8: uiContext.font := 'win8';
+ 14: uiContext.font := 'win14';
+ 16: uiContext.font := 'win16';
+ end;
+ end;
+ {$ELSE}
+ // fuck off, fpc!
+ itmp := itmp;
+ valres := valres;
+ {$ENDIF}
+ Inc(idx);
+ end;
+ end;
+{$ENDIF}
+
+ 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 (arg = '--write-mapdef') or (arg = '-write-mapdef') then
+ begin
+ mdfo := createDiskFile('mapdef.txt');
+ mdfo.WriteBuffer(defaultMapDef[1], Length(defaultMapDef));
+ mdfo.Free();
+ Halt(0);
+ end;
+
+ if (arg = '--pixel-scale') or (arg = '-pixel-scale') then
+ begin
+ if (idx <= ParamCount) then
+ begin
+ if not conParseFloat(r_pixel_scale, ParamStr(idx)) then r_pixel_scale := 1.0;
+ Inc(idx);
+ end;
+ end;
end;
end;
- if not glHasExtension('GL_ARB_texture_non_power_of_two') then
+{$IFNDEF USE_SYSSTUB}
+ PrintGLSupportedExtensions;
+ glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'));
+{$ELSE}
+ glLegacyNPOT := False;
+ glRenderToFBO := False;
+{$ENDIF}
+ if glNPOTOverride and glLegacyNPOT then
begin
begin
- e_WriteLog('Driver DID''T advertised NPOT textures support', MSG_WARNING);
glLegacyNPOT := true;
glLegacyNPOT := true;
+ e_logWriteln('NPOT texture emulation: FORCED');
end
else
begin
end
else
begin
- e_WriteLog('Driver advertised NPOT textures support', MSG_NOTIFY);
- glLegacyNPOT := false;
+ if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled')
+ else e_logWriteln('NPOT texture emulation: disabled');
end;
end;
- gwin_dump_extensions := false;
- Init();
- Time_Old := GetTimer();
+ Init;
+ Time_Old := sys_GetTicks();
+
+ g_Net_InitLowLevel();
-// Êîìàíäíàÿ ñòðîêà:
- if ParamCount > 0 then
- g_Game_Process_Params();
+ // Êîìàíäíàÿ ñòðîêà
+ if (ParamCount > 0) then g_Game_Process_Params();
-// Çàïðîñ ÿçûêà:
- if (not gGameOn) and gAskLanguage then
- g_Menu_AskLanguage();
+{$IFNDEF HEADLESS}
+ // Çàïðîñ ÿçûêà
+ if (not gGameOn) and gAskLanguage then g_Menu_AskLanguage();
+{$ENDIF}
- e_WriteLog('Entering the main loop', MSG_NOTIFY);
+ e_WriteLog('Entering the main loop', TMsgType.Notify);
- while not ProcessMessage() do
- { Main Loop } ;
+ // main loop
+ while not ProcessMessage() do begin end;
+
+ g_Net_Slist_ShutdownAll();
Release();
Release();
- KillGLWindow();
- Result := 0;
+ g_Net_DeinitLowLevel();
+ result := 0;
end;
end;
+
+initialization
+ conRegVar('d_input', @g_dbg_input, '', '')
end.
end.