diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 91102f1d03044e07dbe904f98e978f590ca621a4..cd2aff9951cc4908138407a965ef2acb17d5b77d 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
-{$MODE DELPHI}
-{$modeswitch nestedprocvars}
+{$INCLUDE ../shared/a_modes.inc}
unit g_map;
interface
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, z_aabbtree, md5, binheap, xprofiler;
type
TMapInfo = record
procedure g_Map_Free();
procedure g_Map_Update();
-procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
+procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated
+procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
procedure g_Map_DrawBack(dx, dy: Integer);
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
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;
SKY_STRETCH: Single = 1.5;
+const
+ GridTagInvalid = 0;
+
+ (* draw order:
+ PANEL_BACK
+ PANEL_STEP
+ PANEL_WALL
+ PANEL_CLOSEDOOR
+ PANEL_ACID1
+ PANEL_ACID2
+ PANEL_WATER
+ PANEL_FORE
+ *)
+ // sorted by draw priority
+ GridTagBack = 1 shl 0;
+ GridTagStep = 1 shl 1;
+ GridTagWall = 1 shl 2;
+ GridTagDoor = 1 shl 3;
+ GridTagAcid1 = 1 shl 4;
+ GridTagAcid2 = 1 shl 5;
+ GridTagWater = 1 shl 6;
+ GridTagFore = 1 shl 7;
+ // the following are invisible
+ GridTagLift = 1 shl 8;
+ GridTagBlockMon = 1 shl 9;
+
+
var
gWalls: TPanelArray;
gRenderBackgrounds: TPanelArray;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
+ 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!
+ gDrawPanelList: TBinaryHeapObj = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()`
+
+function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX
+
implementation
uses
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;
-
function panelTypeToTag (panelType: Word): Integer;
begin
case panelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagWallDoor; // gWalls
+ PANEL_WALL: result := GridTagWall; // gWalls
+ PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagDoor; // gWalls
PANEL_BACK: result := GridTagBack; // gRenderBackgrounds
PANEL_FORE: result := GridTagFore; // gRenderForegrounds
PANEL_WATER: result := GridTagWater; // gWater
end;
+function dplLess (a, b: TObject): Boolean;
+var
+ pa, pb: TPanel;
+begin
+ //result := ((a as TPanel).ArrIdx < (b as TPanel).ArrIdx);
+ pa := TPanel(a);
+ pb := TPanel(b);
+ if (pa.tag < pb.tag) then begin result := true; exit; end;
+ if (pa.tag > pb.tag) then begin result := false; exit; end;
+ result := (pa.ArrIdx < pb.ArrIdx);
+end;
+
+procedure dplClear ();
+begin
+ if (gDrawPanelList = nil) then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear();
+end;
+
+
type
TPanelID = record
PWhere: ^TPanelArray;
PArrID: Integer;
end;
+type
+ TDynAABBTreeMap = class(TDynAABBTree)
+ function getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh; tag: Integer): Boolean; override;
+ end;
+
+function TDynAABBTreeMap.getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh; tag: Integer): Boolean;
+var
+ pan: TPanel;
+begin
+ result := false;
+ if (flesh = nil) then begin aabb := AABB2D.Create(0, 0, 0, 0); exit; end;
+ //pan := (flesh as TPanel);
+ pan := TPanel(flesh);
+ aabb := AABB2D.Create(pan.X, pan.Y, pan.X+pan.Width, pan.Y+pan.Height);
+ 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 (pan.Width < 3) or (pan.Height < 3) then exit;
+ //aabb := AABB2D.Create(pan.X, pan.Y, pan.X+pan.Width-2, pan.Y+pan.Height-2);
+ if not aabb.valid then raise Exception.Create('wutafuuuuuuu?!');
+ result := aabb.valid;
+end;
+
var
PanelById: array of TPanelID;
Textures: TLevelTextureArray;
FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
gMapGrid: TBodyGrid = nil;
+ mapTree: TDynAABBTree = nil;
+
+
+procedure g_Map_ProfilersBegin ();
+begin
+ if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size);
+ profMapCollision.mainBegin(g_profile_collision);
+ // create sections
+ if g_profile_collision then
+ begin
+ profMapCollision.sectionBegin('*solids');
+ profMapCollision.sectionEnd();
+ profMapCollision.sectionBegin('liquids');
+ profMapCollision.sectionEnd();
+ end;
+end;
+
+procedure g_Map_ProfilersEnd ();
+begin
+ if (profMapCollision <> nil) then profMapCollision.mainEnd();
+end;
function g_Map_IsSpecialTexture(Texture: String): Boolean;
panels^[len] := TPanel.Create(PanelRec, AddTextures, CurTex, Textures);
panels^[len].ArrIdx := len;
+ panels^[len].tag := panelTypeToTag(PanelRec.PanelType);
if sav then
panels^[len].SaveIt := True;
mapX1: Integer = -$3fffffff;
mapY1: Integer = -$3fffffff;
- procedure fixMinMax (var panels: TPanelArray);
+ procedure calcBoundingBox (var panels: TPanelArray);
var
idx: Integer;
+ pan: TPanel;
begin
for idx := 0 to High(panels) do
begin
- if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
- if mapX0 > panels[idx].X then mapX0 := panels[idx].X;
- if mapY0 > panels[idx].Y then mapY0 := panels[idx].Y;
- if mapX1 < panels[idx].X+panels[idx].Width-1 then mapX1 := panels[idx].X+panels[idx].Width-1;
- if mapY1 < panels[idx].Y+panels[idx].Height-1 then mapY1 := panels[idx].Y+panels[idx].Height-1;
+ pan := panels[idx];
+ if not pan.visvalid then continue;
+ if (pan.Width < 1) or (pan.Height < 1) then continue;
+ if (mapX0 > pan.x0) then mapX0 := pan.x0;
+ if (mapY0 > pan.y0) then mapY0 := pan.y0;
+ if (mapX1 < pan.x1) then mapX1 := pan.x1;
+ if (mapY1 < pan.y1) then mapY1 := pan.y1;
end;
end;
procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer);
var
idx: Integer;
+ pan: TPanel;
begin
tag := panelTypeToTag(tag);
for idx := High(panels) downto 0 do
begin
- gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
+ pan := panels[idx];
+ pan.tag := tag;
+ if not pan.visvalid then continue;
+ gMapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, tag);
+ mapTree.insertObject(pan, tag, true); // as static object
end;
end;
begin
gMapGrid.Free();
gMapGrid := nil;
+ mapTree.Free();
+ mapTree := nil;
- fixMinMax(gWalls);
- fixMinMax(gRenderBackgrounds);
- fixMinMax(gRenderForegrounds);
- fixMinMax(gWater);
- fixMinMax(gAcid1);
- fixMinMax(gAcid2);
- fixMinMax(gSteps);
- fixMinMax(gLifts);
- fixMinMax(gBlockMon);
-
- if (mapX0 < 0) or (mapY0 < 0) then
- begin
- e_WriteLog(Format('funny map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING);
- //raise Exception.Create('we are fucked');
- end;
+ calcBoundingBox(gWalls);
+ calcBoundingBox(gRenderBackgrounds);
+ calcBoundingBox(gRenderForegrounds);
+ calcBoundingBox(gWater);
+ calcBoundingBox(gAcid1);
+ calcBoundingBox(gAcid2);
+ calcBoundingBox(gSteps);
+ calcBoundingBox(gLifts);
+ calcBoundingBox(gBlockMon);
+
+ e_WriteLog(Format('map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING);
gMapGrid := TBodyGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1);
+ mapTree := TDynAABBTreeMap.Create();
- addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR
+ addPanelsToGrid(gWalls, PANEL_WALL);
+ addPanelsToGrid(gWalls, PANEL_CLOSEDOOR);
+ addPanelsToGrid(gWalls, PANEL_OPENDOOR);
addPanelsToGrid(gRenderBackgrounds, PANEL_BACK);
addPanelsToGrid(gRenderForegrounds, PANEL_FORE);
addPanelsToGrid(gWater, PANEL_WATER);
addPanelsToGrid(gBlockMon, PANEL_BLOCKMON);
gMapGrid.dumpStats();
+ e_WriteLog(Format('tree depth: %d; %d nodes used, %d nodes allocated', [mapTree.computeTreeHeight, mapTree.nodeCount, mapTree.nodeAlloced]), MSG_NOTIFY);
+ mapTree.forEachLeaf(nil);
end;
function g_Map_Load(Res: String): Boolean;
begin
gMapGrid.Free();
gMapGrid := nil;
+ mapTree.Free();
+ mapTree := nil;
Result := False;
gMapInfo.Map := Res;
end;
-procedure g_Map_DrawPanelsOld(PanelType: Word);
+// old algo
+procedure g_Map_DrawPanels (PanelType: Word);
- procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
+ procedure DrawPanels (var panels: TPanelArray; drawDoors: Boolean=False);
var
idx: Integer;
begin
- if (panels <> nil) and (stp >= 0) and (stp <= 6) then
+ if (panels <> nil) then
begin
// alas, no visible set
for idx := 0 to High(panels) do
begin
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);
+ PANEL_WALL: DrawPanels(gWalls);
+ PANEL_CLOSEDOOR: DrawPanels(gWalls, True);
+ PANEL_BACK: DrawPanels(gRenderBackgrounds);
+ PANEL_FORE: DrawPanels(gRenderForegrounds);
+ PANEL_WATER: DrawPanels(gWater);
+ PANEL_ACID1: DrawPanels(gAcid1);
+ PANEL_ACID2: DrawPanels(gAcid2);
+ PANEL_STEP: DrawPanels(gSteps);
end;
end;
-var
- gDrawPanelList: TBinaryHeapObj = nil;
-
-function dplLess (a, b: TObject): Boolean;
-begin
- result := ((a as TPanel).ArrIdx < (b as TPanel).ArrIdx);
-end;
-
-procedure dplClear ();
-begin
- if gDrawPanelList = nil then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear();
-end;
-
-procedure dplAddPanel (pan: TPanel);
-begin
- if pan = nil then exit;
- gDrawPanelList.insert(pan);
-end;
-
-
-procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
-var
- ptag: Integer;
-
+// new algo
+procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
function checker (obj: TObject; tag: Integer): Boolean;
var
pan: TPanel;
begin
result := false; // don't stop, ever
- 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;
//pan := (obj as TPanel);
- //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
-
- pan := (obj as TPanel);
- 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;
- pan: TPanel;
- begin
- if (panels <> nil) and (stp >= 0) and (stp <= 6) then
- begin
- // alas, no visible set
- for idx := 0 to High(panels) do
- begin
- 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);
- end;
- end;
- end;
+ pan := TPanel(obj);
+ //if (PanelType = PANEL_CLOSEDOOR) then begin if not pan.Door then exit; end else begin if pan.Door then exit; end;
+ if ((tag and GridTagDoor) <> 0) <> pan.Door then exit;
+ //dplAddPanel(pan);
+ gDrawPanelList.insert(pan);
end;
begin
- //g_Map_DrawPanelsOld(PanelType); exit;
- //e_WriteLog('==================', MSG_NOTIFY);
- //e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
dplClear();
- ptag := panelTypeToTag(PanelType);
- gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
+ //tagmask := panelTypeToTag(PanelType);
- // 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);
+ if gdbg_map_use_tree_draw then
+ begin
+ mapTree.aabbQuery(x0, y0, wdt, hgt, checker, (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore));
+ end
+ else
+ begin
+ gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore));
end;
- e_WriteLog('==================', MSG_NOTIFY);
- }
-
- // sort and draw the list (we need to sort it, or rendering is fucked)
- while gDrawPanelList.count > 0 do
+ // list will be rendered in `g_game.DrawPlayer()`
+ (*
+ while (gDrawPanelList.count > 0) do
begin
- (gDrawPanelList.front() as TPanel).Draw();
+ //(gDrawPanelList.front() as TPanel).Draw();
+ TPanel(gDrawPanelList.front()).Draw();
gDrawPanelList.popFront();
end;
+ *)
end;
@@ -1918,13 +1966,21 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
pan: TPanel;
begin
result := false; // don't stop, ever
- if (tag <> GridTagWallDoor) then exit; // only walls
- pan := (obj as TPanel);
+ //if (tag <> GridTagWall) and (tag <> GridTagDoor) then exit; // only walls
+ //pan := (obj as TPanel);
+ pan := TPanel(obj);
pan.DrawShadowVolume(lightX, lightY, radius);
end;
begin
- gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker);
+ if gdbg_map_use_tree_draw then
+ begin
+ mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
+ end
+ else
+ begin
+ gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
+ end;
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_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
+function g_Map_CollideLiquid_TextureOld(X, Y: Integer; Width, Height: Word): DWORD;
+var
+ texid: DWORD;
- function checker (obj: TObject; tag: Integer): Boolean;
+ function checkPanels (var panels: TPanelArray): Boolean;
var
- pan: TPanel;
a: Integer;
begin
- result := false; // don't stop, ever
-
- //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);
- end;
- if not (obj is TPanel) then
- begin
- e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- exit;
- end;
-
- pan := (obj as TPanel);
- a := pan.ArrIdx;
-
- if WordBool(PanelType and PANEL_WALL) and (tag = GridTagWallDoor) then
+ result := false;
+ if panels = nil then exit;
+ for a := 0 to High(panels) do
begin
- if gWalls[a].Enabled and g_Collide(X, Y, Width, Height, gWalls[a].X, gWalls[a].Y, gWalls[a].Width, gWalls[a].Height) then
+ 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;
- if WordBool(PanelType and PANEL_WATER) and (tag = GridTagWater) then
- begin
- if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then
- begin
- result := True;
- exit;
- 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;
- if WordBool(PanelType and PANEL_ACID1) and (tag = GridTagAcid1) then
- begin
- if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then
- begin
- result := True;
- exit;
- end;
- end;
- if WordBool(PanelType and PANEL_ACID2) and (tag = GridTagAcid2) then
+function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
+ function checker (obj: TObject; tag: Integer): Boolean;
+ var
+ pan: TPanel;
+ begin
+ result := false; // don't stop, ever
+ pan := TPanel(obj);
+
+ if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
begin
- if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then
- begin
- result := True;
- exit;
- end;
+ if not pan.Enabled then exit;
end;
- if WordBool(PanelType and PANEL_STEP) and (tag = GridTagStep) then
+ if ((tag and GridTagLift) <> 0) then
begin
- if g_Collide(X, Y, Width, Height, gSteps[a].X, gSteps[a].Y, gSteps[a].Width, gSteps[a].Height) then
- begin
- result := True;
- exit;
- end;
+ result :=
+ ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or
+ (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or
+ (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or
+ (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))) and
+ g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height);
+ exit;
end;
- if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (tag = GridTagLift) then
+ if ((tag and GridTagBlockMon) <> 0) then
begin
- if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or
- (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or
- (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or
- (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and
- g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then
- begin
- result := true;
- exit;
- end;
+ result := ((not b1x3) or (pan.Width+pan.Height >= 64)) and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height);
+ exit;
end;
- if WordBool(PanelType and PANEL_BLOCKMON)and (tag = GridTagBlockMon) then
+ // other shit
+ result := g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height);
+ end;
+
+var
+ tagmask: Integer = 0;
+begin
+ if WordBool(PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR)) then tagmask := tagmask or (GridTagWall or GridTagDoor);
+ if WordBool(PanelType and PANEL_WATER) then tagmask := tagmask or GridTagWater;
+ if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1;
+ if WordBool(PanelType and PANEL_ACID2) then tagmask := tagmask or GridTagAcid2;
+ if WordBool(PanelType and PANEL_STEP) then tagmask := tagmask or GridTagStep;
+ if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift;
+ if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon;
+
+ if (tagmask = 0) then begin result := false; exit; end; // just in case
+
+ if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids');
+ if gdbg_map_use_accel_coldet then
+ begin
+ if gdbg_map_use_tree_coldet 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
+ //e_WriteLog(Format('coldet query: x=%d; y=%d; w=%d; h=%d', [X, Y, Width, Height]), MSG_NOTIFY);
+ result := (mapTree.aabbQuery(X, Y, Width, Height, checker, tagmask) <> nil);
+ if (gdbg_map_dump_coldet_tree_queries) and (mapTree.nodesVisited <> 0) then
begin
- result := True;
- exit;
+ //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 := gMapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask);
end;
+ end
+ else
+ begin
+ result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3);
end;
-
-begin
- result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
end;
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
var
- cctype: Integer = 3; // priority: 0: water, 1: acid1, 2: acid2; 3: others (nothing)
+ cctype: Integer = 3; // priority: 0: water was hit, 1: acid1 was hit, 2: acid2 was hit; 3: nothing was hit
texid: DWORD;
// slightly different from the old code, but meh...
function checker (obj: TObject; tag: Integer): Boolean;
var
pan: TPanel;
- a: Integer;
begin
result := false; // don't stop, ever
- pan := (obj as TPanel);
- a := pan.ArrIdx;
- // water
- if (tag = GridTagWater) then
- begin
- if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then
- begin
- result := true; // water has highest priority, so stop right here
- texid := gWater[a].GetTextureID();
- exit;
- end;
+ //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit;
+ // check priorities
+ case cctype of
+ 0: if ((tag and GridTagWater) = 0) then exit; // allowed: water
+ 1: if ((tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1
+ //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2
end;
- // acid1
- if (cctype > 1) and (tag = GridTagAcid1) then
+ // collision?
+ pan := (obj as TPanel);
+ if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit;
+ // yeah
+ texid := TPanel(obj).GetTextureID();
+ // water? water has the highest priority, so stop right here
+ if ((tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end;
+ // acid2?
+ if ((tag and GridTagAcid2) <> 0) then cctype := 2;
+ // acid1?
+ if ((tag and GridTagAcid1) <> 0) then cctype := 1;
+ end;
+
+begin
+ if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids');
+ if gdbg_map_use_accel_coldet then
+ begin
+ texid := TEXTURE_NONE;
+ if gdbg_map_use_tree_coldet then
begin
- if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then
- begin
- cctype := 1;
- texid := gAcid1[a].GetTextureID();
- exit;
- end;
- end;
- // acid2
- if (cctype > 2) and (tag = GridTagAcid2) then
+ mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
+ end
+ else
begin
- if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then
- begin
- cctype := 2;
- texid := gAcid2[a].GetTextureID();
- exit;
- end;
+ gMapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end;
+ result := texid;
+ end
+ else
+ begin
+ result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
end;
-
-begin
- texid := TEXTURE_NONE;
- gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
- result := texid;
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
end;
procedure g_Map_EnableWall(ID: DWORD);