index 8015bb4ca6740a2fb1704722aa461d19e7f53b0d..8acd51b104fcd4cc973f9d1b79f23ae7fd4996f6 100644 (file)
uses
{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+ g_holmes,
+{$ENDIF}
SysUtils, Classes, Math,
- e_graphics,
+ g_base, r_graphics,
g_system, g_touch,
MAPDEF, xprofiler, utils, wadreader,
g_textures, e_input, e_sound,
g_language, g_console, g_menu, g_triggers, g_player, g_options, g_monsters, g_map, g_panel, g_window,
g_items, g_weapons, g_gfx, g_phys, g_net, g_gui, g_netmaster,
- g_game, r_console, r_gfx, r_items, r_map, r_panel
+ g_game, r_console, r_gfx, r_items, r_map, r_panel, r_monsters, r_weapons, r_netmaster, r_player
;
var
else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
end;
-procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
+procedure DrawMinimap(p: TPlayer; RenderRect: TRect);
var
a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;
e_AmbientQuad(sX, sY, sWidth, sHeight, ambColor.r, ambColor.g, ambColor.b, ambColor.a);
end;
+// ////////////////////////////////////////////////////////////////////////// //
+var
+ ltexid: GLuint = 0;
+
+function g_Texture_Light (): Integer;
+const
+ Radius: Integer = 128;
+var
+ tex, tpp: PByte;
+ x, y, a: Integer;
+ dist: Double;
+begin
+ if ltexid = 0 then
+ begin
+ GetMem(tex, (Radius*2)*(Radius*2)*4);
+ tpp := tex;
+ for y := 0 to Radius*2-1 do
+ begin
+ for x := 0 to Radius*2-1 do
+ begin
+ dist := 1.0-sqrt((x-Radius)*(x-Radius)+(y-Radius)*(y-Radius))/Radius;
+ if (dist < 0) then
+ begin
+ tpp^ := 0; Inc(tpp);
+ tpp^ := 0; Inc(tpp);
+ tpp^ := 0; Inc(tpp);
+ tpp^ := 0; Inc(tpp);
+ end
+ else
+ begin
+ //tc.setPixel(x, y, Color(cast(int)(dist*255), cast(int)(dist*255), cast(int)(dist*255)));
+ if (dist > 0.5) then dist := 0.5;
+ a := round(dist*255);
+ if (a < 0) then a := 0 else if (a > 255) then a := 255;
+ tpp^ := 255; Inc(tpp);
+ tpp^ := 255; Inc(tpp);
+ tpp^ := 255; Inc(tpp);
+ tpp^ := Byte(a); Inc(tpp);
+ end;
+ end;
+ end;
+
+ glGenTextures(1, @ltexid);
+ //if (tid == 0) assert(0, "VGL: can't create screen texture");
+
+ glBindTexture(GL_TEXTURE_2D, ltexid);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ //GLfloat[4] bclr = 0.0;
+ //glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, bclr.ptr);
+
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Radius*2, Radius*2, 0, GL_RGBA{gltt}, GL_UNSIGNED_BYTE, tex);
+ end;
+
+ result := ltexid;
+end;
// setup sX, sY, sWidth, sHeight, and transformation matrix before calling this!
//FIXME: broken for splitscreen mode
drawPanelType('*back', PANEL_BACK, g_rlayer_back);
drawPanelType('*step', PANEL_STEP, g_rlayer_step);
drawOther('items', @r_Items_Draw);
- drawOther('weapons', @g_Weapon_Draw);
- drawOther('shells', @g_Player_DrawShells);
- drawOther('drawall', @g_Player_DrawAll);
- drawOther('corpses', @g_Player_DrawCorpses);
+ drawOther('weapons', @r_Weapon_Draw);
+ drawOther('shells', @r_Player_DrawShells);
+ drawOther('drawall', @r_Player_DrawAll);
+ drawOther('corpses', @r_Player_DrawCorpses);
drawPanelType('*wall', PANEL_WALL, g_rlayer_wall);
- drawOther('monsters', @g_Monsters_Draw);
+ drawOther('monsters', @r_Monsters_Draw);
drawOther('itemdrop', @r_Items_DrawDrop);
drawPanelType('*door', PANEL_CLOSEDOOR, g_rlayer_door);
drawOther('gfx', @r_GFX_Draw);
if g_debug_HealthBar then
begin
- g_Monsters_DrawHealth();
- g_Player_DrawHealth();
+ r_Monsters_DrawHealth();
+ r_Player_DrawHealth();
end;
if (profileFrameDraw <> nil) then profileFrameDraw.mainEnd(); // map rendering
if (gGameSettings.GameMode <> GM_SINGLE) and (gPlayerIndicator > 0) then
case gPlayerIndicator of
1:
- p.DrawIndicator(_RGB(255, 255, 255));
+ r_Player_DrawIndicator(p, _RGB(255, 255, 255));
2:
for i := 0 to High(gPlayers) do
if gPlayers[i] <> nil then
- if gPlayers[i] = p then p.DrawIndicator(_RGB(255, 255, 255))
+ if gPlayers[i] = p then
+ r_Player_DrawIndicator(p, _RGB(255, 255, 255))
else if (gPlayers[i].Team = p.Team) and (gPlayers[i].Team <> TEAM_NONE) then
if gPlayerIndicatorStyle = 1 then
- gPlayers[i].DrawIndicator(_RGB(192, 192, 192))
- else gPlayers[i].DrawIndicator(gPlayers[i].GetColor);
+ r_Player_DrawIndicator(gPlayers[i], _RGB(192, 192, 192))
+ else
+ r_Player_DrawIndicator(gPlayers[i], gPlayers[i].GetColor);
end;
{
glPopMatrix();
- p.DrawPain();
- p.DrawPickup();
- p.DrawRulez();
+ r_Player_DrawPain(p);
+ r_Player_DrawPickup(p);
+ r_Player_DrawRulez(p);
if gShowMap then DrawMinimap(p, _TRect(0, 0, 128, 128));
if g_Debug_Player then
- g_Player_DrawDebug(p);
- p.DrawGUI();
+ r_Player_DrawDebug(p);
+ r_Player_DrawGUI(p);
end;
procedure drawProfilers ();
// end;
r_Game_DrawMenuBackground('MENU_BACKGROUND');
e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
- g_Serverlist_Draw(slCurrent, slTable);
+ r_Serverlist_Draw(slCurrent, slTable);
end;
end;