diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index d41d6775e28e69a574fde58c1559f77bf77bd070..4bb340d1026a97f86893f6843e0f0f3dfb93a61a 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
+// returns panel or nil
+// sets `ex` and `ey` to `x1` and `y1` when no hit was detected
function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+// returns panel or nil
+// sets `ex` and `ey` to `x1` and `y1` when no hit was detected
+function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+
type
TForEachPanelCB = function (pan: TPanel): Boolean; // return `true` to stop
function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean;
+function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
// trace liquid, stepping by `dx` and `dy`
// return last seen liquid coords, and `false` if we're started outside of the liquid
-function g_Map_TraceLiquid (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
+function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
procedure g_Map_ProfilersBegin ();
TPanelGrid = specialize TBodyGridBase<TPanel>;
var
- mapGrid: TPanelGrid = nil;
+ mapGrid: TPanelGrid = nil; // DO NOT USE! public for debugging only!
implementation
GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
g_options, MAPREADER, g_triggers, g_player, MAPDEF,
Math, g_monsters, g_saveload, g_language, g_netmsg,
- utils, sfs,
+ utils, sfs, xparser, xdynrec, xstreams,
ImagingTypes, Imaging, ImagingUtility,
ImagingGif, ImagingNetworkGraphics;
FLAG_SIGNATURE = $47414C46; // 'FLAG'
+{$IF DEFINED(D2D_NEW_MAP_READER)}
+var
+ dfmapdef: TDynMapDef = nil;
+
+
+procedure loadMapDefinition ();
+var
+ pr: TTextParser = nil;
+ st: TStream = nil;
+ WAD: TWADFile = nil;
+begin
+ if (dfmapdef <> nil) then exit;
+ try
+ e_LogWritefln('parsing "mapdef.txt"...', []);
+ st := openDiskFileRO(DataDir+'mapdef.txt');
+ except
+ st := nil;
+ e_LogWritefln('local "%smapdef.txt" not found', [DataDir]);
+ end;
+ if (st = nil) then
+ begin
+ WAD := TWADFile.Create();
+ if not WAD.ReadFile(GameWAD) then raise Exception.Create('cannot load "game.wad"');
+ st := WAD.openFileStream('mapdef.txt');
+ end;
+
+ if (st = nil) then raise Exception.Create('cannot open "mapdef.txt"');
+ pr := TFileTextParser.Create(st);
+
+ try
+ dfmapdef := TDynMapDef.Create(pr);
+ except on e: Exception do
+ raise Exception.Create(Format('ERROR in "mapdef.txt" at (%s,%s): %s', [pr.line, pr.col, e.message]));
+ end;
+
+ st.Free();
+ WAD.Free();
+end;
+{$ENDIF}
+
+
function panelTypeToTag (panelType: Word): Integer;
begin
case panelType of
end;
end;
+// returns panel or nil
+function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+var
+ ex, ey: Integer;
+begin
+ result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag);
+ if (result <> nil) then
+ begin
+ if (hitx <> nil) then hitx^ := ex;
+ if (hity <> nil) then hity^ := ey;
+ end
+ else
+ begin
+ if (hitx <> nil) then hitx^ := x1;
+ if (hity <> nil) then hity^ := y1;
+ end;
+end;
+
function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean;
end;
+function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
+begin
+ result := nil;
+ if (tagmask = 0) then exit;
+ result := mapGrid.forEachAtPoint(x, y, nil, tagmask);
+end;
+
+
function g_Map_IsSpecialTexture(Texture: String): Boolean;
begin
Result := (Texture = TEXTURE_NAME_WATER) or
end;
end;
- procedure addPanelsToGrid (constref panels: TPanelArray; tag: Integer);
+ procedure addPanelsToGrid (constref panels: TPanelArray);
var
idx: Integer;
pan: TPanel;
+ newtag: Integer;
begin
- tag := panelTypeToTag(tag);
+ //tag := panelTypeToTag(tag);
for idx := 0 to High(panels) do
begin
pan := panels[idx];
- pan.tag := tag;
if not pan.visvalid then continue;
- pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, tag);
+ if (pan.proxyId <> -1) then
+ begin
+ {$IF DEFINED(D2F_DEBUG)}
+ e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), MSG_NOTIFY);
+ {$ENDIF}
+ continue;
+ end;
+ case pan.PanelType of
+ PANEL_WALL: newtag := GridTagWall;
+ PANEL_OPENDOOR, PANEL_CLOSEDOOR: newtag := GridTagDoor;
+ PANEL_BACK: newtag := GridTagBack;
+ PANEL_FORE: newtag := GridTagFore;
+ PANEL_WATER: newtag := GridTagWater;
+ PANEL_ACID1: newtag := GridTagAcid1;
+ PANEL_ACID2: newtag := GridTagAcid2;
+ PANEL_STEP: newtag := GridTagStep;
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: newtag := GridTagLift;
+ PANEL_BLOCKMON: newtag := GridTagBlockMon;
+ else continue; // oops
+ end;
+ pan.tag := newtag;
+
+ pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, newtag);
// "enabled" flag has meaning only for doors and walls (engine assumes it); but meh...
mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
calcBoundingBox(gLifts);
calcBoundingBox(gBlockMon);
- e_WriteLog(Format('map dimensions: (%d,%d)-(%d,%d); editor size:(0,0)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1, gMapInfo.Width, gMapInfo.Height]), MSG_WARNING);
+ e_LogWritefln('map dimensions: (%d,%d)-(%d,%d); editor size:(0,0)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1, gMapInfo.Width, gMapInfo.Height]);
if (mapX0 > 0) then mapX0 := 0;
if (mapY0 > 0) then mapY0 := 0;
if (mapY1 < gMapInfo.Height-1) then mapY1 := gMapInfo.Height-1;
mapGrid := TPanelGrid.Create(mapX0-128, mapY0-128, mapX1-mapX0+1+128*2, mapY1-mapY0+1+128*2);
-
- 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(gAcid1, PANEL_ACID1);
- addPanelsToGrid(gAcid2, PANEL_ACID2);
- addPanelsToGrid(gSteps, PANEL_STEP);
- addPanelsToGrid(gLifts, PANEL_LIFTUP); // it doesn't matter which LIFT type is used here
- addPanelsToGrid(gBlockMon, PANEL_BLOCKMON);
+ //mapGrid := TPanelGrid.Create(0, 0, gMapInfo.Width, gMapInfo.Height);
+
+ addPanelsToGrid(gWalls);
+ addPanelsToGrid(gRenderBackgrounds);
+ addPanelsToGrid(gRenderForegrounds);
+ addPanelsToGrid(gWater);
+ addPanelsToGrid(gAcid1);
+ addPanelsToGrid(gAcid2);
+ addPanelsToGrid(gSteps);
+ addPanelsToGrid(gLifts); // it doesn't matter which LIFT type is used here
+ addPanelsToGrid(gBlockMon);
mapGrid.dumpStats();
Len: Integer;
ok, isAnim, trigRef: Boolean;
CurTex, ntn: Integer;
-
+ {$IF DEFINED(D2D_NEW_MAP_READER)}
+ pr: TTextParser = nil;
+ st: TStream = nil;
+ wst: TSFSMemoryChunkStream = nil;
+ rec: TDynRecord;
+ {$ENDIF}
begin
mapGrid.Free();
mapGrid := nil;
- //mapTree.Free();
- //mapTree := nil;
Result := False;
gMapInfo.Map := Res;
WAD.Free();
Exit;
end;
+
//k8: why loader ignores path here?
mapResName := g_ExtractFileName(Res);
if not WAD.GetMapResource(mapResName, Data, Len) then
WAD.Free();
- // Çàãðóçêà êàðòû:
- e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY);
+ if (Len < 4) then
+ begin
+ e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+ FreeMem(Data);
+ exit;
+ end;
+
+ // Çàãðóçêà êàðòû:
+ e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
+
+ {$IF DEFINED(D2D_NEW_MAP_READER)}
+ if (PChar(Data)[0] = 'M') and (PChar(Data)[1] = 'A') and (PChar(Data)[2] = 'P') and (PByte(Data)[3] = 1) then
+ begin
+ // nothing
+ end
+ else
+ begin
+ e_LogWritefln('Loading text map: %s', [mapResName]);
+ loadMapDefinition();
+ if (dfmapdef = nil) then raise Exception.Create('internal map loader error');
+ //e_LogWritefln('***'#10'%s'#10'***', [dfmapdef.headerType.definition]);
+ wst := TSFSMemoryChunkStream.Create(Data, Len);
+ try
+ pr := TFileTextParser.Create(wst);
+ e_LogWritefln('parsing text map: %s', [mapResName]);
+ rec := dfmapdef.parseMap(pr);
+ except on e: Exception do
+ begin
+ if (pr <> nil) then e_LogWritefln('ERROR at (%s,%s): %s', [pr.line, pr.col, e.message])
+ else e_LogWritefln('ERROR: %s', [e.message]);
+ pr.Free();
+ wst.Free();
+ FreeMem(Data);
+ exit;
+ end;
+ end;
+ pr.Free();
+ //wst.Free(); // pr will do it
+ e_LogWritefln('writing text map to temporary bin storage...', []);
+ st := TMemoryStream.Create();
+ try
+ rec.writeBinTo(st);
+ Len := Integer(st.position);
+ st.position := 0;
+ FreeMem(Data);
+ GetMem(Data, Len);
+ st.ReadBuffer(Data^, Len);
+ except on e: Exception do
+ begin
+ rec.Free();
+ st.Free();
+ e_LogWritefln('ERROR: %s', [e.message]);
+ FreeMem(Data);
+ exit;
+ end;
+ end;
+ st.Free();
+ end;
+ {$ENDIF}
+
MapReader := TMapReader_1.Create();
if not MapReader.LoadMap(Data) then
SetLength(s, 64);
CopyMemory(@s[1], @_textures[a].Resource[0], 64);
for b := 1 to Length(s) do
+ begin
if s[b] = #0 then
begin
SetLength(s, b-1);
Break;
end;
+ end;
+ {$IF DEFINED(D2F_DEBUG)}
e_WriteLog(Format(' Loading texture #%d: %s', [a, s]), MSG_NOTIFY);
+ {$ENDIF}
//if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY);
// Àíèìèðîâàííàÿ òåêñòóðà:
if ByteBool(_textures[a].Anim) then
begin
dplClear();
//tagmask := panelTypeToTag(PanelType);
-
- {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
- mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask);
- end;
+ mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask);
// list will be rendered in `g_game.DrawPlayer()`
end;
@@ -2048,14 +2200,7 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
end;
begin
- {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
- mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
- end;
+ mapGrid.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 (Width = 1) and (Height = 1) 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);
- if (gdbg_map_dump_coldet_tree_queries) and (mapTree.nodesVisited <> 0) then
+ if ((tagmask and SlowMask) <> 0) then
begin
- //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]));
+ // slow
+ result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil);
+ end
+ else
+ begin
+ // fast
+ result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil);
end;
end
- else}
+ else
begin
- if (Width = 1) and (Height = 1) then
+ if ((tagmask and SlowMask) <> 0) then
begin
- if ((tagmask and SlowMask) <> 0) then
- begin
- // slow
- result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil);
- end
- else
- begin
- // fast
- result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil);
- end;
+ // slow
+ result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil);
end
else
begin
- if ((tagmask and SlowMask) <> 0) then
- begin
- // slow
- result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil);
- end
- else
- begin
- // fast
- result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil);
- end;
+ // fast
+ result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil);
end;
end;
end
if gdbg_map_use_accel_coldet then
begin
texid := TEXTURE_NONE;
- {if gdbg_map_use_tree_coldet then
+ if (Width = 1) and (Height = 1) then
begin
- mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
+ mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end
- else}
+ else
begin
- if (Width = 1) and (Height = 1) then
- begin
- mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
- end
- else
- begin
- mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
- end;
+ mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end;
result := texid;
end
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(gWalls[ID].PanelType, ID);
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
- //e_WriteLog(Format('wall #%d(%d) enabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
+ //e_WriteLog(Format('ENABLE: wall #%d(%d) enabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
{$ENDIF}
end;
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pan.PanelType, ID);
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
- //e_WriteLog(Format('wall #%d(%d) disabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
+ //e_WriteLog(Format('DISABLE: wall #%d(%d) disabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
{$ENDIF}
end;
PAMem.LoadFromMemory(Mem);
for i := 0 to Length(panels)-1 do
+ begin
if panels[i].SaveIt then
begin
// ID ïàíåëè:
end;
// Çàãðóæàåì ïàíåëü:
panels[i].LoadState(PAMem);
+ if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx');
+ if (panels[i].proxyId >= 0) then mapGrid.proxyEnabled[panels[i].proxyId] := panels[i].Enabled;
end;
+ end;
// Ýòîò ñïèñîê ïàíåëåé çàãðóæåí:
PAMem.Free();
// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó:
g_GFX_Init();
- mapCreateGrid();
+ //mapCreateGrid();
///// Çàãðóæàåì ìóçûêó: /////
// Ñèãíàòóðà ìóçûêè:
// trace liquid, stepping by `dx` and `dy`
// return last seen liquid coords, and `false` if we're started outside of the liquid
-function g_Map_TraceLiquid (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
+function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
const
MaskLiquid = GridTagWater or GridTagAcid1 or GridTagAcid2;
begin