diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 54d3763290be72f4d486f905a6d08265f5f18af1..b84bf3aaca6170f165147659879aa9e2971c8f28 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
uses
e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
- g_phys, wadreader, BinEditor, g_panel, g_grid, md5;
+ g_phys, wadreader, BinEditor, g_panel, g_grid, md5, xprofiler;
type
TMapInfo = record
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
+procedure g_Map_ProfilersBegin ();
+procedure g_Map_ProfilersEnd ();
+
const
RESPAWNPOINT_PLAYER1 = 1;
RESPAWNPOINT_PLAYER2 = 2;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
+ gdbg_map_use_grid_render: Boolean = true;
+ gdbg_map_use_grid_coldet: Boolean = true;
+ profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
+
implementation
uses
gMapGrid: TBodyGrid = nil;
+procedure g_Map_ProfilersBegin ();
+begin
+ if (profMapCollision = nil) then profMapCollision := TProfiler.Create('MAP COLLISION');
+ profMapCollision.mainBegin(g_profile_collision);
+ // create sections
+ if g_profile_collision then
+ begin
+ profMapCollision.sectionBeginAccum('wall coldet');
+ profMapCollision.sectionEnd();
+ profMapCollision.sectionBeginAccum('liquid coldet');
+ profMapCollision.sectionEnd();
+ end;
+end;
+
+procedure g_Map_ProfilersEnd ();
+begin
+ if (profMapCollision <> nil) then profMapCollision.mainEnd();
+end;
+
+
function g_Map_IsSpecialTexture(Texture: String): Boolean;
begin
Result := (Texture = TEXTURE_NAME_WATER) or
if not (drawDoors xor panels[idx].Door) then
begin
pan := panels[idx];
+ {
if (pan.Width < 1) or (pan.Height < 1) then continue;
if (pan.X+pan.Width <= x0) or (pan.Y+pan.Height <= y0) then continue;
if (pan.X >= x0+wdt) or (pan.Y >= y0+hgt) then continue;
- e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
+ }
+ pan.Draw();
+ //e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
end;
end;
end;
//e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
dplClear();
ptag := panelTypeToTag(PanelType);
- gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
-
- // debug
- {
- e_WriteLog(Format('+++QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
- case PanelType of
- PANEL_WALL: DrawPanels(0, gWalls);
- PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True);
- PANEL_BACK: DrawPanels(1, gRenderBackgrounds);
- PANEL_FORE: DrawPanels(2, gRenderForegrounds);
- PANEL_WATER: DrawPanels(3, gWater);
- PANEL_ACID1: DrawPanels(4, gAcid1);
- PANEL_ACID2: DrawPanels(5, gAcid2);
- PANEL_STEP: DrawPanels(6, gSteps);
- end;
- e_WriteLog('==================', MSG_NOTIFY);
- }
- // sort and draw the list (we need to sort it, or rendering is fucked)
- while gDrawPanelList.count > 0 do
+ if gdbg_map_use_grid_render then
+ begin
+ gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
+ // sort and draw the list (we need to sort it, or rendering is fucked)
+ while gDrawPanelList.count > 0 do
+ begin
+ (gDrawPanelList.front() as TPanel).Draw();
+ gDrawPanelList.popFront();
+ end;
+ end
+ else
begin
- (gDrawPanelList.front() as TPanel).Draw();
- gDrawPanelList.popFront();
+ //e_WriteLog(Format('+++QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
+ case PanelType of
+ PANEL_WALL: DrawPanels(0, gWalls);
+ PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True);
+ PANEL_BACK: DrawPanels(1, gRenderBackgrounds);
+ PANEL_FORE: DrawPanels(2, gRenderForegrounds);
+ PANEL_WATER: DrawPanels(3, gWater);
+ PANEL_ACID1: DrawPanels(4, gAcid1);
+ PANEL_ACID2: DrawPanels(5, gAcid2);
+ PANEL_STEP: DrawPanels(6, gSteps);
+ end;
end;
+
+ //e_WriteLog('==================', MSG_NOTIFY);
end;
e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
end;
-(*
function g_Map_CollidePanelOld(X, Y: Integer; Width, Height: Word;
PanelType: Word; b1x3: Boolean): Boolean;
var
end;
end;
end;
-*)
+
+function g_Map_CollideLiquid_TextureOld(X, Y: Integer; Width, Height: Word): DWORD;
+var
+ texid: DWORD;
+
+ function checkPanels (var panels: TPanelArray): Boolean;
+ var
+ a: Integer;
+ begin
+ result := false;
+ if panels = nil then exit;
+ for a := 0 to High(panels) do
+ begin
+ if g_Collide(X, Y, Width, Height, panels[a].X, panels[a].Y, panels[a].Width, panels[a].Height) then
+ begin
+ result := true;
+ texid := panels[a].GetTextureID();
+ exit;
+ end;
+ end;
+ end;
+
+begin
+ texid := TEXTURE_NONE;
+ result := texid;
+ if not checkPanels(gWater) then
+ if not checkPanels(gAcid1) then
+ if not checkPanels(gAcid2) then exit;
+ result := texid;
+end;
+
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
@@ -2139,7 +2201,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
- if WordBool(PanelType and PANEL_BLOCKMON)and (tag = GridTagBlockMon) then
+ if WordBool(PanelType and PANEL_BLOCKMON) and (tag = GridTagBlockMon) then
begin
if ((not b1x3) or ((gBlockMon[a].Width + gBlockMon[a].Height) >= 64)) and
g_Collide(X, Y, Width, Height, gBlockMon[a].X, gBlockMon[a].Y, gBlockMon[a].Width, gBlockMon[a].Height) then
@@ -2151,7 +2213,20 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
begin
- result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+ //TODO: detailed profile
+ if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('wall coldet');
+ try
+ if gdbg_map_use_grid_coldet then
+ begin
+ result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+ end
+ else
+ begin
+ result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3);
+ end;
+ finally
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
+ end;
end;
end;
begin
- texid := TEXTURE_NONE;
- gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
- result := texid;
+ //TODO: detailed profile?
+ if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
+ try
+ if not gdbg_map_use_grid_coldet then
+ begin
+ result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
+ end
+ else
+ begin
+ texid := TEXTURE_NONE;
+ gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+ result := texid;
+ end;
+ finally
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
+ end;
end;
procedure g_Map_EnableWall(ID: DWORD);