# HG changeset patch
# User alys
# Date 2021-04-17 22:58:37
# Node ID 86883420e5b4ea002d843c06c7cdf058bfa09bf8
# Parent  5565d2909bef34a2563421d0ce5b8e0c52c48936

Add option to shade squares.

diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache
index c836be7abd20d7731fb9406b256968d545cc19c3..ea7981152f806327258b6d961105e05cd386fa83
GIT binary patch
literal 11415
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
K0CYg(lJkF*Erx0U

diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs
--- a/isometric-park-fna/FNAGame.cs
+++ b/isometric-park-fna/FNAGame.cs
@@ -183,9 +183,12 @@
 
         sound = Content.Load<SoundEffect>("FNASound");
         Tile.TileSetTexture = Content.Load<Texture2D>(@"part4_tileset");
+        var texture = Content.Load<Texture2D>(@"solid_tileset");
 
         Line.initialize(GraphicsDevice);
 
+        Quad.Initialize(GraphicsDevice, texture);
+
         //Has to happen before Encompass stuff, because the Encompass machinery around ImGui requires debugWindow's monoFont to be loaded:
         this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice);
 
@@ -693,6 +696,10 @@
         //donut
         Tile.DrawOutlinedSquares(batch, new Vector2[] {new Vector2(19, 1), new Vector2(19, 2), new Vector2(20, 1), new Vector2(21, 1),
                new Vector2(21, 2), new Vector2(19, 3), new Vector2(20, 3), new Vector2(21, 3)}, Color.Purple);
+
+        Quad.FillSquare2(batch, 7, 4, Color.Orange, 1.0f);
+        Quad.FillSquare2(batch, 7, 3, Color.Yellow, 1.0f);
+        Quad.FillSquare2(batch, 7, 5, Color.Yellow, .5f);
 #endif 
 
 
