Restore PalettedDrawNoDepth shader

Author: Rampastring

src/TSMapEditor/Constants.cs

@@ -4,7 +4,7 @@ namespace TSMapEditor
 {
     public static class Constants
     {
-        public const string ReleaseVersion = "1.6.4";
+        public const string ReleaseVersion = "1.6.5";
 
         public static int CellSizeX = 48;
         public static int CellSizeY = 24;

src/TSMapEditor/Content/Content.mgcb

@@ -31,6 +31,12 @@
 /processorParam:DebugMode=Auto
 /build:Shaders/PalettedColorDraw.fx
 
+#begin Shaders/PalettedDrawNoDepth.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:Shaders/PalettedDrawNoDepth.fx
+
 #begin Shaders/PalettedTerrainDraw.fx
 /importer:EffectImporter
 /processor:EffectProcessor

src/TSMapEditor/Content/Shaders/PalettedDrawNoDepth.fx

@@ -0,0 +1,59 @@
+#pragma enable_d3d11_debug_symbols
+
+#if OPENGL
+#define SV_POSITION POSITION
+#define VS_SHADERMODEL vs_3_0
+#define PS_SHADERMODEL ps_3_0
+#else
+#define VS_SHADERMODEL vs_4_0
+#define PS_SHADERMODEL ps_4_0
+#endif
+
+// Used for drawing paletted graphics in contexts where no depth is required.
+// Particularly, the overlay frame selector.
+
+float4 Lighting;
+
+sampler2D SpriteTextureSampler : register(s0)
+{
+    Texture = (SpriteTexture); // this is set by spritebatch
+    MipFilter = Point;
+    MinFilter = Point;
+    MagFilter = Point;
+};
+
+Texture2D PaletteTexture;
+sampler2D PaletteTextureSampler
+{
+    Texture = <PaletteTexture>; // passed in
+    AddressU = wrap;
+    AddressV = wrap;
+    MipFilter = Point;
+    MinFilter = Point;
+    MagFilter = Point;
+};
+
+struct VertexShaderOutput
+{
+    float4 Position : SV_POSITION;
+    float4 Color : COLOR0;
+    float2 TextureCoordinates : TEXCOORD0;
+};
+
+float4 MainPS(VertexShaderOutput input) : COLOR
+{
+    float4 tex = tex2D(SpriteTextureSampler, input.TextureCoordinates);
+
+    // Get color from palette
+    float4 paletteColor = tex2D(PaletteTextureSampler, float2(tex.a, 0.5));
+
+    return paletteColor * Lighting;
+}
+
+technique SpriteDrawing
+{
+    pass P0
+    {
+        PixelShader = compile PS_SHADERMODEL MainPS();
+    }
+};

src/TSMapEditor/UI/OverlayFrameSelector.cs

@@ -4,6 +4,7 @@
 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using TSMapEditor.Models;
 using TSMapEditor.Rendering;
 
@@ -99,7 +100,7 @@ public override void Initialize()
             BackgroundTexture = AssetLoader.CreateTexture(new Color(0, 0, 0, 196), 2, 2);
             PanelBackgroundDrawMode = PanelBackgroundImageDrawMode.STRETCHED;
 
-            palettedDrawEffect = AssetLoader.LoadEffect("Shaders/PalettedDrawNoDepth");
+            palettedDrawEffect = AssetLoader.LoadEffect("Shaders/PalettedDrawNoDepth") ?? throw new FileNotFoundException("Shader not found: PalettedDrawNoDepth");
 
             KeyboardCommands.Instance.NextTile.Triggered += NextTile_Triggered;
             KeyboardCommands.Instance.PreviousTile.Triggered += PreviousTile_Triggered;

src/TSMapEditor/UI/TileDisplay.cs

@@ -5,6 +5,7 @@
 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using TSMapEditor.CCEngine;
 using TSMapEditor.Models;
 using TSMapEditor.Rendering;
@@ -93,7 +94,7 @@ public override void Initialize()
             BackgroundTexture = AssetLoader.CreateTexture(new Color(0, 0, 0, 196), 2, 2);
             PanelBackgroundDrawMode = PanelBackgroundImageDrawMode.STRETCHED;
 
-            palettedDrawEffect = AssetLoader.LoadEffect("Shaders/PalettedDrawNoDepth");
+            palettedDrawEffect = AssetLoader.LoadEffect("Shaders/PalettedDrawNoDepth") ?? throw new FileNotFoundException("Shader not found: PalettedDrawNoDepth"); ;
 
             KeyboardCommands.Instance.NextTile.Action = NextTile;
             KeyboardCommands.Instance.PreviousTile.Action = PreviousTile;