index d445dcb6a3f5ada784171cc44353140ab4d3ba7c..7ef7d7b95424119026bfd31aee8caf44420976bd 100644 (file)
g_base // TRectWH
;
+ type
+ TProcedure = procedure;
+
(* render startup *)
procedure r_Render_Initialize;
procedure r_Render_Finalize;
procedure r_Render_GetStringSize (BigFont: Boolean; str: String; out w, h: Integer);
{$ENDIF}
- procedure r_Render_DrawLoading (force: Boolean); // !!! remove it
+ procedure r_Render_SetProcessLoadingCallback (p: TProcedure);
+ procedure r_Render_ClearLoading;
+ procedure r_Render_SetLoading (const text: String; maxval: Integer);
+ procedure r_Render_StepLoading (incval: Integer);
+ procedure r_Render_DrawLoading (force: Boolean);
+
+ {$IFDEF ENABLE_HOLMES}
+ function pmsCurMapX (): Integer;
+ function pmsCurMapY (): Integer;
+ function r_Render_HolmesViewIsSet (): Boolean;
+ {$ENDIF}
implementation
uses
- {$IFDEF USE_GLES1}
- GLES11,
- {$ELSE}
- GL, GLEXT,
- {$ENDIF}
+ {$I ../../../nogl/noGLuses.inc}
{$IFDEF ENABLE_MENU}
r_gui,
{$ENDIF}
{$IFDEF ENABLE_SYSTEM}
g_system,
{$ENDIF}
+ {$IFDEF ENABLE_TOUCH}
+ r_touch,
+ {$ENDIF}
+ {$IFDEF ENABLE_HOLMES}
+ r_holmes,
+ {$ENDIF}
SysUtils, Classes, Math,
g_basic,
- e_log, utils, wadreader,
- g_game, g_map, g_options, g_console, g_player, g_weapons, g_language, g_triggers,
+ e_log, utils, wadreader, mapdef,
+ g_game, g_map, g_panel, g_options, g_console, g_player, g_weapons, g_language, g_triggers, g_monsters,
g_net, g_netmaster,
- r_draw, r_textures, r_fonts, r_common, r_console, r_map
+ r_draw, r_textures, r_fonts, r_common, r_console, r_map, r_loadscreen
;
var
- BackgroundTexture: THereTexture;
-
hud, hudbg: TGLTexture;
hudhp: array [Boolean] of TGLTexture;
hudap: TGLTexture;
hudrflag, hudrflags, hudrflagd: TGLTexture;
hudbflag, hudbflags, hudbflagd: TGLTexture;
+ FPS, FPSCounter, FPSTime: LongWord;
+
procedure r_Render_LoadTextures;
begin
r_Map_LoadTextures;
var
i: Integer;
begin
+ r_LoadScreen_Load;
r_Common_Load;
- BackgroundTexture := DEFAULT(THereTexture);
- hud := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUD');
- hudbg := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUDBG');
- hudhp[false] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/MED2');
- hudhp[true] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/BMED');
- hudap := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/ARMORHUD');
+ r_Common_SetLoading('HUD Textures', 5 + (WP_LAST + 1) + 11);
+ hud := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/HUD', [TGLHints.txNoRepeat]);
+ hudbg := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/HUDBG', []);
+ hudhp[false] := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/MED2', [TGLHints.txNoRepeat]);
+ hudhp[true] := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/BMED', [TGLHints.txNoRepeat]);
+ hudap := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/ARMORHUD', [TGLHints.txNoRepeat]);
for i := 0 to WP_LAST do
- hudwp[i] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/' + WeapName[i]);
- hudkey[0] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/KEYR');
- hudkey[1] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/KEYG');
- hudkey[2] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/KEYB');
- hudair := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/AIRBAR');
- hudjet := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/JETBAR');
- hudrflag := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/FLAGHUD_R_BASE');
- hudrflags := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/FLAGHUD_R_STOLEN');
- hudrflagd := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/FLAGHUD_R_DROP');
- hudbflag := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/FLAGHUD_B_BASE');
- hudbflags := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/FLAGHUD_B_STOLEN');
- hudbflagd := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/FLAGHUD_B_DROP');
+ hudwp[i] := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/' + WeapName[i], [TGLHints.txNoRepeat]);
+ hudkey[0] := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/KEYR', [TGLHints.txNoRepeat]);
+ hudkey[1] := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/KEYG', [TGLHints.txNoRepeat]);
+ hudkey[2] := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/KEYB', [TGLHints.txNoRepeat]);
+ hudair := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/AIRBAR', [TGLHints.txNoRepeat]);
+ hudjet := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/JETBAR', [TGLHints.txNoRepeat]);
+ hudrflag := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/FLAGHUD_R_BASE', [TGLHints.txNoRepeat]);
+ hudrflags := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/FLAGHUD_R_STOLEN', [TGLHints.txNoRepeat]);
+ hudrflagd := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/FLAGHUD_R_DROP', [TGLHints.txNoRepeat]);
+ hudbflag := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/FLAGHUD_B_BASE', [TGLHints.txNoRepeat]);
+ hudbflags := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/FLAGHUD_B_STOLEN', [TGLHints.txNoRepeat]);
+ hudbflagd := r_Common_LoadTextureFromFile(GameWAD + ':TEXTURES/FLAGHUD_B_DROP', [TGLHints.txNoRepeat]);
r_Console_Load;
r_Map_Load;
{$IFDEF ENABLE_MENU}
{$ENDIF}
r_Map_Free;
r_Console_Free;
- hudbflagd.Free;
- hudbflags.Free;
- hudbflag.Free;
- hudrflagd.Free;
- hudrflags.Free;
- hudrflag.Free;
- hudjet.Free;
- hudair.Free;
- hudkey[0].Free;
- hudkey[1].Free;
- hudkey[2].Free;
+ r_Common_FreeAndNil(hudbflagd);
+ r_Common_FreeAndNil(hudbflags);
+ r_Common_FreeAndNil(hudbflag);
+ r_Common_FreeAndNil(hudrflagd);
+ r_Common_FreeAndNil(hudrflags);
+ r_Common_FreeAndNil(hudrflag);
+ r_Common_FreeAndNil(hudjet);
+ r_Common_FreeAndNil(hudair);
+ r_Common_FreeAndNil(hudkey[0]);
+ r_Common_FreeAndNil(hudkey[1]);
+ r_Common_FreeAndNil(hudkey[2]);
for i := 0 to WP_LAST do
- begin
- if hudwp[i] <> nil then
- hudwp[i].Free;
- hudwp[i] := nil;
- end;
- hudap.Free;
- hudhp[true].Free;
- hudhp[false].Free;
- hudbg.Free;
- hud.Free;
- r_Common_FreeThis(BackgroundTexture);
+ r_Common_FreeAndNil(hudwp[i]);
+ r_Common_FreeAndNil(hudap);
+ r_Common_FreeAndNil(hudhp[true]);
+ r_Common_FreeAndNil(hudhp[false]);
+ r_Common_FreeAndNil(hudbg);
+ r_Common_FreeAndNil(hud);
r_Common_Free;
end;
info.maximized := gRC_Maximized;
info.major := 1;
info.minor := 1;
- info.profile := TGLProfile.Compat;
+ {$IFDEF USE_GLES1}
+ info.profile := TGLProfile.Common;
+ {$ELSE}
+ info.profile := TGLProfile.Compat;
+ {$ENDIF}
result := info;
end;
{$ENDIF}
+ procedure r_Render_LogGLInfo;
+ 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;
+
procedure r_Render_Initialize;
begin
{$IFDEF ENABLE_SYSTEM}
raise Exception.Create('Failed to set videomode on startup.');
sys_EnableVSync(gVSync);
{$ENDIF}
+ {$IFDEF NOGL_INIT}
+ nogl_Init;
+ {$ENDIF}
+ r_Render_LogGLInfo;
+ r_LoadScreen_Initialize;
r_Textures_Initialize;
r_Console_Initialize;
r_Map_Initialize;
r_Map_Finalize;
r_Console_Finalize;
r_Textures_Finalize;
+ r_LoadScreen_Finalize;
+ {$IFDEF NOGL_INIT}
+ nogl_Quit;
+ {$ENDIF}
end;
procedure r_Render_Update;
end;
procedure r_Render_DrawHUDArea (x, y, w, h: Integer; p: TPlayer);
- var s: AnsiString;
+ var s: AnsiString; oldy: Integer;
begin
r_Common_DrawTexture(hudbg, x, y, w, h, TBasePoint.BP_LEFTUP);
if p <> nil then
begin
+ oldy := y;
+ if h < 239 then y := y - 32; (* hack: hide nickname on 640x400 *)
r_Render_DrawHUD(x + w - 196 + 2, y, p);
if p.Spectator then
begin
if p.NoRespawn then
r_Common_DrawText(_lc[I_PLAYER_SPECT1S], x + 4, y + 290, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP);
end;
+ y := oldy;
end;
if gShowPing and g_Game_IsClient then
if gShowScore and (gGameSettings.GameMode in [GM_TDM, GM_CTF]) then
begin
- (* RED TEAM GOALS *)
+ (* RED TEAM SCORE *)
fw := 0;
if gGameSettings.GameMode = GM_CTF then
begin
end;
r_Common_DrawText(IntToStr(gTeamStat[TEAM_RED].Score), x + w - 16 - fw, y + 240 - 72 - 4, TEAMCOLOR[TEAM_RED].R, TEAMCOLOR[TEAM_RED].G, TEAMCOLOR[TEAM_RED].B, 255, menufont, TBasePoint.BP_RIGHTUP);
- (* BLUE TEAM GOALS *)
+ (* BLUE TEAM SCORE *)
fw := 0;
if gGameSettings.GameMode = GM_CTF then
begin
end;
procedure r_Render_DrawView (x, y, w, h: Integer; p: TPlayer);
- var l, t, r, b: Integer;
+ var l, t, r, b, xx, yy, cx, cy: Integer;
begin
r_Draw_GetRect(l, t, r, b);
r_Draw_SetRect(x, y, x + w, y + h);
+ r_Common_GetCameraPos(p, true, xx, yy);
if p <> nil then
begin
- r_Map_Draw(x, y, w, h, p.obj.x + PLAYER_RECT_CX, p.obj.y + PLAYER_RECT_CY, p);
+ r_Map_Draw(x, y, w, h, xx, yy, p, cx, cy);
+ {$IFDEF ENABLE_HOLMES}
+ if p = gPlayer1 then
+ begin
+ r_Holmes_plrViewPos(cx, cy);
+ r_Holmes_plrViewSize(h, w);
+ end;
+ {$ENDIF}
r_Render_DrawStatsView(x, y, w, h, p);
if p.Spectator and p.NoRespawn then
r_Common_DrawText(_lc[I_PLAYER_SPECT4], x div 2 + w div 2, y div 2 + h div 2, 255, 255, 255, 255, stdfont, TBasePoint.BP_CENTER);
end
else
begin
- r_Map_Draw(x, y, w, h, 0, 0, nil);
+ r_Map_Draw(x, y, w, h, xx, yy, nil, cx, cy);
end;
r_Draw_SetRect(l, t, r, b);
end;
procedure r_Render_DrawMapView (x, y, w, h, camx, camy: Integer);
- var l, t, r, b: Integer;
+ var l, t, r, b, cx, cy: Integer;
begin
r_Draw_GetRect(l, t, r, b);
r_Draw_SetRect(x, y, x + w, y + h);
- r_Map_Draw(x, y, w, h, camx, camy, nil);
+ r_Map_Draw(x, y, w, h, camx, camy, nil, cx, cy);
r_Draw_SetRect(l, t, r, b);
end;
r_Draw_SetRect(l, t, r, b);
end;
- procedure r_Render_DrawBackgroundImage (img: TGLTexture);
- var fw, w, h: LongInt;
- begin
- if img <> nil then
- begin
- img := BackgroundTexture.id;
- if img.width = img.height then fw := img.width * 4 div 3 else fw := img.width; // fix aspect 4:3
- r_Common_CalcAspect(fw, img.height, gScreenWidth, gScreenHeight, false, w, h);
- r_Draw_Texture(img, gScreenWidth div 2 - w div 2, 0, w, h, false, 255, 255, 255, 255, false);
- end
- end;
-
- procedure r_Render_DrawBackground (const name: AnsiString);
- begin
- if r_Common_LoadThis(name, BackgroundTexture) then
- r_Render_DrawBackgroundImage(BackgroundTexture.id)
- end;
-
procedure r_Render_DrawServerList (var SL: TNetServerList; var ST: TNetServerTable);
var ip: AnsiString; ww, hh, cw, ch, mw, mh, motdh, scrx, scry, i, mx, y: Integer; msg: SSArray; Srv: TNetServer;
begin
begin
r_Draw_FillRect(16, motdh, gScreenWidth - 16, gScreenHeight - 44, 64, 64, 64, 110);
r_Draw_Rect(16, motdh, gScreenWidth - 16, gScreenHeight - 44, 255, 127, 0, 255);
- r_Common_DrawFormatText(slMOTD, 20, motdh + 3 + ch * i, 255, stdfont, TBasePoint.BP_LEFTUP);
+ r_Common_DrawFormatText(slMOTD, 20, motdh + 3, 255, stdfont, TBasePoint.BP_LEFTUP);
end;
if not slReadUrgent and (slUrgent <> '') then
r_Draw_Rect(scrx - 256, scry - 60, scrx + 256, scry + 60, 255, 127, 0, 255);
r_Draw_FillRect(scrx - 256, scry - 40, scrx + 256, scry - 40, 255, 127, 0, 255);
r_Common_DrawText(_lc[I_NET_SLIST_URGENT], scrx, scry - 58, 255, 255, 255, 255, stdfont, TBasePoint.BP_UP);
- r_Common_DrawFormatText(slUrgent, scrx - 253, scry - 38 + ch * i, 255, stdfont, TBasePoint.BP_LEFTUP);
+ r_Common_DrawFormatText(slUrgent, scrx - 253, scry - 38, 255, stdfont, TBasePoint.BP_LEFTUP);
r_Common_DrawText(_lc[I_NET_SLIST_URGENT_CONT], scrx, scry + 41, 255, 255, 255, 255, stdfont, TBasePoint.BP_UP);
r_Draw_FillRect(scrx - 256, scry + 40, scrx + 256, scry + 40, 255, 127, 0, 255);
end
w3 := cw * 8; (* frags width *)
w2 := cw * 12; (* ping/loss width *)
w1 := w - w2 - w3 - w4; (* name width *)
- tw := w1 - cw * 2 - w2; (* team goals *)
+ tw := w1 - cw * 2 - w2; (* team score *)
if cs.PlayerStat = nil then players := 0 else players := Length(cs.PlayerStat);
yy := y;
if cs.GameMode in [GM_TDM, GM_CTF] then
result := p;
end;
+ procedure r_Render_DrawMinimap (x, y: Integer; alpha: Byte);
+ const scale = 16;
+
+ function IsMinimapPanel (const p: TPanel): Boolean;
+ begin
+ result := (p <> nil) and p.Enabled;
+ if result then
+ begin
+ case p.PanelType of
+ PANEL_WALL, PANEL_WATER, PANEL_ACID1, PANEL_ACID2,
+ PANEL_STEP, PANEL_OPENDOOR, PANEL_CLOSEDOOR,
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT:
+ result := true;
+ otherwise
+ result := false;
+ end;
+ end;
+ end;
+
+ procedure DrawObject (xx, yy, ww, hh: Integer; r, g, b: Byte);
+ var x0, y0, x1, y1: Integer;
+ begin
+ x0 := x + xx div scale;
+ y0 := y + yy div scale;
+ x1 := x + (xx + ww - 1) div scale;
+ y1 := y + (yy + hh - 1) div scale;
+ r_Draw_FillRect(x0, y0, x1, y1, r, g, b, alpha);
+ end;
+
+ procedure DrawPanels (const a: TPanelArray);
+ var i: Integer; p: TPanel; c: TRGB;
+ begin
+ if a <> nil then
+ begin
+ for i := 0 to HIGH(a) do
+ begin
+ p := a[i];
+ if IsMinimapPanel(p) then
+ begin
+ case p.PanelType of
+ PANEL_WALL: c := _RGB(208, 208, 208);
+ PANEL_OPENDOOR: c := _RGB(160, 160, 160);
+ PANEL_CLOSEDOOR: c := _RGB(160, 160, 160);
+ PANEL_STEP: c := _RGB(128, 128, 128);
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT:
+ case p.LiftType of
+ LIFTTYPE_UP: c := _RGB(116, 72, 36);
+ LIFTTYPE_DOWN: c := _RGB(116, 124, 96);
+ LIFTTYPE_LEFT: c := _RGB(116, 200, 80);
+ LIFTTYPE_RIGHT: c := _RGB(116, 252, 140);
+ otherwise c := _RGB(255, 0, 0);
+ end;
+ PANEL_WATER: c := _RGB(0, 0, 192);
+ PANEL_ACID1: c := _RGB(0, 176, 0);
+ PANEL_ACID2: c := _RGB(176, 0, 0);
+ otherwise c := _RGB(255, 0, 0);
+ end;
+ DrawObject(p.x, p.y, p.width, p.height, c.r, c.g, c.b);
+ end;
+ end;
+ end;
+ end;
+
+ procedure DrawPlayers;
+ var i: Integer; p: TPlayer; c: TRGB;
+ begin
+ if gPlayers <> nil then
+ begin
+ for i := 0 to HIGH(gPlayers) do
+ begin
+ p := gPlayers[i];
+ if p.Alive then
+ begin
+ case p.Team of
+ TEAM_RED: c := _RGB(255, 0, 0);
+ TEAM_BLUE: c := _RGB(0, 0, 255);
+ otherwise c := _RGB(255, 128, 0);
+ end;
+ DrawObject(p.obj.x, p.obj.y, p.obj.rect.width, p.obj.rect.height, c.r, c.g, c.b);
+ end;
+ end;
+ end;
+ end;
+
+ function DrawMonster (m: TMonster): Boolean;
+ begin
+ result := false; // don't stop
+ if m.alive then
+ DrawObject(m.obj.x, m.obj.y, m.obj.rect.width, m.obj.rect.height, 255, 255, 0);
+ end;
+
+ begin
+ r_Draw_FillRect(x, y, (x + gMapInfo.Width - 1) div scale, (y + gMapInfo.Height - 1) div scale, 0, 0, 0, alpha);
+ DrawPanels(gSteps);
+ DrawPanels(gLifts);
+ DrawPanels(gWater);
+ DrawPanels(gAcid1);
+ DrawPanels(gAcid2);
+ DrawPanels(gWalls);
+ g_Mons_ForEach(DrawMonster);
+ DrawPlayers;
+ end;
+
procedure r_Render_Draw;
- var p1, p2: TPlayer;
+ var p1, p2: TPlayer; time: LongWord; pw, ph: Integer;
begin
if gExit = EXIT_QUIT then
exit;
- r_Draw_Setup(gScreenWidth, gScreenHeight);
+ {$IFDEF ENABLE_SYSTEM}
+ (* hack: if r_pixel_scale changed, reset menu and other things *)
+ pw := Round(gWinSizeX / r_pixel_scale);
+ ph := Round(gWinSizeY / r_pixel_scale);
+ if (pw <> gScreenWidth) or (ph <> gScreenHeight) then
+ if assigned(sys_ScreenResize) then
+ sys_ScreenResize(gWinSizeX, gWinSizeY);
+ {$ENDIF}
- glClearColor(0.0, 0.0, 0.0, 0.0);
- glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
+ INC(FPSCounter);
+ time := GetTickCount64();
+ if time - FPSTime >= 1000 then
+ begin
+ FPS := FPSCounter;
+ FPSCounter := 0;
+ FPSTime := time;
+ end;
- glColor4ub(255, 255, 255, 255);
- glEnable(GL_SCISSOR_TEST);
- r_Draw_SetRect(0, 0, gScreenWidth, gScreenHeight);
+ r_Draw_Setup(gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight);
- //e_LogWritefln('r_render_draw: %sx%s', [gScreenWidth, gScreenHeight]);
+ glClearColor(0.0, 0.0, 0.0, 0.0);
+ glClear(GL_COLOR_BUFFER_BIT);
p1 := nil;
p2 := nil;
if gGameOn or ((gState in [STATE_FOLD]) and (EndingGameCounter < 255)) then
begin
- // TODO setup player hear point
-
if gSpectMode = SPECT_MAPVIEW then
begin
r_Render_DrawMapView(0, 0, gScreenWidth, gScreenHeight, gSpectX + gScreenWidth div 2, gSpectY + gScreenHeight div 2);
r_Render_DrawPlayerView(0, 0, gScreenWidth, gScreenHeight, p2);
end;
- // TODO draw holmes inspector
+ if gShowMap then
+ r_Render_DrawMiniMap(0, 0, 160);
+
+ {$IFDEF ENABLE_HOLMES}
+ r_Holmes_Draw;
+ {$ENDIF}
if MessageText <> '' then
r_Common_DrawFormatText(MessageText, (gScreenWidth - 196) div 2, gScreenHeight div 2, 255, menufont, TBasePoint.BP_CENTER);
if not gGameOn then
begin
+ // TODO F key handle
case gState of
STATE_NONE: (* do nothing *) ;
- STATE_MENU: r_Render_DrawBackground(GameWad + ':TEXTURES/TITLE');
+ STATE_MENU: r_Common_DrawBackground(GameWad + ':TEXTURES/TITLE');
STATE_FOLD:
begin
if EndingGameCounter > 0 then
begin
if gLastMap and (gGameSettings.GameMode = GM_COOP) then
if EndPicPath <> '' then
- r_Render_DrawBackground(EndPicPath)
+ r_Common_DrawBackground(EndPicPath)
else
- r_Render_DrawBackground(GameWad + ':TEXTURES/' + _lc[I_TEXTURE_ENDPIC])
+ r_Common_DrawBackground(GameWad + ':TEXTURES/' + _lc[I_TEXTURE_ENDPIC])
else
- r_Render_DrawBackground(GameWad + ':TEXTURES/INTER');
+ r_Common_DrawBackground(GameWad + ':TEXTURES/INTER');
r_Render_DrawCustomStats;
end
else
begin
- r_Render_DrawBackground(GameWad + ':TEXTURES/INTER');
+ r_Common_DrawBackground(GameWad + ':TEXTURES/INTER');
r_Render_DrawSingleStats;
{$IFDEF ENABLE_MENU}
if g_ActiveWindow <> nil then
STATE_ENDPIC:
begin
if EndPicPath <> '' then
- r_Render_DrawBackground(EndPicPath)
+ r_Common_DrawBackground(EndPicPath)
else
- r_Render_DrawBackground(GameWad + ':TEXTURES/' + _lc[I_TEXTURE_ENDPIC]);
+ r_Common_DrawBackground(GameWad + ':TEXTURES/' + _lc[I_TEXTURE_ENDPIC]);
{$IFDEF ENABLE_MENU}
if g_ActiveWindow <> nil then
r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105);
end;
STATE_SLIST:
begin
- r_Render_DrawBackground(GameWad + ':TEXTURES/TITLE');
+ r_Common_DrawBackground(GameWad + ':TEXTURES/TITLE');
r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105);
r_Render_DrawServerList(slCurrent, slTable);
end;
r_Console_Draw(false);
- // TODO draw holmes interface
+ // TODO g_debug_Sounds
+
+ if gShowFPS then
+ begin
+ r_Common_DrawText('FPS: ' + IntToStr(FPS), 0, 0, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP);
+ r_Common_DrawText('UPS: ' + IntToStr(UPS), 0, 16, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP);
+ end;
+
+ if gGameOn and gShowTime then
+ begin
+ r_Common_DrawText(r_Common_TimeToStr(gTime), gScreenWidth - 4, gScreenHeight - 1, 255, 255, 255, 255, stdfont, TBasePoint.BP_RIGHTDOWN);
+ end;
+
+ // TODO draw profilers
+
+ {$IFDEF ENABLE_HOLMES}
+ r_Holmes_DrawUI;
+ {$ENDIF}
+
+ {$IFDEF ENABLE_TOUCH}
+ glScalef(1 / r_pixel_scale, 1 / r_pixel_scale, 0);
+ r_Touch_Draw;
+ {$ENDIF}
- glFlush();
- glFinish();
sys_Repaint;
end;
gWinSizeY := h;
gRC_Width := w;
gRC_Height := h;
- gScreenWidth := w;
- gScreenHeight := h;
+ gScreenWidth := Round(w / r_pixel_scale);
+ gScreenHeight := Round(h / r_pixel_scale);
end;
procedure r_Render_Apply;
e_LogWriteln('resolution changed')
else
e_LogWriteln('resolution not changed');
- sys_EnableVSync(gVSync)
+ sys_EnableVSync(gVSync);
+ {$ENDIF}
+ {$IFDEF NOGL_INIT}
+ nogl_Init;
{$ENDIF}
end;
function r_Render_WriteScreenShot (filename: String): Boolean;
begin
+ // TODO write screenshot file
Result := False;
end;
{$IFDEF ENABLE_TOUCH}
procedure r_Render_GetKeyRect (key: Integer; out x, y, w, h: Integer; out founded: Boolean);
begin
- founded := False;
+ r_Touch_GetKeyRect(key, x, y, w, h, founded)
end;
{$ENDIF}
end;
{$ENDIF}
+ procedure r_Render_SetProcessLoadingCallback (p: TProcedure);
+ begin
+ r_Common_ProcessLoadingCallback := p;
+ end;
+
+ procedure r_Render_ClearLoading;
+ begin
+ r_Common_ClearLoading;
+ end;
+
+ procedure r_Render_SetLoading (const text: String; maxval: Integer);
+ begin
+ r_Common_SetLoading(text, maxval);
+ end;
+
+ procedure r_Render_StepLoading (incval: Integer);
+ begin
+ r_Common_StepLoading(incval);
+ end;
+
procedure r_Render_DrawLoading (force: Boolean);
begin
- // TODO draw loading screen
+ r_Common_DrawLoading(force);
+ end;
+
+{$IFDEF ENABLE_HOLMES}
+ function pmsCurMapX (): Integer;
+ begin
+ result := r_holmes.pmsCurMapX();
end;
+ function pmsCurMapY (): Integer;
+ begin
+ result := r_holmes.pmsCurMapY();
+ end;
+
+ function r_Render_HolmesViewIsSet (): Boolean;
+ begin
+ result := vpSet;
+ end;
+{$ENDIF}
+
end.