diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index aceb7e3d2069d8b5c95c550b044aa95e4fa37cea..53b4ae2d40986595ee8f6d9e8a6e221c3f3fa8bc 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
{$MODE DELPHI}
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
{$MODE DELPHI}
+{$modeswitch nestedprocvars}
unit g_map;
interface
uses
e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
unit g_map;
interface
uses
e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
- g_phys, wadreader, BinEditor, g_panel, md5;
+ g_phys, wadreader, BinEditor, g_panel, g_grid, md5;
type
TMapInfo = record
type
TMapInfo = record
procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer);
procedure g_Map_ResetPVP ();
// do not call this without calling `g_Map_BuildPVP()` or `g_Map_ResetPVP()` first!
procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer);
procedure g_Map_ResetPVP ();
// do not call this without calling `g_Map_BuildPVP()` or `g_Map_ResetPVP()` first!
-procedure g_Map_DrawPanels(PanelType: Word);
+procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
procedure g_Map_DrawBack(dx, dy: Integer);
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
procedure g_Map_DrawBack(dx, dy: Integer);
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
+// build "possibly lit panels" index, so we can avoid looping over all level panels again and again
+function g_Map_BuildPLP (ltminx, ltminy, ltmaxx, ltmaxy: Integer): Boolean; // returns `false` if no patels lit
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
const
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
const
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
+ gMapGrid: TBodyGrid = nil;
implementation
implementation
len := Length(panels^);
SetLength(panels^, len + 1);
len := Length(panels^);
SetLength(panels^, len + 1);
- panels^[len] := TPanel.Create(PanelRec, AddTextures,
- CurTex, Textures);
+ panels^[len] := TPanel.Create(PanelRec, AddTextures, CurTex, Textures);
+ panels^[len].ArrIdx := len;
if sav then
panels^[len].SaveIt := True;
if sav then
panels^[len].SaveIt := True;
Len: Integer;
ok, isAnim, trigRef: Boolean;
CurTex, ntn: Integer;
Len: Integer;
ok, isAnim, trigRef: Boolean;
CurTex, ntn: Integer;
+
+ mapX0: Integer = $3fffffff;
+ mapY0: Integer = $3fffffff;
+ mapX1: Integer = -$3fffffff;
+ mapY1: Integer = -$3fffffff;
+
+ procedure fixMinMax (var panels: TPanelArray);
+ var
+ idx: Integer;
+ 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;
+ end;
+ end;
+
+ procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer);
+ var
+ idx: Integer;
+ begin
+ 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);
+ end;
+ end;
+
begin
begin
+ gMapGrid.Free();
+ gMapGrid := nil;
+
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
sfsGCEnable(); // enable releasing unused volumes
end;
sfsGCEnable(); // enable releasing unused volumes
end;
+ e_WriteLog('Creating map grid', MSG_NOTIFY);
+
+ fixMinMax(gWalls);
+ fixMinMax(gRenderBackgrounds);
+ fixMinMax(gRenderForegrounds);
+ fixMinMax(gWater);
+ fixMinMax(gAcid1);
+ fixMinMax(gAcid2);
+ fixMinMax(gSteps);
+
+ gMapGrid := TBodyGrid.Create(mapX1+1, mapY1+1);
+
+ addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR
+ addPanelsToGrid(gRenderBackgrounds, PANEL_BACK);
+ addPanelsToGrid(gRenderForegrounds, PANEL_FORE);
+ addPanelsToGrid(gWater, PANEL_WATER);
+ addPanelsToGrid(gAcid1, PANEL_ACID1);
+ addPanelsToGrid(gAcid2, PANEL_ACID2);
+ addPanelsToGrid(gSteps, PANEL_STEP);
+
+ gMapGrid.dumpStats();
+
e_WriteLog('Done loading map.', MSG_NOTIFY);
Result := True;
end;
e_WriteLog('Done loading map.', MSG_NOTIFY);
Result := True;
end;
var
var
- pvpset: array of PPanel = nil; // potentially lit panels
+ pvpset: array of TPanel = nil; // potentially lit panels
pvpb, pvpe: array [0..7] of Integer; // start/end (inclusive) of the correspoinding type panels in pvpset
pvpcount: Integer = -1; // to avoid constant reallocations
pvpb, pvpe: array [0..7] of Integer; // start/end (inclusive) of the correspoinding type panels in pvpset
pvpcount: Integer = -1; // to avoid constant reallocations
if (x > maxx) or (y > maxy) then continue;
if (x+w <= minx) or (y+h <= miny) then continue;
if pvpcount = length(pvpset) then SetLength(pvpset, pvpcount+32768);
if (x > maxx) or (y > maxy) then continue;
if (x+w <= minx) or (y+h <= miny) then continue;
if pvpcount = length(pvpset) then SetLength(pvpset, pvpcount+32768);
- pvpset[pvpcount] := @panels[idx];
+ pvpset[pvpcount] := panels[idx];
Inc(pvpcount);
end;
pvpe[stp] := pvpcount-1;
Inc(pvpcount);
end;
pvpe[stp] := pvpcount-1;
//e_WriteLog(Format('total panels: %d; visible panels: %d', [tpc, pvpcount]), MSG_NOTIFY);
end;
//e_WriteLog(Format('total panels: %d; visible panels: %d', [tpc, pvpcount]), MSG_NOTIFY);
end;
-procedure g_Map_DrawPanels(PanelType: Word);
+procedure g_Map_DrawPanelsOld(PanelType: Word);
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
var
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
var
end;
end;
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);
+
+ function qq (obj: TObject; tag: Integer): Boolean;
+ var
+ pan: TPanel;
+ 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);
+ //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
+
+ if (tag = PANEL_WALL) then
+ begin
+ if (PanelType = PANEL_WALL) then
+ begin
+ pan := (obj as TPanel);
+ if not pan.Door then
+ begin
+ //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;
+ end
+ else if (PanelType = PANEL_CLOSEDOOR) then
+ begin
+ pan := (obj as TPanel);
+ if pan.Door then
+ begin
+ //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;
+ end
+ end
+ else if (PanelType = tag) then
+ begin
+ pan := (obj as TPanel);
+ if not pan.Door then
+ begin
+ //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;
+ end;
+ 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
+ if pvpcount < 0 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];
+ 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
+ else
+ begin
+ // wow, use visible set
+ if pvpb[stp] <= pvpe[stp] then
+ begin
+ for idx := pvpb[stp] to pvpe[stp] do
+ begin
+ if not (drawDoors xor pvpset[idx].Door) then
+ begin
+ pan := pvpset[idx];
+ 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;
+ end;
+ end;
+ end;
+
+begin
+ //g_Map_DrawPanelsOld(PanelType); exit;
+ //e_WriteLog('==================', MSG_NOTIFY);
+ //e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
+ dplClear();
+ gMapGrid.forEachInAABB(x0, y0, wdt, hgt, qq);
+
+ // 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
+ begin
+ (gDrawPanelList.front() as TPanel).Draw();
+ gDrawPanelList.popFront();
+ end;
+end;
+
+var
+ plpset: array of Integer = nil; // potentially lit panels
+ plpcount: Integer; // to avoid constant reallocations
+
+function g_Map_BuildPLP (ltminx, ltminy, ltmaxx, ltmaxy: Integer): Boolean;
+var
+ idx: Integer;
+ panels: TPanelArray;
+begin
+ panels := gWalls;
+ plpcount := 0;
+ if (ltminx < ltmaxx) and (ltminy < ltmaxy) then
+ begin
+ if panels <> nil then
+ begin
+ for idx := 0 to High(panels) do
+ begin
+ if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
+ if (panels[idx].X+panels[idx].Width <= ltminx) then continue;
+ if (panels[idx].Y+panels[idx].Height <= ltminy) then continue;
+ if (panels[idx].X > ltmaxx) then continue;
+ if (panels[idx].Y > ltmaxy) then continue;
+ if plpcount = length(plpset) then SetLength(plpset, plpcount+32768);
+ plpset[plpcount] := idx;
+ Inc(plpcount);
+ end;
+ //e_WriteLog(Format('%d panels left out of %d', [plpcount, Length(panels)]), MSG_NOTIFY);
+ end;
+ end;
+ result := (plpcount > 0);
+end;
+
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
+ (* old
procedure drawPanels (var panels: TPanelArray);
var
a: Integer;
procedure drawPanels (var panels: TPanelArray);
var
a: Integer;
@@ -1808,10 +2043,18 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
end;
end;
end;
end;
end;
end;
-
+ *)
+var
+ idx: Integer;
begin
begin
+ (*
drawPanels(gWalls);
//drawPanels(gRenderForegrounds);
drawPanels(gWalls);
//drawPanels(gRenderForegrounds);
+ *)
+ for idx := 0 to plpcount-1 do
+ begin
+ gWalls[plpset[idx]].DrawShadowVolume(lightX, lightY, radius);
+ end;
end;
procedure g_Map_DrawBack(dx, dy: Integer);
end;
procedure g_Map_DrawBack(dx, dy: Integer);
e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
end;
e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
end;
-function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
+function g_Map_CollidePanelOld(X, Y: Integer; Width, Height: Word;
PanelType: Word; b1x3: Boolean): Boolean;
var
a, h: Integer;
PanelType: Word; b1x3: Boolean): Boolean;
var
a, h: Integer;
end;
end;
end;
end;
+function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
+
+ function qq (obj: TObject; tag: Integer): 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 WordBool(tag and PANEL_WALL) then
+ 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
+ begin
+ result := true;
+ exit;
+ end;
+ end;
+
+ if WordBool(PanelType and PANEL_WATER) and WordBool(tag and PANEL_WATER) 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;
+
+ if WordBool(PanelType and PANEL_ACID1) and WordBool(tag and PANEL_ACID1) 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 WordBool(tag and PANEL_ACID2) 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;
+ end;
+
+ if WordBool(PanelType and PANEL_STEP) and WordBool(tag and PANEL_STEP) 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;
+ end;
+ end;
+
+var
+ a, h: Integer;
+begin
+ result := gMapGrid.forEachInAABB(X, Y, Width, Height, qq);
+ if not result then
+ begin
+ if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (gLifts <> nil) then
+ begin
+ h := High(gLifts);
+ for a := 0 to h do
+ 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;
+ end;
+ end;
+
+ if WordBool(PanelType and PANEL_BLOCKMON) and (gBlockMon <> nil) then
+ begin
+ h := High(gBlockMon);
+ for a := 0 to h do
+ 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
+ begin
+ Result := True;
+ Exit;
+ end;
+ end;
+ end;
+ end;
+end;
+
+
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
var
a, h: Integer;
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
var
a, h: Integer;