X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=730812cdd2e16113909fb57d2e888277aef0a807;hb=93a1d67a1cb34cb02937559cd0d15194ca80728c;hp=6c35e4e00af20320d07888af5b21590dbd3ae7a0;hpb=5472594f32e33da0c66606ec9eebc8f798ef6b54;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 6c35e4e..730812c 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -14,13 +14,14 @@ * along with this program. If not, see . *) {$MODE DELPHI} +{$modeswitch nestedprocvars} 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 @@ -55,14 +56,15 @@ type Direction: TDirection; end; - function g_Map_Load(Res: String): Boolean; function g_Map_GetMapInfo(Res: String): TMapInfo; function g_Map_GetMapsList(WADName: String): SArray; function g_Map_Exist(Res: String): Boolean; procedure g_Map_Free(); procedure g_Map_Update(); -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; PanelType: Word; b1x3: Boolean): Boolean; @@ -82,9 +84,15 @@ function g_Map_HaveFlagPoints(): Boolean; procedure g_Map_ResetFlag(Flag: Byte); procedure g_Map_DrawFlags(); +function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel; + 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 RESPAWNPOINT_PLAYER1 = 1; RESPAWNPOINT_PLAYER2 = 2; @@ -125,6 +133,7 @@ var gWADHash: TMD5Digest; BackID: DWORD = DWORD(-1); gExternalResources: TStringList; + gMapGrid: TBodyGrid = nil; implementation @@ -142,7 +151,14 @@ const MUSIC_SIGNATURE = $4953554D; // 'MUSI' FLAG_SIGNATURE = $47414C46; // 'FLAG' +type + TPanelID = record + PWhere: ^TPanelArray; + PArrID: Integer; + end; + var + PanelById: array of TPanelID; Textures: TLevelTextureArray; RespawnPoints: Array of TRespawnPoint; FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint; @@ -356,12 +372,17 @@ 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; if sav then panels^[len].SaveIt := True; Result := len; + + len := Length(PanelByID); + SetLength(PanelByID, len + 1); + PanelByID[len].PWhere := panels; + PanelByID[len].PArrID := Result; end; function CreateNullTexture(RecName: String): Integer; @@ -475,12 +496,11 @@ function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer; var WAD: TWADFile; TextureWAD: PChar = nil; - ttw: PChar = nil; TextData: Pointer = nil; TextureData: Pointer = nil; cfg: TConfig = nil; WADName: String; - ResLength, rrl: Integer; + ResLength: Integer; TextureResource: String; _width, _height, _framecount, _speed: Integer; _backanimation: Boolean; @@ -912,7 +932,40 @@ var 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 + gMapGrid.Free(); + gMapGrid := nil; + Result := False; gMapInfo.Map := Res; TriggersTable := nil; @@ -940,6 +993,7 @@ begin WAD.Free(); Exit; end; + WAD.Free(); // Çàãðóçêà êàðòû: @@ -1378,6 +1432,28 @@ begin 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; @@ -1572,6 +1648,8 @@ begin gDoorMap := nil; gLiftMap := nil; + + PanelByID := nil; end; procedure g_Map_Update(); @@ -1659,30 +1737,239 @@ begin end; end; -procedure g_Map_DrawPanels(PanelType: Word); - procedure DrawPanels(var panels: TPanelArray; - drawDoors: Boolean = False); +{ +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; + end; +end; +} + + +procedure g_Map_DrawPanelsOld(PanelType: Word); + + procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False); var - a: Integer; + 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; + +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); + 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 - if panels <> nil then - for a := 0 to High(panels) do - if not (drawDoors xor panels[a].Door) then - panels[a].Draw(); + 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 + // alas, no visible set + for idx := 0 to High(panels) do + begin + if not (drawDoors xor panels[idx].Door) then + begin + 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; + 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 + //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(gWalls); - PANEL_CLOSEDOOR: DrawPanels(gWalls, True); - PANEL_BACK: DrawPanels(gRenderBackgrounds); - PANEL_FORE: DrawPanels(gRenderForegrounds); - PANEL_WATER: DrawPanels(gWater); - PANEL_ACID1: DrawPanels(gAcid1); - PANEL_ACID2: DrawPanels(gAcid2); - PANEL_STEP: DrawPanels(gSteps); + 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); + + (* old + procedure drawPanels (var panels: TPanelArray); + var + a: Integer; + begin + if panels <> nil then + begin + for a := 0 to High(panels) do + begin + panels[a].DrawShadowVolume(lightX, lightY, radius); + end; + end; + end; + *) +var + idx: Integer; +begin + (* + drawPanels(gWalls); + //drawPanels(gRenderForegrounds); + *) + for idx := 0 to plpcount-1 do + begin + gWalls[plpset[idx]].DrawShadowVolume(lightX, lightY, radius); end; end; @@ -1694,7 +1981,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; @@ -1814,6 +2101,121 @@ begin 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; @@ -2287,4 +2689,15 @@ begin ///// ///// end; +function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel; +var + Arr: TPanelArray; +begin + Result := nil; + if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit; + Arr := PanelByID[PanelID].PWhere^; + PanelArrayID := PanelByID[PanelID].PArrID; + Result := Addr(Arr[PanelByID[PanelID].PArrID]); +end; + end.