diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index cc6d9d2715d304e6b89c553117e3cf745445a540..ae230c2292dfb483875b2c03468d20fde04bbbb5 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
// returns wall index in `gWalls` or -1
-function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Integer;
+function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Boolean;
type
TForEachPanelCB = function (pan: TPanel): Boolean; // return `true` to stop
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;
+ //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()`
type
TPanelGrid = specialize TBodyGridBase<TPanel>;
+ {
TDynAABBTreePanelBase = specialize TDynAABBTreeBase<TPanel>;
TDynAABBTreeMap = class(TDynAABBTreePanelBase)
function getFleshAABB (out aabb: AABB2D; pan: TPanel; tag: Integer): Boolean; override;
end;
+ {
+{
function TDynAABBTreeMap.getFleshAABB (out aabb: AABB2D; pan: TPanel; tag: Integer): Boolean;
begin
result := false;
if not aabb.valid then raise Exception.Create('wutafuuuuuuu?!');
result := true;
end;
+}
function panelTypeToTag (panelType: Word): Integer;
FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
gMapGrid: TPanelGrid = nil;
- mapTree: TDynAABBTreeMap = nil;
+ //mapTree: TDynAABBTreeMap = nil;
procedure g_Map_ProfilersBegin ();
// wall index in `gWalls` or -1
-function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Integer;
+(*
+function g_Map_traceToNearestWallOld (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Integer;
function sqchecker (pan: TPanel; var ray: Ray2D): Single;
var
end;
end;
end;
+*)
+
+
+// wall index in `gWalls` or -1
+function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Boolean;
+var
+ lastX, lastY, lastDist: Integer;
+ wasHit: Boolean = false;
+
+ // pan=nil: before processing new tile
+ function sqchecker (pan: TPanel; tag: Integer; x, y, prevx, prevy: Integer): Boolean;
+ var
+ dist: Integer;
+ begin
+ if (pan = nil) then
+ begin
+ // stop if something was hit at the previous tile
+ result := wasHit;
+ end
+ else
+ begin
+ result := false;
+ if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
+ begin
+ if not pan.Enabled then exit;
+ end;
+ dist := (prevx-x0)*(prevx-x0)+(prevy-y0)*(prevy-y0);
+ if (dist < lastDist) then
+ begin
+ wasHit := true;
+ lastDist := dist;
+ lastX := prevx;
+ lastY := prevy;
+ end;
+ end;
+ end;
+
+begin
+ result := false;
+ if (gMapGrid = nil) then exit;
+ lastDist := (x1-x0)*(x1-x0)+(y1-y0)*(y1-y0)+1;
+ lastX := 0;
+ lastY := 0;
+ result := gMapGrid.traceRay(x0, y0, x1, y1, sqchecker, (GridTagWall or GridTagDoor));
+ if (hitx <> nil) then hitx^ := lastX;
+ if (hity <> nil) then hity^ := lastY;
+end;
function g_Map_ForEachPanelAt (x, y: Integer; cb: TForEachPanelCB; panelType: Word): Boolean;
@@ -369,20 +421,19 @@ function g_Map_ForEachPanelAt (x, y: Integer; cb: TForEachPanelCB; panelType: Wo
if not pan.Enabled then exit;
end;
+ result := (x >= pan.X) and (y >= pan.Y) and (x < pan.X+pan.Width) and (y < pan.Y+pan.Height);
+ if not result then exit;
+
if ((tag and GridTagLift) <> 0) then
begin
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
- (x >= pan.X) and (y >= pan.Y) and (x < pan.X+pan.Width) and (y < pan.Y+pan.Height);
- if result then result := cb(pan);;
- exit;
+ (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3)));
end;
// other shit
- result := (x >= pan.X) and (y >= pan.Y) and (x < pan.X+pan.Width) and (y < pan.Y+pan.Height);
if result then result := cb(pan);
end;
begin
result := false;
if not assigned(cb) then exit;
- //if (mapTree = nil) then exit;
- //function TDynAABBTreeBase.pointQuery (ax, ay: TreeNumber; cb: TQueryOverlapCB; tagmask: Integer=-1): TTreeFlesh;
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;
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
+ //mapTree.insertObject(pan, tag, true); // as static object
end;
end;
begin
gMapGrid.Free();
gMapGrid := nil;
- mapTree.Free();
- mapTree := nil;
+ //mapTree.Free();
+ //mapTree := nil;
calcBoundingBox(gWalls);
calcBoundingBox(gRenderBackgrounds);
e_WriteLog(Format('map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING);
gMapGrid := TPanelGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1);
- mapTree := TDynAABBTreeMap.Create();
+ //mapTree := TDynAABBTreeMap.Create();
addPanelsToGrid(gWalls, PANEL_WALL);
addPanelsToGrid(gWalls, PANEL_CLOSEDOOR);
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);
+ //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;
+ //mapTree.Free();
+ //mapTree := nil;
Result := False;
gMapInfo.Map := Res;
dplClear();
//tagmask := panelTypeToTag(PanelType);
- if gdbg_map_use_tree_draw then
+ {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
+ 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;
@@ -2084,11 +2133,11 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
end;
begin
- if gdbg_map_use_tree_draw then
+ {if gdbg_map_use_tree_draw then
begin
mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
end
- else
+ else}
begin
gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
end;
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids');
if gdbg_map_use_accel_coldet then
begin
- if gdbg_map_use_tree_coldet then
+ {if gdbg_map_use_tree_coldet then
begin
//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);
g_Console_Add(Format('map collision: %d nodes visited (%d deep)', [mapTree.nodesVisited, mapTree.nodesDeepVisited]));
end;
end
- else
+ else}
begin
result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask);
end;
if gdbg_map_use_accel_coldet then
begin
texid := TEXTURE_NONE;
- if gdbg_map_use_tree_coldet then
+ {if gdbg_map_use_tree_coldet then
begin
mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end
- else
+ else}
begin
gMapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end;
with gWalls[ID] do
begin
Enabled := True;
- g_Mark(X, Y, Width, Height, MARK_DOOR, True);
+ //g_Mark(X, Y, Width, Height, MARK_DOOR, True);
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
end;
with gWalls[ID] do
begin
Enabled := False;
- g_Mark(X, Y, Width, Height, MARK_DOOR, False);
+ //g_Mark(X, Y, Width, Height, MARK_DOOR, False);
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
end;
begin
LiftType := t;
+ {
g_Mark(X, Y, Width, Height, MARK_LIFT, False);
if LiftType = 0 then
g_Mark(X, Y, Width, Height, MARK_LIFTLEFT, True)
else if LiftType = 3 then
g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT, True);
+ }
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
end;