X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Frenders%2Fopengl%2Fr_render.pas;h=aff2252b8c6c2d00ab240100249e2480a4d9c377;hb=6148346280a8004f75dfb87fb4f77f0753365e69;hp=e34b9cd10b83992418d9783142ac887263457e30;hpb=39f79dfba0fce4eca09ad34f7cd8bee7bb2fb6fd;p=d2df-sdl.git diff --git a/src/game/renders/opengl/r_render.pas b/src/game/renders/opengl/r_render.pas index e34b9cd..aff2252 100644 --- a/src/game/renders/opengl/r_render.pas +++ b/src/game/renders/opengl/r_render.pas @@ -74,22 +74,29 @@ implementation {$ELSE} GL, GLEXT, {$ENDIF} + {$IFDEF ENABLE_MENU} + r_gui, + {$ENDIF} {$IFDEF ENABLE_SYSTEM} g_system, {$ENDIF} SysUtils, Classes, Math, e_log, utils, + g_basic, g_game, g_options, g_console, g_player, g_weapons, g_language, - g_net, - r_draw, r_textures, r_fonts, r_map + g_net, g_netmaster, + r_draw, r_textures, r_fonts, r_common, r_console, r_map ; - var - menuBG: TGLTexture; + type + TBasePoint = ( + BP_LEFTUP, BP_UP, BP_RIGHTUP, + BP_LEFT, BP_CENTER, BP_RIGHT, + BP_LEFTDOWN, BP_DOWN, BP_RIGHTDOWN + ); - stdfont: TGLFont; - smallfont: TGLFont; - menufont: TGLFont; + var + BackgroundTexture: THereTexture; hud, hudbg: TGLTexture; hudhp: array [Boolean] of TGLTexture; @@ -109,27 +116,14 @@ implementation r_Map_FreeTextures; end; - function r_Render_LoadFont (const name: AnsiString): TGLFont; - var info: TFontInfo; skiphack: Integer; - begin - result := nil; - if name = 'STD' then skiphack := 144 else skiphack := 0; - if r_Font_LoadInfoFromFile(GameWad + ':FONTS/' + name + 'TXT', info) then - result := r_Textures_LoadFontFromFile(GameWad + ':FONTS/' + name + 'FONT', info, skiphack, true); - if result = nil then - e_logwritefln('failed to load font %s', [name]); - end; - procedure r_Render_Load; const WeapName: array [0..WP_LAST] of AnsiString = ('KASTET', 'SAW', 'PISTOL', 'SHOTGUN1', 'SHOTGUN2', 'MGUN', 'RLAUNCHER', 'PGUN', 'BFG', 'SPULEMET', 'FLAMETHROWER'); var i: Integer; begin - menuBG := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/TITLE'); - stdfont := r_Render_LoadFont('STD'); - smallfont := r_Render_LoadFont('SMALL'); - menufont := r_Render_LoadFont('MENU'); + 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'); @@ -142,13 +136,21 @@ implementation hudkey[2] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/KEYB'); hudair := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/AIRBAR'); hudjet := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/JETBAR'); + r_Console_Load; r_Map_Load; + {$IFDEF ENABLE_MENU} + r_GUI_Load; + {$ENDIF} end; procedure r_Render_Free; var i: Integer; begin + {$IFDEF ENABLE_MENU} + r_GUI_Free; + {$ENDIF} r_Map_Free; + r_Console_Free; hudjet.Free; hudair.Free; hudkey[0].Free; @@ -165,10 +167,8 @@ implementation hudhp[false].Free; hudbg.Free; hud.Free; - menufont.Free; - smallfont.Free; - stdfont.Free; - menuBG.Free; + r_Common_FreeThis(BackgroundTexture); + r_Common_Free; end; {$IFDEF ENABLE_SYSTEM} @@ -196,29 +196,52 @@ implementation sys_EnableVSync(gVSync); {$ENDIF} r_Textures_Initialize; + r_Console_Initialize; r_Map_Initialize; end; procedure r_Render_Finalize; begin r_Map_Finalize; + r_Console_Finalize; r_Textures_Finalize; end; procedure r_Render_Update; begin + r_Console_Update; r_Map_Update; end; - procedure SetupMatrix; + procedure r_Render_GetBasePoint (x, y, w, h: Integer; p: TBasePoint; out xx, yy: Integer); + begin + case p of + TBasePoint.BP_LEFTUP, TBasePoint.BP_LEFT, TBasePoint.BP_LEFTDOWN: xx := x; + TBasePoint.BP_UP, TBasePoint.BP_CENTER, TBasePoint.BP_DOWN: xx := x - w div 2; + TBasePoint.BP_RIGHTUP, TBasePoint.BP_RIGHT, TBasePoint.BP_RIGHTDOWN: xx := x - w; + end; + case p of + TBasePoint.BP_LEFTUP, TBasePoint.BP_UP, TBasePoint.BP_RIGHTUP: yy := y; + TBasePoint.BP_LEFT, TBasePoint.BP_CENTER, TBasePoint.BP_RIGHT: yy := y - h div 2; + TBasePoint.BP_LEFTDOWN, TBasePoint.BP_DOWN, TBasePoint.BP_RIGHTDOWN: yy := y - h; + end; + end; + + procedure r_Render_DrawText (const text: AnsiString; x, y: Integer; r, g, b, a: Byte; f: TGLFont; p: TBasePoint); + var w, h: Integer; + begin + if p <> TBasePoint.BP_LEFTUP then + begin + r_Draw_GetTextSize(text, f, w, h); + r_Render_GetBasePoint(x, y, w, h, p, x, y); + end; + r_Draw_Text(text, x, y, r, g, b, a, f); + end; + + procedure r_Render_DrawTexture (img: TGLTexture; x, y, w, h: Integer; p: TBasePoint); begin - glViewport(0, 0, gScreenWidth, gScreenHeight); - glScissor(0, 0, gScreenWidth, gScreenHeight); - glMatrixMode(GL_PROJECTION); - glLoadIdentity; - glOrtho(0, gScreenWidth, gScreenHeight, 0, 0, 1); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity; + r_Render_GetBasePoint(x, y, w, h, p, x, y); + r_Draw_TextureRepeat(img, x, y, w, h, false, 255, 255, 255, 255, false); end; procedure r_Render_DrawHUD (x, y: Integer; p: TPlayer); @@ -226,46 +249,47 @@ implementation begin ASSERT(p <> nil); - r_Draw_TextureRepeat(hud, x, y, 196, 240, false, 255, 255, 255, 255, false); - r_Draw_Text(p.name, x + 16, y + 8, 255, 0, 0, 255, smallfont); // TODO draw at center + // hud area is 196 x 240 pixels + r_Render_DrawTexture(hud, x, y, hud.width, hud.height, TBasePoint.BP_LEFTUP); + r_Render_DrawText(p.name, x + 98, y + 16, 255, 0, 0, 255, smallfont, TBasePoint.BP_CENTER); t := hudhp[R_BERSERK in p.FRulez]; - r_Draw_Texture(t, x + 35, y + 45, t.width, t.height, false, 255, 255, 255, 255, false); - r_Draw_Texture(hudap, x + 34, y + 77, hudap.width, hudap.height, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(t, x + 51, y + 61, t.width, t.height, TBasePoint.BP_CENTER); + r_Render_DrawTexture(hudap, x + 50, y + 85, hudap.width, hudap.height, TBasePoint.BP_CENTER); - r_Draw_Text(IntToStr(MAX(0, p.health)), x + 105{178}, y + 40, 255, 0, 0, 255, menufont); // TODO draw at center - r_Draw_Text(IntToStr(MAX(0, p.armor)), x + 105{178}, y + 68, 255, 0, 0, 255, menufont); // TODO draw at center + r_Render_DrawText(IntToStr(MAX(0, p.health)), x + 174, y + 56, 255, 0, 0, 255, menufont, TBasePoint.BP_RIGHT); + r_Render_DrawText(IntToStr(MAX(0, p.armor)), x + 174, y + 84, 255, 0, 0, 255, menufont, TBasePoint.BP_RIGHT); case p.CurrWeap of WEAPON_KASTET, WEAPON_SAW: s := '--'; else s := IntToStr(p.GetAmmoByWeapon(p.CurrWeap)); end; - r_Draw_Text(s, x + 105, y + 158, 255, 0, 0, 255, menufont); // TODO draw at center + r_Render_DrawText(s, x + 174, y + 174, 255, 0, 0, 255, menufont, TBasePoint.BP_RIGHT); if p.CurrWeap <= WP_LAST then begin t := hudwp[p.CurrWeap]; - r_Draw_Texture(t, x + 18, y + 160, t.width, t.height, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(t, x + 18, y + 160, t.width, t.height, TBasePoint.BP_LEFTUP); end; if R_KEY_RED in p.FRulez then - r_Draw_Texture(hudkey[0], x + 76, y + 214, 16, 16, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudkey[0], x + 76, y + 214, 16, 16, TBasePoint.BP_LEFTUP); if R_KEY_GREEN in p.FRulez then - r_Draw_Texture(hudkey[1], x + 93, y + 214, 16, 16, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudkey[1], x + 93, y + 214, 16, 16, TBasePoint.BP_LEFTUP); if R_KEY_BLUE in p.FRulez then - r_Draw_Texture(hudkey[2], x + 110, y + 214, 16, 16, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudkey[2], x + 110, y + 214, 16, 16, TBasePoint.BP_LEFTUP); if p.JetFuel > 0 then begin - r_Draw_Texture(hudair, x, y + 116, hudair.width, hudair.height, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudair, x, y + 116, hudair.width, hudair.height, TBasePoint.BP_LEFTUP); if p.air > 0 then r_Draw_FillRect(x + 14, y + 116 + 4, x + 14 + 168 * p.air div AIR_MAX, y + 116 + 4 + 4, 0, 0, 196, 255); - r_Draw_Texture(hudjet, x, y + 126, hudjet.width, hudjet.height, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudjet, x, y + 126, hudjet.width, hudjet.height, TBasePoint.BP_LEFTUP); r_Draw_FillRect(x + 14, y + 126 + 4, x + 14 + 168 * p.JetFuel div JET_MAX, y + 126 + 4 + 4, 208, 0, 0, 255); end else begin - r_Draw_Texture(hudair, x, y + 124, hudair.width, hudair.height, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudair, x, y + 124, hudair.width, hudair.height, TBasePoint.BP_LEFTUP); if p.air > 0 then r_Draw_FillRect(x + 14, y + 124 + 4, x + 14 + 168 * p.air div AIR_MAX, y + 124 + 4 + 4, 0, 0, 196, 255); end; @@ -274,7 +298,7 @@ implementation procedure r_Render_DrawHUDArea (x, y, w, h: Integer; p: TPlayer); var s: AnsiString; begin - r_Draw_TextureRepeat(hudbg, x, y, w, h, false, 255, 255, 255, 255, false); + r_Render_DrawTexture(hudbg, x, y, w, h, TBasePoint.BP_LEFTUP); if p <> nil then r_Render_DrawHUD(x + w - 196 + 2, y, p); @@ -282,21 +306,25 @@ implementation if gShowPing and g_Game_IsClient then begin s := _lc[I_GAME_PING_HUD] + IntToStr(NetPeer.lastRoundTripTime) + _lc[I_NET_SLIST_PING_MS]; - r_Draw_Text(s, x + 4, y + 242, 255, 255, 255, 255, stdfont); + r_Render_DrawText(s, x + 4, y + 242, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); end; if p.Spectator then begin - r_Draw_Text(_lc[I_PLAYER_SPECT], x + 4, y + 242, 255, 255, 255, 255, stdfont); - r_Draw_Text(_lc[I_PLAYER_SPECT2], x + 4, y + 258, 255, 255, 255, 255, stdfont); - r_Draw_Text(_lc[I_PLAYER_SPECT1], x + 4, y + 274, 255, 255, 255, 255, stdfont); + r_Render_DrawText(_lc[I_PLAYER_SPECT], x + 4, y + 242, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText(_lc[I_PLAYER_SPECT2], x + 4, y + 258, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText(_lc[I_PLAYER_SPECT1], x + 4, y + 274, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); if p.NoRespawn then - r_Draw_Text(_lc[I_PLAYER_SPECT1S], x + 4, y + 290, 255, 255, 255, 255, stdfont); + r_Render_DrawText(_lc[I_PLAYER_SPECT1S], x + 4, y + 290, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); end; end; procedure r_Render_DrawView (x, y, w, h: Integer; p: TPlayer); + var l, t, r, b: Integer; begin + r_Draw_GetRect(l, t, r, b); + r_Draw_SetRect(x, y, x + w, y + h); + if p <> nil then r_Map_Draw(x, y, w, h, p.obj.x + PLAYER_RECT_CX, p.obj.y + PLAYER_RECT_CY, p) else @@ -307,17 +335,146 @@ implementation if p <> nil then begin if p.Spectator and p.NoRespawn then - begin - // TODO draw at center - r_Draw_Text(_lc[I_PLAYER_SPECT4], x div 2 + w div 2, y div 2 + h div 2, 255, 255, 255, 255, stdfont); - end; + r_Render_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; + + r_Draw_SetRect(l, t, r, b); end; procedure r_Render_DrawPlayerView (x, y, w, h: Integer; p: TPlayer); + var l, t, r, b: Integer; begin + r_Draw_GetRect(l, t, r, b); + r_Draw_SetRect(x, y, x + w, y + h); r_Render_DrawView(x, y, w - 196, h, p); r_Render_DrawHUDArea(x + w - 196, y, 196, h, p); + 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; + fw := img.width * 4 div 3; // 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 + scrx := gScreenWidth div 2; + scry := gScreenHeight div 2; + + r_Draw_GetTextSize(_lc[I_NET_SLIST], menufont, ww, hh); + r_Render_DrawText(_lc[I_NET_SLIST], gScreenWidth div 2, 16, 255, 255, 255, 255, menufont, TBasePoint.BP_UP); + + r_Draw_GetTextSize('W', stdfont, cw, ch); + motdh := gScreenHeight - 49 - ch * b_Text_LineCount(slMOTD); + + r_Draw_FillRect(16, 64, gScreenWidth - 16, motdh, 64, 64, 64, 145); + r_Draw_Rect(16, 64, gScreenWidth - 16, motdh, 255, 127, 0, 255); + + r_Render_DrawText(_lc[I_NET_SLIST_HELP], gScreenWidth div 2, gScreenHeight - 8, 255, 255, 255, 255, stdfont, TBasePoint.BP_DOWN); + + if slMOTD <> '' then + 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); + msg := Parse2(slMOTD, #10); + for i := 0 to High(msg) do + r_Render_DrawText(msg[i], 20, motdh + 3 + ch * i, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + end; + + if not slReadUrgent and (slUrgent <> '') then + begin + r_Draw_FillRect(17, 65, gScreenWidth - 17, motdh - 1, 64, 64, 64, 127); + r_Draw_FillRect(scrx - 256, scry - 60, scrx + 256, scry + 60, 64, 64, 64, 127); + 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_Render_DrawText(_lc[I_NET_SLIST_URGENT], scrx, scry - 58, 255, 255, 255, 255, stdfont, TBasePoint.BP_UP); + msg := Parse2(slUrgent, #10); + for i := 0 to High(msg) do + r_Render_DrawText(msg[i], scrx - 253, scry - 38 + ch * i, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_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 + else if SL = nil then + begin + r_Draw_FillRect(17, 65, gScreenWidth - 17, motdh - 1, 64, 64, 64, 127); + r_Draw_Rect(scrx - 192, scry - 10, scrx + 192, scry + 11, 255, 127, 0, 255); + r_Render_DrawText(slWaitStr, scrx, scry, 255, 255, 255, 255, stdfont, TBasePoint.BP_CENTER); + end + else + begin + y := 90; + if slSelection < Length(ST) then + begin + sy := y + 42 * slSelection - 4; + Srv := GetServerFromTable(slSelection, SL, ST); + ip := _lc[I_NET_ADDRESS] + ' ' + Srv.IP + ':' + IntToStr(Srv.Port); + ip := ip + ' ' + _lc[I_NET_SERVER_PASSWORD] + ' '; + if Srv.Password then ip := ip + _lc[I_MENU_YES] else ip := ip +_lc[I_MENU_NO]; + end; + + mw := gScreenWidth - 188; + mx := 16 + mw; + + r_Draw_FillRect(16 + 1, sy, gScreenWidth - 16 - 1, sy + 40, 64, 64, 64, 255); + r_Draw_FillRect(16 + 1, sy, gScreenWidth - 16 - 1, sy, 205, 205, 205, 255); + r_Draw_FillRect(16 + 1, sy + 41, gScreenWidth - 16 - 1, sy + 41, 255, 255, 255, 255); + + r_Draw_FillRect(16, 85, gScreenWidth - 16, 85, 255, 127, 0, 255); + r_Draw_FillRect(16, motdh - 20, gScreenWidth - 16, motdh - 20, 255, 127, 0, 255); + + r_Draw_FillRect(mx - 70, 64, mx - 70, motdh, 255, 127, 0, 255); + r_Draw_FillRect(mx, 64, mx, motdh - 20, 255, 127, 0, 255); + r_Draw_FillRect(mx + 52, 64, mx + 52, motdh - 20, 255, 127, 0, 255); + r_Draw_FillRect(mx + 104, 64, mx + 104, motdh - 20, 255, 127, 0, 255); + + r_Render_DrawText('NAME/MAP', 18, 68, 255, 127, 0, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText('PING', mx - 68, 68, 255, 127, 0, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText('MODE', mx + 2, 68, 255, 127, 0, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText('PLRS', mx + 54, 68, 255, 127, 0, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText('VER', mx + 106, 68, 255, 127, 0, 255, stdfont, TBasePoint.BP_LEFTUP); + + for i := 0 to High(ST) do + begin + Srv := GetServerFromTable(i, SL, ST); + r_Render_DrawText(Srv.Name, 18, y, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText(Srv.Map, 18, y + 16, 210, 210, 210, 255, stdfont, TBasePoint.BP_LEFTUP); + + if Srv.Ping = 0 then + r_Render_DrawText('<1' + _lc[I_NET_SLIST_PING_MS], mx - 68, y, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP) + else if (Srv.Ping >= 0) and (Srv.Ping <= 999) then + r_Render_DrawText(IntToStr(Srv.Ping) + _lc[I_NET_SLIST_PING_MS], mx - 68, y, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP) + else + r_Render_DrawText(_lc[I_NET_SLIST_NO_ACCESS], mx - 68, y, 255, 0, 0, 255, stdfont, TBasePoint.BP_LEFTUP); + if Length(ST[I].Indices) > 1 then + r_Render_DrawText('<' + IntToStr(Length(ST[I].Indices)) + '>', mx - 68, y + 16, 210, 210, 210, 255, stdfont, TBasePoint.BP_LEFTUP); + + r_Render_DrawText(g_Game_ModeToText(Srv.GameMode), mx + 2, y, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + + r_Render_DrawText(IntToStr(Srv.Players) + '/' + IntToStr(Srv.MaxPlayers), mx + 54, y, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText(IntToStr(Srv.LocalPl) + '+' + IntToStr(Srv.Bots), mx + 54, y + 16, 210, 210, 210, 255, stdfont, TBasePoint.BP_LEFTUP); + + r_Render_DrawText(IntToStr(Srv.Protocol), mx + 106, y, 255, 255, 255, 255, stdfont, TBasePoint.BP_LEFTUP); + + y := y + 42; + end; + + r_Render_DrawText(ip, 20, motdh - 20 + 3, 205, 205, 205, 255, stdfont, TBasePoint.BP_LEFTUP); + r_Render_DrawText(IntToStr(Length(ST)) + _lc[I_NET_SLIST_SERVERS], gScreenWidth - 48, motdh - 20 + 3, 255, 255, 255, 255, stdfont, TBasePoint.BP_RIGHTUP); + end; end; procedure r_Render_Draw; @@ -325,24 +482,31 @@ implementation if gExit = EXIT_QUIT then exit; - SetupMatrix; + r_Draw_Setup(gScreenWidth, gScreenHeight); glClearColor(0.0, 0.0, 0.0, 0.0); glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); glColor4ub(255, 255, 255, 255); + glEnable(GL_SCISSOR_TEST); + r_Draw_SetRect(0, 0, gScreenWidth, gScreenHeight); //e_LogWritefln('r_render_draw: %sx%s', [gScreenWidth, gScreenHeight]); - if gGameOn or (gState = STATE_FOLD) then + if gGameOn or ((gState in [STATE_FOLD]) and (EndingGameCounter < 255)) then begin - // TODO setup player view // TODO setup sectator mode // TODO setup player hear point - // TODO setup player view siz - // TODO draw player view + setup screen coords - r_Render_DrawPlayerView(0, 0, gScreenWidth, gScreenHeight, gPlayer1); + if (gPlayer1 <> nil) and (gPlayer2 <> nil) then + begin + r_Render_DrawPlayerView(0, 0, gScreenWidth, gScreenHeight div 2 - 2, gPlayer1); + r_Render_DrawPlayerView(0, gScreenHeight div 2 + 2, gScreenWidth, gScreenHeight div 2, gPlayer2); + end + else + begin + r_Render_DrawPlayerView(0, 0, gScreenWidth, gScreenHeight, gPlayer1); + end; // TODO draw holmes inspector @@ -359,28 +523,79 @@ implementation if not gGameOn then begin case gState of - STATE_MENU: ; // TODO draw menu bg - STATE_FOLD: ; - STATE_INTERCUSTOM: ; - STATE_INTERSINGLE: ; - STATE_ENDPIC: ; - STATE_SLIST: ; + STATE_NONE: (* do nothing *) ; + STATE_MENU: r_Render_DrawBackground(GameWad + ':TEXTURES/TITLE'); + STATE_FOLD: + begin + if EndingGameCounter > 0 then + r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, MIN(MAX(255 - EndingGameCounter, 0), 255)); + end; + STATE_INTERCUSTOM: + begin + if gLastMap and (gGameSettings.GameMode = GM_COOP) then + if EndPicPath <> '' then + r_Render_DrawBackground(EndPicPath) + else + r_Render_DrawBackground(GameWad + ':TEXTURES/' + _lc[I_TEXTURE_ENDPIC]) + else + r_Render_DrawBackground(GameWad + ':TEXTURES/INTER'); + // TODO draw custom stata + {$IFDEF ENABLE_MENU} + if g_ActiveWindow <> nil then + r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105); + {$ENDIF} + end; + STATE_INTERSINGLE, STATE_INTERTEXT, STATE_INTERPIC: + begin + if EndingGameCounter > 0 then + begin + r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, MIN(MAX(255 - EndingGameCounter, 0), 255)); + end + else + begin + r_Render_DrawBackground(GameWad + ':TEXTURES/INTER'); + // TODO darw single stats + {$IFDEF ENABLE_MENU} + if g_ActiveWindow <> nil then + r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105); + {$ENDIF} + end; + end; + STATE_ENDPIC: + begin + if EndPicPath <> '' then + r_Render_DrawBackground(EndPicPath) + else + r_Render_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); + {$ENDIF} + end; + STATE_SLIST: + begin + r_Render_DrawBackground(GameWad + ':TEXTURES/TITLE'); + r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105); + r_Render_DrawServerList(slCurrent, slTable); + end; end; end; {$IFDEF ENABLE_MENU} if g_ActiveWindow <> nil then begin - // TODO draw menu widgets + if gGameOn then + r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105); + r_GUI_Draw_Window(g_ActiveWindow); end; {$ENDIF} - // TODO draw console + r_Console_Draw(false); // TODO draw holmes interface - glFinish(); glFlush(); + glFinish(); sys_Repaint; end; @@ -434,27 +649,28 @@ implementation {$IFDEF ENABLE_MENU} procedure r_Render_GetControlSize (ctrl: TGUIControl; out w, h: Integer); begin - w := 0; h := 0; + r_GUI_GetSize(ctrl, w, h); end; procedure r_Render_GetLogoSize (out w, h: Integer); begin - w := 0; h := 0; + r_GUI_GetLogoSize(w, h); end; procedure r_Render_GetMaxFontSize (BigFont: Boolean; out w, h: Integer); begin - w := 0; h := 0; + r_GUI_GetMaxFontSize(BigFont, w, h); end; procedure r_Render_GetStringSize (BigFont: Boolean; str: String; out w, h: Integer); begin - w := 0; h := 0; + r_GUI_GetStringSize(BigFont, str, w, h); end; {$ENDIF} procedure r_Render_DrawLoading (force: Boolean); begin + // TODO draw loading screen end; end.