X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_map.pas;h=b97cc00a24f2a3ed8a6a06dc51b9b10e54b850fd;hb=1ac9fc74d98d56a450774702aae19fa1546f2849;hp=eabf89645796ad273a1a78531c031497a40b3772;hpb=28bf5dfda4876c1aea86811c7dec26992bfe6435;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index eabf896..b97cc00 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -136,8 +136,9 @@ var gdbg_map_use_grid_render: Boolean = true; gdbg_map_use_grid_coldet: Boolean = true; - gdbg_map_use_tree_draw: 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 @@ -156,16 +157,16 @@ const 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,9 +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 exit; pan := (flesh as TPanel); + if (pan.Width < 1) or (pan.Height < 1) then exit; aabb := AABB2D.Create(pan.X, pan.Y, pan.X+pan.Width, pan.Y+pan.Height); + //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?!'); //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); result := aabb.valid; end; @@ -1005,7 +1011,7 @@ var 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; @@ -1898,8 +1904,8 @@ var 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; @@ -1912,18 +1918,6 @@ var 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; @@ -1960,7 +1954,7 @@ begin 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 @@ -2003,20 +1997,10 @@ 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 @@ -2277,14 +2261,6 @@ 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'); @@ -2293,7 +2269,12 @@ begin begin if gdbg_map_use_tree_coldet then begin - result := mapTree.aabbQuery(X, Y, Width, Height, checkerTree); + 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 + //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 @@ -2322,6 +2303,7 @@ var 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 @@ -2356,15 +2338,6 @@ var 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;} @@ -2377,7 +2350,7 @@ begin texid := TEXTURE_NONE; if gdbg_map_use_tree_coldet then begin - mapTree.aabbQuery(X, Y, Width, Height, checkerTree); + mapTree.aabbQuery(X, Y, Width, Height, checker); { cctype1 := cctype; texid1 := texid;