X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Frenders%2Fopengl%2Fr_render.pas;h=135141e69ca752e333f82730d8b9a251877df077;hb=b36923c380a9760c74967bc8c850517c386747db;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..135141e 100644 --- a/src/game/renders/opengl/r_render.pas +++ b/src/game/renders/opengl/r_render.pas @@ -74,6 +74,9 @@ implementation {$ELSE} GL, GLEXT, {$ENDIF} + {$IFDEF ENABLE_MENU} + r_gui, + {$ENDIF} {$IFDEF ENABLE_SYSTEM} g_system, {$ENDIF} @@ -81,16 +84,19 @@ implementation e_log, utils, g_game, g_options, g_console, g_player, g_weapons, g_language, g_net, - r_draw, r_textures, r_fonts, r_map + r_draw, r_textures, r_fonts, r_common, r_console, r_map ; + type + TBasePoint = ( + BP_LEFTUP, BP_UP, BP_RIGHTUP, + BP_LEFT, BP_CENTER, BP_RIGHT, + BP_LEFTDOWN, BP_DOWN, BP_RIGHTDOWN + ); + var menuBG: TGLTexture; - stdfont: TGLFont; - smallfont: TGLFont; - menufont: TGLFont; - hud, hudbg: TGLTexture; hudhp: array [Boolean] of TGLTexture; hudap: TGLTexture; @@ -109,27 +115,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 + r_Common_Load; menuBG := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/TITLE'); - stdfont := r_Render_LoadFont('STD'); - smallfont := r_Render_LoadFont('SMALL'); - menufont := r_Render_LoadFont('MENU'); hud := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUD'); hudbg := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/HUDBG'); hudhp[false] := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/MED2'); @@ -142,13 +135,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 +166,8 @@ implementation hudhp[false].Free; hudbg.Free; hud.Free; - menufont.Free; - smallfont.Free; - stdfont.Free; menuBG.Free; + r_Common_Free; end; {$IFDEF ENABLE_SYSTEM} @@ -196,17 +195,20 @@ 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; @@ -221,51 +223,83 @@ implementation glLoadIdentity; end; + 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 + 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); var t: TGLTexture; s: AnsiString; 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 +308,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,16 +316,16 @@ 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; @@ -307,10 +341,7 @@ 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; end; @@ -371,11 +402,13 @@ implementation {$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 @@ -434,27 +467,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.