diff --git a/isometric-park-fna/Quad.cs b/isometric-park-fna/Quad.cs
new file mode 100644
--- /dev/null
+++ b/isometric-park-fna/Quad.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace isometricparkfna
+{
+
+    public class Quad
+    {
+        static public BasicEffect quadEffect;
+        static VertexPositionTexture[] vert;
+        static short[] ind;
+
+        public static Texture2D PixelTexture;
+        public static Texture2D SolidTexture;
+
+
+        public static void Initialize(GraphicsDevice device, Texture2D texture)
+        {
+            Quad.quadEffect = new BasicEffect(device);
+            Quad.quadEffect.TextureEnabled = true;
+
+            Quad.vert = new VertexPositionTexture[4];
+            Quad.ind = new short[6];
+            ind[0] = 0;
+            ind[1] = 2;
+            ind[2] = 1;
+            ind[3] = 1;
+            ind[4] = 2;
+            ind[5] = 3;
+
+            Quad.PixelTexture = new Texture2D(device, 1, 1);
+            Quad.SolidTexture = texture;
+        }
+
+        static public void FillSquare(GraphicsDevice device, int x, int y, Color color, float alpha)
+        {
+
+            // Vector2 adjust2 = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved
+            //
+            var startX = ((x - y) * Tile.TileSpriteWidth / 2) + (Tile.TileSpriteWidth / 2);
+            var startY = (x + y) * Tile.TileSpriteHeight / 2 + (Tile.TileSpriteHeight);
+            startX = 0;
+            startY = 10;
+            //
+            // Rectangle rect = new Rectangle(startX, startY, Tile.TileSpriteWidth / 2, (int)(Tile.TileSpriteHeight * 0.75));
+            // batch.Draw(Line.PixelTexture, rect, null, color, 0.785f, new Vector2(0,0), SpriteEffects.None, 0.79f);
+            //
+
+            // vert[0].Position = new Vector3(startX, startY, 0);
+            // vert[1].Position = new Vector3(startX+Tile.TileSpriteWidth, startY, 0);
+            // vert[2].Position = new Vector3(startX, startY+Tile.TileSpriteHeight, 0);
+            // vert[3].Position = new Vector3(startX+Tile.TileSpriteWidth, startY+Tile.TileSpriteHeight, 0);
+            vert[0].Position = new Vector3(startX, startY, 0);
+            vert[1].Position = new Vector3(startX + 100, startY, 0);
+            vert[2].Position = new Vector3(startX, startY + 100, 0);
+            vert[3].Position = new Vector3(startX + 100, startY + 100, 0);
+
+
+
+            vert[0].TextureCoordinate = new Vector2(0, 0);
+            vert[1].TextureCoordinate = new Vector2(1, 0);
+            vert[2].TextureCoordinate = new Vector2(0, 1);
+            vert[3].TextureCoordinate = new Vector2(1, 1);
+            var PixelTexture = new Texture2D(device, 1, 1);
+
+            PixelTexture.SetData<Color>(new Color[] { color });
+
+            quadEffect.Texture = PixelTexture;
+
+
+            foreach (EffectPass effectPass in Quad.quadEffect.CurrentTechnique.Passes)
+            {
+                effectPass.Apply();
+                device.DrawUserIndexedPrimitives<VertexPositionTexture>(
+                        PrimitiveType.TriangleList, Quad.vert, 0, Quad.vert.Length, Quad.ind, 0, Quad.ind.Length / 3);
+            }
+        }
+
+        public static void FillSquare2(SpriteBatch batch, int x, int y, Color color, float alpha)
+        {
+            var height = 1;
+            var depth = 0.79f;
+
+            int height_adjust = 0;
+
+            if (height > 1) //not sure why this is necessary :/
+            {
+                height_adjust = height;
+            }
+
+            int adjustedx = x - height_adjust;
+            int adjustedy = y - height_adjust;
+
+            int screenx = (adjustedx - adjustedy) * Tile.TileSpriteWidth / 2;
+            int screeny = (adjustedx + adjustedy) * Tile.TileSpriteHeight / 2;
+
+            PixelTexture.SetData<Color>(new Color[] { color });
+
+            // color.A = (byte)(alpha*255.0f);
+            color *= alpha;
+
+            // if (this.cull(x, y))
+            // {
+            batch.Draw(
+                    Quad.SolidTexture,
+                        new Rectangle(
+                                screenx,
+                                screeny,
+                                Tile.TileWidth, Tile.TileHeight * height),
+                    // Tile.GetExtendedSourceRectangle(tileIndex, height),
+                    // new Rectangle(0, 0, 1, 1),
+                    // null,
+                    Tile.GetExtendedSourceRectangle(0, height),
+                    // Color.White,
+                    color,
+                        0.0f,
+                        Vector2.Zero,
+                        SpriteEffects.None,
+                        depth);
+            // }
+
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/isometric-park-fna/Tile.cs b/isometric-park-fna/Tile.cs
--- a/isometric-park-fna/Tile.cs
+++ b/isometric-park-fna/Tile.cs
@@ -46,10 +46,16 @@
 
         static public Texture2D TileSetTexture;
 
+
+
+
         public Tile()
         {
+
         }
 
+
+
         static public Rectangle GetSourceRectangle(int tileIndex)
         {
             int tileY = tileIndex / (TileSetTexture.Width / TileWidth);
@@ -66,6 +72,8 @@
             return new Rectangle(tileX * TileWidth, tileY * TileHeight, TileWidth, TileHeight*height);
         }
 
+
+
         static public void OutlineSquare(SpriteBatch batch, float x, float y, Color color)
         {
             Tile.OutlineSquare(batch, x, y, color, 1);
diff --git a/isometric-park-fna/isometric-park-fna.csproj b/isometric-park-fna/isometric-park-fna.csproj
--- a/isometric-park-fna/isometric-park-fna.csproj
+++ b/isometric-park-fna/isometric-park-fna.csproj
@@ -37,6 +37,7 @@
     <Compile Include="Tile.cs" />
     <Compile Include="CellMap.cs" />
     <Compile Include="Line.cs" />
+    <Compile Include="Quad.cs" />
     <Compile Include="Camera.cs" />
     <Compile Include="DrawVertDeclaration.cs" />
     <Compile Include="ImGuiRenderer.cs" />
@@ -89,6 +90,9 @@
     <None Include="Content\part4_tileset.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\solild_tileset.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\iosevka-medium.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>