X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=11a7d79459680c945d174ca81c4bb45c4618d279;hb=fe14f41dc8700dee5a80949a41c58e7d3943f464;hp=aceb7e3d2069d8b5c95c550b044aa95e4fa37cea;hpb=2249a689b020a4e0d2860e58eafde84010e8f3f4;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index aceb7e3..11a7d79 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -13,14 +13,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$MODE DELPHI} +{$INCLUDE ../shared/a_modes.inc} 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, z_aabbtree, md5, xprofiler; type TMapInfo = record @@ -62,11 +62,7 @@ function g_Map_Exist(Res: String): Boolean; procedure g_Map_Free(); procedure g_Map_Update(); -// build "potentially visible panels" set, so we can avoid looping over all level panels again and again -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; @@ -94,6 +90,9 @@ procedure g_Map_LoadState(Var Mem: TBinMemoryReader); 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; @@ -135,6 +134,12 @@ var BackID: DWORD = DWORD(-1); gExternalResources: TStringList; + 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_coldet: Boolean = false; + profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY! + implementation uses @@ -142,7 +147,7 @@ uses 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, binheap, ImagingTypes, Imaging, ImagingUtility, ImagingGif, ImagingNetworkGraphics; @@ -151,18 +156,83 @@ 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; + + +function panelTypeToTag (panelType: Word): Integer; +begin + case panelType of + PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagWallDoor; // gWalls + PANEL_BACK: result := GridTagBack; // gRenderBackgrounds + PANEL_FORE: result := GridTagFore; // gRenderForegrounds + PANEL_WATER: result := GridTagWater; // gWater + PANEL_ACID1: result := GridTagAcid1; // gAcid1 + PANEL_ACID2: result := GridTagAcid2; // gAcid2 + PANEL_STEP: result := GridTagStep; // gSteps + PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: result := GridTagLift; // gLifts -- this is for all lifts + PANEL_BLOCKMON: result := GridTagBlockMon; // gBlockMon -- this is for all blockmons + else result := GridTagInvalid; + end; +end; + + type TPanelID = record PWhere: ^TPanelArray; PArrID: Integer; end; +type + TDynAABBTreeMap = class(TDynAABBTree) + function getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh): Boolean; override; + end; + +function TDynAABBTreeMap.getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh): Boolean; +var + pan: TPanel; +begin + pan := (flesh as TPanel); + aabb.setDims(pan.X, pan.Y, pan.X+pan.Width-1, pan.Y+pan.Height-1); + result := true; +end; + var PanelById: array of TPanelID; Textures: TLevelTextureArray; RespawnPoints: Array of TRespawnPoint; 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('MAP COLLISION', g_profile_history_size); + profMapCollision.mainBegin(g_profile_collision); + // create sections + if g_profile_collision then + begin + profMapCollision.sectionBegin('wall coldet'); + profMapCollision.sectionEnd(); + profMapCollision.sectionBegin('liquid coldet'); + profMapCollision.sectionEnd(); + end; +end; + +procedure g_Map_ProfilersEnd (); +begin + if (profMapCollision <> nil) then profMapCollision.mainEnd(); +end; function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -372,8 +442,9 @@ begin 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; + panels^[len].tag := panelTypeToTag(PanelRec.PanelType); if sav then panels^[len].SaveIt := True; @@ -902,6 +973,80 @@ begin addResToExternalResList(mapHeader.SkyName); end; +procedure mapCreateGrid (); +var + 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 + tag := panelTypeToTag(tag); + for idx := High(panels) downto 0 do + 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 + 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; + + gMapGrid := TBodyGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1); + mapTree := TDynAABBTreeMap.Create(); + + 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); + addPanelsToGrid(gLifts, PANEL_LIFTUP); // it doesn't matter which LIFT type is used here + 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; const DefaultMusRes = 'Standart.wad:STDMUS\MUS1'; @@ -932,7 +1077,13 @@ var Len: Integer; ok, isAnim, trigRef: Boolean; CurTex, ntn: Integer; + begin + gMapGrid.Free(); + gMapGrid := nil; + mapTree.Free(); + mapTree := nil; + Result := False; gMapInfo.Map := Res; TriggersTable := nil; @@ -1399,6 +1550,9 @@ begin sfsGCEnable(); // enable releasing unused volumes end; + e_WriteLog('Creating map grid', MSG_NOTIFY); + mapCreateGrid(); + e_WriteLog('Done loading map.', MSG_NOTIFY); Result := True; end; @@ -1683,137 +1837,192 @@ begin end; -var - pvpset: array of PPanel = 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 +procedure g_Map_DrawPanelsOld(PanelType: Word); + + procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False); + var + idx: Integer; + 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 panels[idx].Draw(); + end; + end; + end; -function pvpType (panelType: Word): Integer; begin - case panelType of - PANEL_WALL, PANEL_CLOSEDOOR: result := 0; // gWalls - PANEL_BACK: result := 1; // gRenderBackgrounds - PANEL_FORE: result := 2; // gRenderForegrounds - PANEL_WATER: result := 3; // gWater - PANEL_ACID1: result := 4; // gAcid1 - PANEL_ACID2: result := 5; // gAcid2 - PANEL_STEP: result := 6; // gSteps - else result := -1; + 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; end; -procedure g_Map_ResetPVP (); + +var + gDrawPanelList: TBinaryHeapObj = nil; + +function dplLess (a, b: TObject): Boolean; +begin + result := ((a as TPanel).ArrIdx < (b as TPanel).ArrIdx); +end; + +procedure dplClear (); begin - pvpcount := -1; // special + if gDrawPanelList = nil then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear(); end; -procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer); +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 - idx: Integer; - tpc: Integer; + ptag: Integer; - procedure checkPanels (var panels: TPanelArray; stp: Integer); + function checker (obj: TObject; tag: Integer): Boolean; var - idx, x, y, w, h: Integer; + pan: TPanel; begin - if panels = nil then exit; - tpc := tpc+Length(panels); - if (stp < 0) or (stp > 6) then exit; - pvpb[stp] := pvpcount; - for idx := 0 to High(panels) do - begin - w := panels[idx].Width; - h := panels[idx].Height; - if (w < 1) or (h < 1) then continue; - x := panels[idx].X; - y := panels[idx].Y; - 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]; - Inc(pvpcount); - end; - pvpe[stp] := pvpcount-1; + 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; -begin - //e_WriteLog(Format('visible rect: (%d,%d)-(%d,%d)', [minx, miny, maxx, maxy]), MSG_NOTIFY); - pvpcount := 0; - for idx := 0 to High(pvpb) do begin pvpb[idx] := 0; pvpe[idx] := -1; end; - tpc := 0; - checkPanels(gWalls, 0); - checkPanels(gRenderBackgrounds, 1); - checkPanels(gRenderForegrounds, 2); - checkPanels(gWater, 3); - checkPanels(gAcid1, 4); - checkPanels(gAcid2, 5); - checkPanels(gSteps, 6); - //e_WriteLog(Format('total panels: %d; visible panels: %d', [tpc, pvpcount]), MSG_NOTIFY); -end; - -procedure g_Map_DrawPanels(PanelType: Word); + 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; + 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 panels[idx].Draw(); - end; - end - else + // alas, no visible set + for idx := 0 to High(panels) do begin - // wow, use visible set - if pvpb[stp] <= pvpe[stp] then + if not (drawDoors xor panels[idx].Door) then begin - for idx := pvpb[stp] to pvpe[stp] do - begin - if not (drawDoors xor pvpset[idx].Door) then pvpset[idx].Draw(); - end; + 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; + } + pan.Draw(); + //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; 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); + //g_Map_DrawPanelsOld(PanelType); exit; + //e_WriteLog('==================', MSG_NOTIFY); + //e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY); + dplClear(); + ptag := panelTypeToTag(PanelType); + + if gdbg_map_use_grid_render then + begin + if gdbg_map_use_tree_draw then + begin + mapTree.aabbQuery(x0, y0, wdt, hgt, checkerTree); + end + else + begin + gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker); + end; + // 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 + else + begin + //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; end; + + //e_WriteLog('==================', MSG_NOTIFY); end; + procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); + function checker (obj: TObject; tag: Integer): Boolean; + var + pan: TPanel; + begin + result := false; // don't stop, ever + if (tag <> GridTagWallDoor) then exit; // only walls + pan := (obj as TPanel); + pan.DrawShadowVolume(lightX, lightY, radius); + end; - procedure drawPanels (var panels: TPanelArray); + function checkerTree (obj: TObject): Boolean; var - a: Integer; + pan: TPanel; begin - if panels <> nil then - begin - for a := 0 to High(panels) do - begin - panels[a].DrawShadowVolume(lightX, lightY, radius); - end; - end; + 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 - drawPanels(gWalls); - //drawPanels(gRenderForegrounds); + if gdbg_map_use_tree_draw then + begin + mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checkerTree); + end + else + begin + gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker); + end; end; + procedure g_Map_DrawBack(dx, dy: Integer); begin if gDrawBackGround and (BackID <> DWORD(-1)) then @@ -1822,7 +2031,7 @@ begin 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; @@ -1942,52 +2151,240 @@ begin end; end; -function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; +function g_Map_CollideLiquid_TextureOld(X, Y: Integer; Width, Height: Word): DWORD; var - a, h: Integer; + texid: DWORD; + + function checkPanels (var panels: TPanelArray): Boolean; + var + a: Integer; + begin + result := false; + if panels = nil then exit; + for a := 0 to High(panels) do + begin + 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; + begin - Result := TEXTURE_NONE; + 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 gWater <> nil 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; + a: Integer; begin - h := High(gWater); + result := false; // don't stop, ever - for a := 0 to h do - if g_Collide(X, Y, Width, Height, - gWater[a].X, gWater[a].Y, - gWater[a].Width, gWater[a].Height) then + //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 + 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 := gWater[a].GetTextureID(); - Exit; + result := true; + exit; + 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; + + 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 + 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 (tag = GridTagStep) 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; + + if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (tag = GridTagLift) 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; + end; + + if WordBool(PanelType and PANEL_BLOCKMON) and (tag = GridTagBlockMon) 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 + begin + result := True; + exit; + end; + end; end; - if gAcid1 <> nil then + function checkerTree (obj: TObject): Boolean; + var + pan: TPanel; begin - h := High(gAcid1); + pan := (obj as TPanel); + result := checker(obj, pan.tag); + end; - for a := 0 to h do - if g_Collide(X, Y, Width, Height, - gAcid1[a].X, gAcid1[a].Y, - gAcid1[a].Width, gAcid1[a].Height) then +begin + //TODO: detailed profile + if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('wall coldet'); + try + if gdbg_map_use_grid_coldet then + begin + if gdbg_map_use_tree_coldet then begin - Result := gAcid1[a].GetTextureID(); - Exit; + mapTree.aabbQuery(X, Y, Width, Height, checkerTree); + end + else + begin + result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker); + end; + end + else + begin + result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3); + end; + finally + if (profMapCollision <> nil) then profMapCollision.sectionEnd(); + end; +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) + 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; + end; + // acid1 + if (cctype > 1) 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 + cctype := 1; + texid := gAcid1[a].GetTextureID(); + exit; + end; + end; + // acid2 + if (cctype > 2) and (tag = GridTagAcid2) then + 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; + end; end; - if gAcid2 <> nil then + function checkerTree (obj: TObject): Boolean; + var + pan: TPanel; begin - h := High(gAcid2); + pan := (obj as TPanel); + result := checker(obj, pan.tag); + end; - for a := 0 to h do - if g_Collide(X, Y, Width, Height, - gAcid2[a].X, gAcid2[a].Y, - gAcid2[a].Width, gAcid2[a].Height) then +begin + //TODO: detailed profile? + if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet'); + try + if gdbg_map_use_grid_coldet then + begin + texid := TEXTURE_NONE; + if gdbg_map_use_tree_coldet then begin - Result := gAcid2[a].GetTextureID(); - Exit; + mapTree.aabbQuery(X, Y, Width, Height, checkerTree); + end + else + begin + gMapGrid.forEachInAABB(X, Y, Width, Height, checker); end; + result := texid; + end + else + begin + result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height); + end; + finally + if (profMapCollision <> nil) then profMapCollision.sectionEnd(); end; end; @@ -2365,8 +2762,9 @@ begin LoadPanelArray(gLifts); ///// ///// -// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé: +// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó: g_GFX_Init(); + mapCreateGrid(); ///// Çàãðóæàåì ìóçûêó: ///// // Ñèãíàòóðà ìóçûêè: