X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Fg_map.pas;h=6c6f191e3e816b20f2a71d2899c6b51403f2a29c;hb=f9041cfd23f3f5eff7e56f2960c7a571bb3c4607;hp=d461fd818d8de50f3452d2c0b510e86a85e3f12e;hpb=5fd28f40b978042653b18006bd33ff5c93152518;p=d2df-editor.git diff --git a/src/editor/g_map.pas b/src/editor/g_map.pas index d461fd8..6c6f191 100644 --- a/src/editor/g_map.pas +++ b/src/editor/g_map.pas @@ -2075,6 +2075,39 @@ begin end; end; +procedure DrawContours (fPanelType: Word); + var i, xx, yy, ww, hh: Integer; +begin + if gPanels <> nil then + for i := 0 to High(gPanels) do + if (gPanels[i].PanelType <> 0) and WordBool(gPanels[i].PanelType and fPanelType) then + begin + xx := gPanels[i].X + MapOffset.X; + yy := gPanels[i].Y + MapOffset.Y; + ww := gPanels[i].X + MapOffset.X + gPanels[i].Width - 1; + hh := gPanels[i].Y + MapOffset.Y + gPanels[i].Height - 1; + case gPanels[i].PanelType of + PANEL_NONE: ; + PANEL_WALL: e_DrawQuad(xx, yy, ww, hh, 208, 208, 208, 0); + PANEL_BACK: e_DrawQuad(xx, yy, ww, hh, 64, 64, 64, 0); + PANEL_FORE: e_DrawQuad(xx, yy, ww, hh, 128, 128, 128, 0); + PANEL_WATER: e_DrawQuad(xx, yy, ww, hh, 0, 0, 192, 0); + PANEL_ACID1: e_DrawQuad(xx, yy, ww, hh, 0, 176, 0, 0); + PANEL_ACID2: e_DrawQuad(xx, yy, ww, hh, 176, 0, 0, 0); + PANEL_STEP: e_DrawQuad(xx, yy, ww, hh, 128, 128, 128, 0); + PANEL_LIFTUP: e_DrawQuad(xx, yy, ww, hh, 116, 72, 36, 0); + PANEL_LIFTDOWN: e_DrawQuad(xx, yy, ww, hh, 116, 124, 96, 0); + PANEL_OPENDOOR: e_DrawQuad(xx, yy, ww, hh, 100, 220, 92, 0); + PANEL_CLOSEDOOR: e_DrawQuad(xx, yy, ww, hh, 212, 184, 64, 0); + PANEL_BLOCKMON: e_DrawQuad(xx, yy, ww, hh, 192, 0, 192, 0); + PANEL_LIFTLEFT: e_DrawQuad(xx, yy, ww, hh, 200, 80, 4, 0); + PANEL_LIFTRIGHT: e_DrawQuad(xx, yy, ww, hh, 252, 140, 56, 0); + else + assert(false) + end; + end; +end; + procedure DrawMap(); var a, w, h: Integer; @@ -2083,7 +2116,7 @@ var ww, hh: Word; sel: Boolean; r: TRectWH; - + mask: Word; begin ID := 0; // В режиме Превью рисуем небо: @@ -2627,28 +2660,85 @@ begin end; end; +// Draw panel contours + mask := 0; + if ContourEnabled[LAYER_BACK] then + mask := mask or PANEL_BACK; + if ContourEnabled[LAYER_WALLS] then + mask := mask or PANEL_WALL; + if ContourEnabled[LAYER_FOREGROUND] then + mask := mask or PANEL_FORE; + if ContourEnabled[LAYER_STEPS] then + mask := mask or PANEL_STEP; + if ContourEnabled[LAYER_WATER] then + mask := mask or PANEL_WATER or PANEL_ACID1 or PANEL_ACID2 + or PANEL_OPENDOOR or PANEL_CLOSEDOOR or PANEL_BLOCKMON + or PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT; + if mask <> 0 then + DrawContours(mask); + if ContourEnabled[LAYER_ITEMS] and (gItems <> nil) then + for a := 0 to High(gItems) do + if gItems[a].ItemType <> ITEM_NONE then + e_DrawQuad( + MapOffset.X + gItems[a].X, + MapOffset.Y + gItems[a].Y, + MapOffset.X + gItems[a].X + ItemSize[gItems[a].ItemType, 0] - 1, + MapOffset.Y + gItems[a].Y + ItemSize[gItems[a].ItemType, 1] - 1, + 0, 255, 255 + ); + if ContourEnabled[LAYER_MONSTERS] and (gMonsters <> nil) then + for a := 0 to High(gMonsters) do + if gMonsters[a].MonsterType <> MONSTER_NONE then + e_DrawQuad( + MapOffset.X + gMonsters[a].X, + MapOffset.Y + gMonsters[a].Y, + MapOffset.X + gMonsters[a].X + MonsterSize[gMonsters[a].MonsterType].Width - 1, + MapOffset.Y + gMonsters[a].Y + MonsterSize[gMonsters[a].MonsterType].Height - 1, + 200, 0, 0 + ); + if ContourEnabled[LAYER_AREAS] and (gAreas <> nil) then + for a := 0 to High(gAreas) do + if gAreas[a].AreaType <> AREA_NONE then + e_DrawQuad( + MapOffset.X + gAreas[a].X, + MapOffset.Y + gAreas[a].Y, + MapOffset.X + gAreas[a].X + AreaSize[gAreas[a].AreaType].Width - 1, + MapOffset.Y + gAreas[a].Y + AreaSize[gAreas[a].AreaType].Height - 1, + 0, 255, 255 + ); + if ContourEnabled[LAYER_TRIGGERS] and (gTriggers <> nil) then + for a := 0 to High(gTriggers) do + if gTriggers[a].TriggerType <> TRIGGER_NONE then + e_DrawQuad( + MapOffset.X + gTriggers[a].X, + MapOffset.Y + gTriggers[a].Y, + MapOffset.X + gTriggers[a].X + gTriggers[a].Width - 1, + MapOffset.Y + gTriggers[a].Y + gTriggers[a].Height - 1, + 255, 255, 0 + ); + // Границы карты: if PreviewMode = 0 then begin - e_DrawFillQuad(-32+MapOffset.X, - -32+MapOffset.Y, - gMapInfo.Width+31+MapOffset.X, - -1+MapOffset.Y, + e_DrawFillQuad(0, + 0, + MainForm.RenderPanel.Width, + -1 + MapOffset.Y, drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Top - e_DrawFillQuad(-32+MapOffset.X, - gMapInfo.Height+MapOffset.Y, - gMapInfo.Width+31+MapOffset.X, - gMapInfo.Height+31+MapOffset.Y, + e_DrawFillQuad(0, + gMapInfo.Height + MapOffset.Y, + MainForm.RenderPanel.Width, + MainForm.RenderPanel.Height, drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Bottom - e_DrawFillQuad(-32+MapOffset.X, + e_DrawFillQuad(0, MapOffset.Y, - -1+MapOffset.X, - gMapInfo.Height+MapOffset.Y-1, + -1 + MapOffset.X, + gMapInfo.Height + MapOffset.Y - 1, drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Left - e_DrawFillQuad(gMapInfo.Width+MapOffset.X, + e_DrawFillQuad(gMapInfo.Width + MapOffset.X, MapOffset.Y, - gMapInfo.Width+31+MapOffset.X, - gMapInfo.Height+MapOffset.Y-1, + MainForm.RenderPanel.Width, + gMapInfo.Height + MapOffset.Y - 1, drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Right end; end;