From 55b439f7431ffc3b0bdb625aca49a7b05e287f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Wed, 14 May 2014 13:58:11 +0200 Subject: [PATCH] Ecken der Seen werden jetzt tteilweise rund gezeichnet --- src/Gui/MapPanel.cs | 35 ++++++++++++++++++++++++++++++++--- textures/water_botleft.png | Bin 0 -> 1978 bytes textures/water_botright.png | Bin 0 -> 1849 bytes textures/water_topleft.png | Bin 0 -> 1929 bytes textures/water_topright.png | Bin 0 -> 1824 bytes 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 textures/water_botleft.png create mode 100644 textures/water_botright.png create mode 100644 textures/water_topleft.png create mode 100644 textures/water_topright.png diff --git a/src/Gui/MapPanel.cs b/src/Gui/MapPanel.cs index cd0202a..1f30eda 100644 --- a/src/Gui/MapPanel.cs +++ b/src/Gui/MapPanel.cs @@ -23,8 +23,12 @@ namespace WorldOfPeacecraft private Image ForestBottom; private Image Knight; private Image Walkable; - private Image Water; private Image Flowers; + private Image Water; + private Image WaterInnerTopLeft; + private Image WaterInnerTopRight; + private Image WaterInnerBotLeft; + private Image WaterInnerBotRight; private Image WallBase; private Image WallEdgeTopLeft; private Image WallEdgeTopRight; @@ -149,7 +153,6 @@ namespace WorldOfPeacecraft } else { PaintImage (g, x, y, Walkable); - PaintWallInnerEdge(g, locx, locy, x, y, map); bool beachPlaced = false; if (NullsafeIsWater(locx - 1, locy, map)) { PaintImage(g, x, y, BeachLeft); @@ -193,6 +196,8 @@ namespace WorldOfPeacecraft } } + PaintWaterInnerEdge(g, locx, locy, x, y, map); + PaintWallInnerEdge(g, locx, locy, x, y, map); } if (tile.IsForest ()) { if (tile.IsHuntable ()) { @@ -243,6 +248,26 @@ namespace WorldOfPeacecraft } } + private void PaintWaterInnerEdge (Graphics g, int locx, int locy, int x, int y, ITile[,] map) + { + bool topWater = NullsafeIsWater (locx, locy - 1, map); + bool rightWater = NullsafeIsWater (locx + 1, locy, map); + bool botWater = NullsafeIsWater (locx, locy + 1, map); + bool leftWater = NullsafeIsWater (locx - 1, locy, map); + if (leftWater) { + if (topWater) + PaintImage (g, x, y, WaterInnerTopLeft); + if (botWater) + PaintImage (g, x, y, WaterInnerBotLeft); + } + if (rightWater) { + if (topWater) + PaintImage (g, x, y, WaterInnerTopRight); + if (botWater) + PaintImage (g, x, y, WaterInnerBotRight); + } + } + private void DrawWallEdge (Graphics g, int water, int x, int y, int offsetx, int offsety, Image edgeImage, Image cornerImage, Image beachImage) { if (water == -1) @@ -354,7 +379,6 @@ namespace WorldOfPeacecraft ForestBottom = Image.FromFile (ImagesFolder + "forest_bottom.png"); Knight = Image.FromFile (ImagesFolder + "knight.png"); Walkable = Image.FromFile (ImagesFolder + "walkable.jpg"); - Water = Image.FromFile (ImagesFolder + "water.jpg"); Flowers = Image.FromFile(ImagesFolder + "flowers.png"); BeachBottom = Image.FromFile (ImagesFolder + "beach.png"); BeachLeft = RotateFlipImage (BeachBottom, RotateFlipType.Rotate90FlipNone); @@ -377,6 +401,11 @@ namespace WorldOfPeacecraft WallInnerBotRight = Image.FromFile (ImagesFolder + "wall_inner_botright.png"); WallInnerTopLeft = Image.FromFile (ImagesFolder + "wall_inner_topleft.png"); WallInnerTopRight = Image.FromFile (ImagesFolder + "wall_inner_topright.png"); + Water = Image.FromFile (ImagesFolder + "water.jpg"); + WaterInnerTopLeft = Image.FromFile (ImagesFolder + "water_topleft.png"); + WaterInnerTopRight = Image.FromFile (ImagesFolder + "water_topright.png"); + WaterInnerBotLeft = Image.FromFile (ImagesFolder + "water_botleft.png"); + WaterInnerBotRight = Image.FromFile (ImagesFolder + "water_botright.png"); } public void InitializeComponents(){ diff --git a/textures/water_botleft.png b/textures/water_botleft.png new file mode 100644 index 0000000000000000000000000000000000000000..ae769d3dce5c411f8e38e0958435cc61a74b7355 GIT binary patch literal 1978 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 Q3=9kmp00i_>zopr0OrDd-T(jq literal 0 HcmV?d00001 diff --git a/textures/water_topleft.png b/textures/water_topleft.png new file mode 100644 index 0000000000000000000000000000000000000000..8cdbb7166140f4ce6921645d1628dcd26c0462d7 GIT binary patch literal 1929 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