X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=4455ed9a66578a53b0e53cca9dec46c7ab79292c;hb=0cf1438ff1766dc311fbebc45f6171d64f757cd4;hp=8b41389dd9d0800aedae01db5b15718eb52cce86;hpb=1bddfaf7b6421f1659a6f211dfdb1dfaef5d5173;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 8b41389..4455ed9 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -20,7 +20,7 @@ unit g_map; interface uses - SysUtils, Classes, + SysUtils, Classes, mempool, e_graphics, g_basic, MAPDEF, g_textures, g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec; @@ -562,7 +562,7 @@ function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; var ex, ey: Integer; begin - result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor)); + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, (GridTagWall or GridTagDoor)); if (result <> nil) then begin if (hitx <> nil) then hitx^ := ex; @@ -580,7 +580,7 @@ function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInt var ex, ey: Integer; begin - result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag); + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, tag); if (result <> nil) then begin if (hitx <> nil) then hitx^ := ex; @@ -594,34 +594,27 @@ begin end; -function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; - - function checker (pan: TPanel; tag: Integer): Boolean; - begin - { - if ((tag and (GridTagWall or GridTagDoor)) <> 0) then - begin - result := pan.Enabled; // stop if wall is enabled - exit; - end; - } - - if ((tag and GridTagLift) <> 0) then - begin - // stop if the lift of the right type - 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))); - exit; - end; - - result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels +function xxPanAtPointChecker (pan: TPanel; panelType: Word): Boolean; inline; +begin + if ((pan.tag and GridTagLift) <> 0) then + begin + // stop if the lift of the right type + 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))); + exit; end; + result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels +end; +function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; var tagmask: Integer = 0; + pmark: PoolMark; + hitcount: Integer; + ppan: PPanel; begin result := false; @@ -634,24 +627,40 @@ begin if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; if (tagmask = 0) then exit;// just in case + + pmark := framePool.mark(); if ((tagmask and GridTagLift) <> 0) then begin // slow - result := (mapGrid.forEachAtPoint(x, y, checker, tagmask) <> nil); + hitcount := mapGrid.forEachAtPoint(x, y, tagmask); + ppan := PPanel(framePool.getPtr(pmark)); + while (hitcount > 0) do + begin + if (xxPanAtPointChecker(ppan^, PanelType)) then begin result := true; break; end; + Inc(ppan); + Dec(hitcount); + end; end else begin // fast - result := (mapGrid.forEachAtPoint(x, y, nil, tagmask) <> nil); + result := (mapGrid.forEachAtPoint(x, y, tagmask, false, true) <> 0); // firsthit end; + framePool.release(pmark); end; function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel; +var + pmark: PoolMark; + hitcount: Integer; begin result := nil; if (tagmask = 0) then exit; - result := mapGrid.forEachAtPoint(x, y, nil, tagmask); + pmark := framePool.mark(); + hitcount := mapGrid.forEachAtPoint(x, y, tagmask, false, true); // firsthit + if (hitcount <> 0) then result := PPanel(framePool.getPtr(pmark))^; + framePool.release(pmark); end; @@ -2615,32 +2624,44 @@ end; // new algo procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer); - - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - if ((tag and GridTagDoor) <> 0) <> pan.Door then exit; - gDrawPanelList.insert(pan); - end; - +var + pmark: PoolMark; + phit: PPanel; + hitcount: Integer; begin dplClear(); - //tagmask := panelTypeToTag(PanelType); - mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask); + pmark := framePool.mark(); + hitcount := mapGrid.forEachInAABB(x0, y0, wdt, hgt, GridDrawableMask); + if (hitcount = 0) then exit; + phit := PPanel(framePool.getPtr(pmark)); + while (hitcount > 0) do + begin + if (((phit^.tag and GridTagDoor) <> 0) = phit^.Door) then gDrawPanelList.insert(phit^); + Inc(phit); + Dec(hitcount); + end; + framePool.release(pmark); // list will be rendered in `g_game.DrawPlayer()` end; -procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); - - function checker (pan: TPanel; tag: Integer): Boolean; +procedure g_Map_DrawPanelShadowVolumes (lightX: Integer; lightY: Integer; radius: Integer); +var + pmark: PoolMark; + phit: PPanel; + hitcount: Integer; +begin + pmark := framePool.mark(); + hitcount := mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, (GridTagWall or GridTagDoor)); + if (hitcount = 0) then exit; + phit := PPanel(framePool.getPtr(pmark)); + while (hitcount > 0) do begin - result := false; // don't stop, ever - pan.DrawShadowVolume(lightX, lightY, radius); + phit^.DrawShadowVolume(lightX, lightY, radius); + Inc(phit); + Dec(hitcount); end; - -begin - mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor)); + framePool.release(pmark); end; @@ -2806,6 +2827,7 @@ end; function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; const SlowMask = GridTagLift or GridTagBlockMon; + function checker (pan: TPanel; tag: Integer): Boolean; begin { @@ -2840,7 +2862,12 @@ const var tagmask: Integer = 0; + pmark: PoolMark; + phit: PPanel; + hitcount: Integer; + pan: TPanel; begin + result := false; 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; if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1; @@ -2849,37 +2876,50 @@ begin if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift; if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; - if (tagmask = 0) then begin result := false; exit; end; // just in case + if (tagmask = 0) then exit; // just in case if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids'); if gdbg_map_use_accel_coldet then begin - if (Width = 1) and (Height = 1) then + pmark := framePool.mark(); + if ((tagmask and SlowMask) <> 0) then begin - if ((tagmask and SlowMask) <> 0) then + // slow + hitcount := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask); + phit := PPanel(framePool.getPtr(pmark)); + while (hitcount > 0) do begin - // slow - result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil); - end - else - begin - // fast - result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil); + pan := phit^; + if ((pan.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 + g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)}; + end + else if ((pan.tag and GridTagBlockMon) <> 0) then + begin + result := ((not b1x3) or (pan.Width+pan.Height >= 64)); //and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height); + end + else + begin + // other shit + result := true; // i found her! + end; + if (result) then break; + Inc(phit); + Dec(hitcount); end; 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 + hitcount := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask, false, true); // return first hit + result := (hitcount > 0); end; + framePool.release(pmark); end else begin @@ -2889,48 +2929,53 @@ begin end; +// returns `true` if we need to stop +function liquidChecker (pan: TPanel; var texid: DWORD; var cctype: Integer): Boolean; inline; +begin + result := false; + //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit; + // check priorities + case cctype of + 0: if ((pan.tag and GridTagWater) = 0) then exit; // allowed: water + 1: if ((pan.tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1 + //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2 + end; + // collision? + //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; + // yeah + texid := pan.GetTextureID(); + // water? water has the highest priority, so stop right here + if ((pan.tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; + // acid2? + if ((pan.tag and GridTagAcid2) <> 0) then cctype := 2; + // acid1? + if ((pan.tag and GridTagAcid1) <> 0) then cctype := 1; +end; + function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; var cctype: Integer = 3; // priority: 0: water was hit, 1: acid1 was hit, 2: acid2 was hit; 3: nothing was hit - texid: DWORD; - - // slightly different from the old code, but meh... - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit; - // check priorities - case cctype of - 0: if ((tag and GridTagWater) = 0) then exit; // allowed: water - 1: if ((tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1 - //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2 - end; - // collision? - //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; - // yeah - texid := pan.GetTextureID(); - // water? water has the highest priority, so stop right here - if ((tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; - // acid2? - if ((tag and GridTagAcid2) <> 0) then cctype := 2; - // acid1? - if ((tag and GridTagAcid1) <> 0) then cctype := 1; - end; - + pmark: PoolMark; + phit: PPanel; + hitcount: Integer; + pan: TPanel; begin if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids'); if gdbg_map_use_accel_coldet then begin - texid := LongWord(TEXTURE_NONE); - if (Width = 1) and (Height = 1) then - begin - mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); - end - else + result := LongWord(TEXTURE_NONE); + pmark := framePool.mark(); + hitcount := mapGrid.forEachInAABB(X, Y, Width, Height, (GridTagWater or GridTagAcid1 or GridTagAcid2)); + if (hitcount = 0) then exit; + phit := PPanel(framePool.getPtr(pmark)); + while (hitcount > 0) do begin - mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); + pan := phit^; + Inc(phit); + Dec(hitcount); + if (liquidChecker(pan, result, cctype)) then break; end; - result := texid; + framePool.release(pmark); end else begin @@ -3316,14 +3361,16 @@ begin topx := x; topy := y; // started outside of the liquid? - if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then begin result := false; exit; end; if (dx = 0) and (dy = 0) then begin result := false; exit; end; // sanity check result := true; while true do begin Inc(x, dx); Inc(y, dy); - if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then exit; // out of the water, just exit topx := x; topy := y; end;