diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index eabf89645796ad273a1a78531c031497a40b3772..e439d17db2b9643ea8451966dc98354690f15be7 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
- gdbg_map_use_grid_render: Boolean = true;
- gdbg_map_use_grid_coldet: Boolean = true;
- gdbg_map_use_tree_draw: Boolean = true;
+ gdbg_map_use_accel_render: Boolean = true;
+ gdbg_map_use_accel_coldet: Boolean = true;
+ gdbg_map_use_tree_draw: Boolean = false;
gdbg_map_use_tree_coldet: Boolean = false;
+ gdbg_map_dump_coldet_tree_queries: Boolean = false;
profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
implementation
MUSIC_SIGNATURE = $4953554D; // 'MUSI'
FLAG_SIGNATURE = $47414C46; // 'FLAG'
- GridTagInvalid = -1;
- GridTagWallDoor = 0;
- GridTagBack = 1;
- GridTagFore = 2;
- GridTagWater = 3;
- GridTagAcid1 = 4;
- GridTagAcid2 = 5;
- GridTagStep = 6;
- GridTagLift = 7;
- GridTagBlockMon = 8;
+ GridTagInvalid = 0;
+ GridTagWallDoor = $0001;
+ GridTagBack = $0002;
+ GridTagFore = $0004;
+ GridTagWater = $0008;
+ GridTagAcid1 = $0010;
+ GridTagAcid2 = $0020;
+ GridTagStep = $0040;
+ GridTagLift = $0080;
+ GridTagBlockMon = $0100;
function panelTypeToTag (panelType: Word): Integer;
@@ -200,10 +201,14 @@ function TDynAABBTreeMap.getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh): Boo
var
pan: TPanel;
begin
- if (flesh = nil) then begin result := false; exit; end;
+ result := false;
+ if (flesh = nil) then begin aabb := AABB2D.Create(0, 0, 0, 0); exit; end;
pan := (flesh as TPanel);
aabb := AABB2D.Create(pan.X, pan.Y, pan.X+pan.Width, pan.Y+pan.Height);
- //e_WriteLog(Format('getFleshAABB(%d;%d) AABB:(%f,%f)-(%f,%f); valid=%d; volume=%f; x=%d; y=%d; w=%d; h=%d', [pan.tag, pan.ArrIdx, aabb.minX, aabb.minY, aabb.maxX, aabb.maxY, Integer(aabb.valid), aabb.volume, pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
+ if (pan.Width < 1) or (pan.Height < 1) then exit;
+ //if (pan.Width = 1) then aabb.maxX += 1;
+ //if (pan.Height = 1) then aabb.maxY += 1;
+ if not aabb.valid then raise Exception.Create('wutafuuuuuuu?!');
result := aabb.valid;
end;
begin
panels[idx].tag := tag;
gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
- mapTree.insertObject(panels[idx], true); // as static object
+ mapTree.insertObject(panels[idx], tag, true); // as static object
end;
end;
pan: TPanel;
begin
result := false; // don't stop, ever
+ //e_WriteLog(Format(' *body: tag:%d; ptag:%d; pantype=%d', [tag, ptag, PanelType]), MSG_NOTIFY);
if (tag <> ptag) then exit;
- //e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
if obj = nil then begin e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end;
if not (obj is TPanel) then begin e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end;
dplAddPanel(pan);
end;
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
- begin
- result := false; // don't stop, ever
- pan := (obj as TPanel);
- if (pan.tag <> ptag) then exit;
- if (PanelType = PANEL_CLOSEDOOR) then begin if not pan.Door then exit; end else begin if pan.Door then exit; end;
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
- dplAddPanel(pan);
- end;
-
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
var
idx: Integer;
dplClear();
ptag := panelTypeToTag(PanelType);
- if gdbg_map_use_grid_render then
+ if gdbg_map_use_accel_render then
begin
if gdbg_map_use_tree_draw then
begin
- mapTree.aabbQuery(x0, y0, wdt, hgt, checkerTree);
+ mapTree.aabbQuery(x0, y0, wdt, hgt, checker, ptag);
end
else
begin
- gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
+ gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, ptag);
end;
// sort and draw the list (we need to sort it, or rendering is fucked)
while gDrawPanelList.count > 0 do
@@ -2003,24 +1996,14 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
pan.DrawShadowVolume(lightX, lightY, radius);
end;
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
- begin
- result := false; // don't stop, ever
- pan := (obj as TPanel);
- if (pan.tag <> GridTagWallDoor) then exit; // only walls
- pan.DrawShadowVolume(lightX, lightY, radius);
- end;
-
begin
if gdbg_map_use_tree_draw then
begin
- mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checkerTree);
+ mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checker, GridTagWallDoor);
end
else
begin
- gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker);
+ gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, GridTagWallDoor);
end;
end;
@@ -2277,36 +2260,30 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
- begin
- pan := (obj as TPanel);
- result := checker(obj, pan.tag);
- end;
-
begin
//TODO: detailed profile
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('wall coldet');
- try
- if gdbg_map_use_grid_coldet then
+ if gdbg_map_use_accel_coldet then
+ begin
+ if gdbg_map_use_tree_coldet then
begin
- if gdbg_map_use_tree_coldet then
+ result := (mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWallDoor or GridTagWater or GridTagAcid1 or GridTagAcid2 or GridTagStep or GridTagLift or GridTagBlockMon)) <> nil);
+ if (gdbg_map_dump_coldet_tree_queries) and (mapTree.nodesVisited <> 0) then
begin
- result := mapTree.aabbQuery(X, Y, Width, Height, checkerTree);
- end
- else
- begin
- result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+ //e_WriteLog(Format('map collision: %d nodes visited (%d deep)', [mapTree.nodesVisited, mapTree.nodesDeepVisited]), MSG_NOTIFY);
+ g_Console_Add(Format('map collision: %d nodes visited (%d deep)', [mapTree.nodesVisited, mapTree.nodesDeepVisited]));
end;
end
else
begin
- result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3);
+ result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWallDoor or GridTagWater or GridTagAcid1 or GridTagAcid2 or GridTagStep or GridTagLift or GridTagBlockMon));
end;
- finally
- if (profMapCollision <> nil) then profMapCollision.sectionEnd();
+ end
+ else
+ begin
+ result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3);
end;
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
end;
a: Integer;
begin
result := false; // don't stop, ever
+ if (tag <> GridTagWater) and (tag <> GridTagAcid1) and (tag <> GridTagAcid2) then exit;
pan := (obj as TPanel);
a := pan.ArrIdx;
// water
end;
end;
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
- begin
- result := false;
- pan := (obj as TPanel);
- if (pan.tag = GridTagWater) or (pan.tag = GridTagAcid1) or (pan.tag = GridTagAcid2) then result := checker(obj, pan.tag);
- end;
-
-{var
- cctype1: Integer = 3; // priority: 0: water, 1: acid1, 2: acid2; 3: others (nothing)
- texid1: DWORD;}
begin
//TODO: detailed profile?
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
- try
- if gdbg_map_use_grid_coldet then
+ if gdbg_map_use_accel_coldet then
+ begin
+ texid := TEXTURE_NONE;
+ if gdbg_map_use_tree_coldet then
begin
- texid := TEXTURE_NONE;
- if gdbg_map_use_tree_coldet then
- begin
- mapTree.aabbQuery(X, Y, Width, Height, checkerTree);
- {
- cctype1 := cctype;
- texid1 := texid;
- cctype := 3;
- texid := TEXTURE_NONE;
- gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
- if (cctype1 <> cctype) or (texid1 <> texid) then
- begin
- e_WriteLog(Format('g_Map_CollideLiquid_Texture(%d, %d, %u, %u): tree(cctype:%d;texid:%u); grid(cctype:%d;texid:%u)', [X, Y, Width, Height, cctype1, texid1, cctype, texid]), MSG_WARNING);
- end;}
- end
- else
- begin
- gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
- end;
- result := texid;
+ mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end
else
begin
- result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
+ gMapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end;
- finally
- if (profMapCollision <> nil) then profMapCollision.sectionEnd();
+ result := texid;
+ end
+ else
+ begin
+ result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
end;
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
end;
procedure g_Map_EnableWall(ID: DWORD);