From 7a306cac6903e9d7d7c4f31dabf8d23af12bca1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= <simon.luebess@gmail.com>
Date: Tue, 11 Feb 2025 23:07:04 +0100
Subject: [PATCH] Separate handling for hlsl and fx files

---
 GlitchyEditor/resources/Shaders/ACES.hlsl.ass |  11 -----------
 .../Shaders/{ClearUInt.hlsl => ClearUInt.fx}  |   0
 ...tGroupViewer.hlsl.ass => ClearUInt.fx.ass} |   2 +-
 .../{GammaCorrect.hlsl => GammaCorrect.fx}    |   2 ++
 ...ClearUInt.hlsl.ass => GammaCorrect.fx.ass} |   2 +-
 .../resources/Shaders/GlitchyEngine.hlsl.ass  |  11 -----------
 .../Shaders/GlitchyEngine2D.hlsl.ass          |  11 -----------
 .../Shaders/LightingFunctions.hlsl.ass        |  11 -----------
 GlitchyEditor/resources/Shaders/PBR.hlsl.ass  |  11 -----------
 ...Viewer.hlsl => RenderTargetGroupViewer.fx} |   0
 .../Shaders/RenderTargetGroupViewer.fx.ass    |  13 +++++++++++++
 .../resources/Shaders/ShaderHelpers.hlsl.ass  |  11 -----------
 ...eTonemapping.hlsl => SimpleTonemapping.fx} |   0
 .../Shaders/SimpleTonemapping.fx.ass          |  13 +++++++++++++
 .../{circlebatch.hlsl => circlebatch.fx}      |   0
 .../resources/Shaders/circlebatch.fx.ass      |  13 +++++++++++++
 .../resources/Shaders/circlebatch.hlsl.ass    |  13 -------------
 .../{lineShader.hlsl => lineShader.fx}        |   0
 .../resources/Shaders/lineShader.fx.ass       |  13 +++++++++++++
 .../resources/Shaders/lineShader.hlsl.ass     |  13 -------------
 .../Shaders/{linebatch.hlsl => linebatch.fx}  |   0
 ...eTonemapping.hlsl.ass => linebatch.fx.ass} |   2 +-
 .../resources/Shaders/linebatch.hlsl.ass      |  13 -------------
 .../{msdfShader.hlsl => msdfShader.fx}        |   0
 ...ammaCorrect.hlsl.ass => msdfShader.fx.ass} |   2 +-
 .../resources/Shaders/msdfShader.hlsl.ass     |  13 -------------
 .../Shaders/{myEffect.hlsl => myEffect.fx}    |   0
 .../resources/Shaders/myEffect.fx.ass         |  13 +++++++++++++
 .../resources/Shaders/myEffect.hlsl.ass       |  13 -------------
 .../{simpleLight.hlsl => simpleLight.fx}      |   0
 .../resources/Shaders/simpleLight.fx.ass      |  13 +++++++++++++
 .../resources/Shaders/simpleLight.hlsl.ass    |  13 -------------
 .../{spritebatch.hlsl => spritebatch.fx}      |   0
 .../resources/Shaders/spritebatch.fx.ass      |  13 +++++++++++++
 .../resources/Shaders/spritebatch.hlsl.ass    |  13 -------------
 ...ewerShader.hlsl => textureViewerShader.fx} |   0
 .../Shaders/textureViewerShader.fx.ass        |  13 +++++++++++++
 .../Shaders/textureViewerShader.hlsl.ass      |  13 -------------
 .../resources/Textures/EditorIcons.dds        | Bin 344192 -> 360576 bytes
 .../resources/Textures/EditorIcons.psd        | Bin 89758 -> 93705 bytes
 .../src/Assets/AssetThumbnailManager.bf       |   9 +++++----
 .../src/Assets/Importers/ShaderImporter.bf    |   2 +-
 .../src/Assets/Processors/ShaderCompiler.bf   |   1 +
 .../src/Assets/Processors/ShaderProcessor.bf  |   9 ++++++++-
 GlitchyEditor/src/EditWindows/AssetViewer.bf  |   4 ++--
 GlitchyEditor/src/EditorIcons.bf              |   6 ++++--
 GlitchyEditor/src/EditorLayer.bf              |  16 ++++++++++++++++
 .../Platform/DX11/Renderer/Dx11RendererAPI.bf |   2 +-
 GlitchyEngine/src/Renderer/Renderer.bf        |   6 ++----
 GlitchyEngine/src/Renderer/Renderer2D.bf      |   6 +++---
 .../src/Renderer/Text/FontRenderer.bf         |   2 +-
 GlitchyEngine/src/World/SceneRenderer.bf      |   2 +-
 52 files changed, 155 insertions(+), 194 deletions(-)
 delete mode 100644 GlitchyEditor/resources/Shaders/ACES.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{ClearUInt.hlsl => ClearUInt.fx} (100%)
 rename GlitchyEditor/resources/Shaders/{RenderTargetGroupViewer.hlsl.ass => ClearUInt.fx.ass} (85%)
 rename GlitchyEditor/resources/Shaders/{GammaCorrect.hlsl => GammaCorrect.fx} (91%)
 rename GlitchyEditor/resources/Shaders/{ClearUInt.hlsl.ass => GammaCorrect.fx.ass} (85%)
 delete mode 100644 GlitchyEditor/resources/Shaders/GlitchyEngine.hlsl.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/GlitchyEngine2D.hlsl.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/LightingFunctions.hlsl.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/PBR.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{RenderTargetGroupViewer.hlsl => RenderTargetGroupViewer.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/ShaderHelpers.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{SimpleTonemapping.hlsl => SimpleTonemapping.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/SimpleTonemapping.fx.ass
 rename GlitchyEditor/resources/Shaders/{circlebatch.hlsl => circlebatch.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/circlebatch.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/circlebatch.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{lineShader.hlsl => lineShader.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/lineShader.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/lineShader.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{linebatch.hlsl => linebatch.fx} (100%)
 rename GlitchyEditor/resources/Shaders/{SimpleTonemapping.hlsl.ass => linebatch.fx.ass} (85%)
 delete mode 100644 GlitchyEditor/resources/Shaders/linebatch.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{msdfShader.hlsl => msdfShader.fx} (100%)
 rename GlitchyEditor/resources/Shaders/{GammaCorrect.hlsl.ass => msdfShader.fx.ass} (85%)
 delete mode 100644 GlitchyEditor/resources/Shaders/msdfShader.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{myEffect.hlsl => myEffect.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/myEffect.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/myEffect.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{simpleLight.hlsl => simpleLight.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/simpleLight.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/simpleLight.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{spritebatch.hlsl => spritebatch.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/spritebatch.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/spritebatch.hlsl.ass
 rename GlitchyEditor/resources/Shaders/{textureViewerShader.hlsl => textureViewerShader.fx} (100%)
 create mode 100644 GlitchyEditor/resources/Shaders/textureViewerShader.fx.ass
 delete mode 100644 GlitchyEditor/resources/Shaders/textureViewerShader.hlsl.ass

diff --git a/GlitchyEditor/resources/Shaders/ACES.hlsl.ass b/GlitchyEditor/resources/Shaders/ACES.hlsl.ass
deleted file mode 100644
index 7c6562f..0000000
--- a/GlitchyEditor/resources/Shaders/ACES.hlsl.ass
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = null,
-	AssetHandle = 5221334043827499251
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/ClearUInt.hlsl b/GlitchyEditor/resources/Shaders/ClearUInt.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/ClearUInt.hlsl
rename to GlitchyEditor/resources/Shaders/ClearUInt.fx
diff --git a/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.hlsl.ass b/GlitchyEditor/resources/Shaders/ClearUInt.fx.ass
similarity index 85%
rename from GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.hlsl.ass
rename to GlitchyEditor/resources/Shaders/ClearUInt.fx.ass
index e4696e9..131e21f 100644
--- a/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.hlsl.ass
+++ b/GlitchyEditor/resources/Shaders/ClearUInt.fx.ass
@@ -9,5 +9,5 @@
 	ExporterConfig = {
 		_compression = .None
 	},
-	AssetHandle = 5246795156071151642
+	AssetHandle = 3971197750817239312
 }
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/GammaCorrect.hlsl b/GlitchyEditor/resources/Shaders/GammaCorrect.fx
similarity index 91%
rename from GlitchyEditor/resources/Shaders/GammaCorrect.hlsl
rename to GlitchyEditor/resources/Shaders/GammaCorrect.fx
index 7c19dfd..9a4b909 100644
--- a/GlitchyEditor/resources/Shaders/GammaCorrect.hlsl
+++ b/GlitchyEditor/resources/Shaders/GammaCorrect.fx
@@ -1,3 +1,5 @@
+// TODO: General pipeline for post processing effects
+
 Texture2D Texture : register(t0);
 SamplerState TextureSampler : register(s0);
 
diff --git a/GlitchyEditor/resources/Shaders/ClearUInt.hlsl.ass b/GlitchyEditor/resources/Shaders/GammaCorrect.fx.ass
similarity index 85%
rename from GlitchyEditor/resources/Shaders/ClearUInt.hlsl.ass
rename to GlitchyEditor/resources/Shaders/GammaCorrect.fx.ass
index af7e98f..dffb1a0 100644
--- a/GlitchyEditor/resources/Shaders/ClearUInt.hlsl.ass
+++ b/GlitchyEditor/resources/Shaders/GammaCorrect.fx.ass
@@ -9,5 +9,5 @@
 	ExporterConfig = {
 		_compression = .None
 	},
-	AssetHandle = 8512375832990505152
+	AssetHandle = 315199643377983302
 }
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/GlitchyEngine.hlsl.ass b/GlitchyEditor/resources/Shaders/GlitchyEngine.hlsl.ass
deleted file mode 100644
index 03f296d..0000000
--- a/GlitchyEditor/resources/Shaders/GlitchyEngine.hlsl.ass
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = null,
-	AssetHandle = 9285471614459748654
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/GlitchyEngine2D.hlsl.ass b/GlitchyEditor/resources/Shaders/GlitchyEngine2D.hlsl.ass
deleted file mode 100644
index cad2e67..0000000
--- a/GlitchyEditor/resources/Shaders/GlitchyEngine2D.hlsl.ass
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = null,
-	AssetHandle = 9184910549692735900
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/LightingFunctions.hlsl.ass b/GlitchyEditor/resources/Shaders/LightingFunctions.hlsl.ass
deleted file mode 100644
index 7d231ab..0000000
--- a/GlitchyEditor/resources/Shaders/LightingFunctions.hlsl.ass
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = null,
-	AssetHandle = 1287916870077203420
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/PBR.hlsl.ass b/GlitchyEditor/resources/Shaders/PBR.hlsl.ass
deleted file mode 100644
index 4dcd336..0000000
--- a/GlitchyEditor/resources/Shaders/PBR.hlsl.ass
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = null,
-	AssetHandle = 9019615224633186177
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.hlsl b/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.hlsl
rename to GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.fx
diff --git a/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.fx.ass b/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.fx.ass
new file mode 100644
index 0000000..c883cfc
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 17953005509950866729
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/ShaderHelpers.hlsl.ass b/GlitchyEditor/resources/Shaders/ShaderHelpers.hlsl.ass
deleted file mode 100644
index 928d30a..0000000
--- a/GlitchyEditor/resources/Shaders/ShaderHelpers.hlsl.ass
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = null,
-	AssetHandle = 10014069858860408945
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/SimpleTonemapping.hlsl b/GlitchyEditor/resources/Shaders/SimpleTonemapping.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/SimpleTonemapping.hlsl
rename to GlitchyEditor/resources/Shaders/SimpleTonemapping.fx
diff --git a/GlitchyEditor/resources/Shaders/SimpleTonemapping.fx.ass b/GlitchyEditor/resources/Shaders/SimpleTonemapping.fx.ass
new file mode 100644
index 0000000..011734a
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/SimpleTonemapping.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 16539769359681819317
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/circlebatch.hlsl b/GlitchyEditor/resources/Shaders/circlebatch.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/circlebatch.hlsl
rename to GlitchyEditor/resources/Shaders/circlebatch.fx
diff --git a/GlitchyEditor/resources/Shaders/circlebatch.fx.ass b/GlitchyEditor/resources/Shaders/circlebatch.fx.ass
new file mode 100644
index 0000000..66bf1ed
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/circlebatch.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 15706760057808399494
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/circlebatch.hlsl.ass b/GlitchyEditor/resources/Shaders/circlebatch.hlsl.ass
deleted file mode 100644
index e74625a..0000000
--- a/GlitchyEditor/resources/Shaders/circlebatch.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 4179932137221776017
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/lineShader.hlsl b/GlitchyEditor/resources/Shaders/lineShader.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/lineShader.hlsl
rename to GlitchyEditor/resources/Shaders/lineShader.fx
diff --git a/GlitchyEditor/resources/Shaders/lineShader.fx.ass b/GlitchyEditor/resources/Shaders/lineShader.fx.ass
new file mode 100644
index 0000000..083fa38
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/lineShader.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 10636491756936205086
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/lineShader.hlsl.ass b/GlitchyEditor/resources/Shaders/lineShader.hlsl.ass
deleted file mode 100644
index 4efbec5..0000000
--- a/GlitchyEditor/resources/Shaders/lineShader.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 8912920142436784175
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/linebatch.hlsl b/GlitchyEditor/resources/Shaders/linebatch.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/linebatch.hlsl
rename to GlitchyEditor/resources/Shaders/linebatch.fx
diff --git a/GlitchyEditor/resources/Shaders/SimpleTonemapping.hlsl.ass b/GlitchyEditor/resources/Shaders/linebatch.fx.ass
similarity index 85%
rename from GlitchyEditor/resources/Shaders/SimpleTonemapping.hlsl.ass
rename to GlitchyEditor/resources/Shaders/linebatch.fx.ass
index fe8a7eb..504b374 100644
--- a/GlitchyEditor/resources/Shaders/SimpleTonemapping.hlsl.ass
+++ b/GlitchyEditor/resources/Shaders/linebatch.fx.ass
@@ -9,5 +9,5 @@
 	ExporterConfig = {
 		_compression = .None
 	},
-	AssetHandle = 6905134680069212587
+	AssetHandle = 5888610203248969416
 }
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/linebatch.hlsl.ass b/GlitchyEditor/resources/Shaders/linebatch.hlsl.ass
deleted file mode 100644
index 2ba60d8..0000000
--- a/GlitchyEditor/resources/Shaders/linebatch.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 18151489828256118978
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/msdfShader.hlsl b/GlitchyEditor/resources/Shaders/msdfShader.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/msdfShader.hlsl
rename to GlitchyEditor/resources/Shaders/msdfShader.fx
diff --git a/GlitchyEditor/resources/Shaders/GammaCorrect.hlsl.ass b/GlitchyEditor/resources/Shaders/msdfShader.fx.ass
similarity index 85%
rename from GlitchyEditor/resources/Shaders/GammaCorrect.hlsl.ass
rename to GlitchyEditor/resources/Shaders/msdfShader.fx.ass
index c257f97..fda4145 100644
--- a/GlitchyEditor/resources/Shaders/GammaCorrect.hlsl.ass
+++ b/GlitchyEditor/resources/Shaders/msdfShader.fx.ass
@@ -9,5 +9,5 @@
 	ExporterConfig = {
 		_compression = .None
 	},
-	AssetHandle = 4332390465159443321
+	AssetHandle = 9062891433306436746
 }
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/msdfShader.hlsl.ass b/GlitchyEditor/resources/Shaders/msdfShader.hlsl.ass
deleted file mode 100644
index e7d92b6..0000000
--- a/GlitchyEditor/resources/Shaders/msdfShader.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 8655864411897316846
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/myEffect.hlsl b/GlitchyEditor/resources/Shaders/myEffect.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/myEffect.hlsl
rename to GlitchyEditor/resources/Shaders/myEffect.fx
diff --git a/GlitchyEditor/resources/Shaders/myEffect.fx.ass b/GlitchyEditor/resources/Shaders/myEffect.fx.ass
new file mode 100644
index 0000000..34ca86f
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/myEffect.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 2172704887168568810
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/myEffect.hlsl.ass b/GlitchyEditor/resources/Shaders/myEffect.hlsl.ass
deleted file mode 100644
index 58a7d93..0000000
--- a/GlitchyEditor/resources/Shaders/myEffect.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 8873320878521542705
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/simpleLight.hlsl b/GlitchyEditor/resources/Shaders/simpleLight.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/simpleLight.hlsl
rename to GlitchyEditor/resources/Shaders/simpleLight.fx
diff --git a/GlitchyEditor/resources/Shaders/simpleLight.fx.ass b/GlitchyEditor/resources/Shaders/simpleLight.fx.ass
new file mode 100644
index 0000000..788cc2a
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/simpleLight.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 1519310858892551656
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/simpleLight.hlsl.ass b/GlitchyEditor/resources/Shaders/simpleLight.hlsl.ass
deleted file mode 100644
index 78e09ff..0000000
--- a/GlitchyEditor/resources/Shaders/simpleLight.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 14993433232700867484
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/spritebatch.hlsl b/GlitchyEditor/resources/Shaders/spritebatch.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/spritebatch.hlsl
rename to GlitchyEditor/resources/Shaders/spritebatch.fx
diff --git a/GlitchyEditor/resources/Shaders/spritebatch.fx.ass b/GlitchyEditor/resources/Shaders/spritebatch.fx.ass
new file mode 100644
index 0000000..ba7aa84
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/spritebatch.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 7757902626263730438
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/spritebatch.hlsl.ass b/GlitchyEditor/resources/Shaders/spritebatch.hlsl.ass
deleted file mode 100644
index 7a1cca2..0000000
--- a/GlitchyEditor/resources/Shaders/spritebatch.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 9671561114069837759
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/textureViewerShader.hlsl b/GlitchyEditor/resources/Shaders/textureViewerShader.fx
similarity index 100%
rename from GlitchyEditor/resources/Shaders/textureViewerShader.hlsl
rename to GlitchyEditor/resources/Shaders/textureViewerShader.fx
diff --git a/GlitchyEditor/resources/Shaders/textureViewerShader.fx.ass b/GlitchyEditor/resources/Shaders/textureViewerShader.fx.ass
new file mode 100644
index 0000000..ea9b662
--- /dev/null
+++ b/GlitchyEditor/resources/Shaders/textureViewerShader.fx.ass
@@ -0,0 +1,13 @@
+{
+	AssetLoader = null,
+	Config = null,
+	Importer = "ShaderImporter",
+	ImporterConfig = null,
+	Processor = null,
+	ProcessorConfig = null,
+	Exporter = null,
+	ExporterConfig = {
+		_compression = .None
+	},
+	AssetHandle = 8094944104856236365
+}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Shaders/textureViewerShader.hlsl.ass b/GlitchyEditor/resources/Shaders/textureViewerShader.hlsl.ass
deleted file mode 100644
index 331ee16..0000000
--- a/GlitchyEditor/resources/Shaders/textureViewerShader.hlsl.ass
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	AssetLoader = null,
-	Config = null,
-	Importer = "ShaderImporter",
-	ImporterConfig = null,
-	Processor = null,
-	ProcessorConfig = null,
-	Exporter = null,
-	ExporterConfig = {
-		_compression = .None
-	},
-	AssetHandle = 13990953346248142933
-}
\ No newline at end of file
diff --git a/GlitchyEditor/resources/Textures/EditorIcons.dds b/GlitchyEditor/resources/Textures/EditorIcons.dds
index f6c3fb157e99965999943f5007235eaf68a203fa..8d3a23a65712e81efc083f2d5d5f14b45ebd3115 100644
GIT binary patch
delta 3642
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
U>IU`{Q&*GOkpGW$^2}5J0w$f6%K!iX

delta 2876
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
DYG;SM

diff --git a/GlitchyEditor/resources/Textures/EditorIcons.psd b/GlitchyEditor/resources/Textures/EditorIcons.psd
index cd95b1d9fab7ce7bd45d0e637fd87fc30680fe31..bd55d9815b50ed60ce85c81ed5add3626f696b2d 100644
GIT binary patch
delta 5505
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

delta 2997
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
N9+jeZKeMY4{|Aqyl<@!n

diff --git a/GlitchyEditor/src/Assets/AssetThumbnailManager.bf b/GlitchyEditor/src/Assets/AssetThumbnailManager.bf
index 742fee3..c7f5ea3 100644
--- a/GlitchyEditor/src/Assets/AssetThumbnailManager.bf
+++ b/GlitchyEditor/src/Assets/AssetThumbnailManager.bf
@@ -18,14 +18,15 @@ class AssetThumbnailManager
 		if (assetNode.Path.EndsWith(".scene"))
 			return _icons.File_Scene;
 
-		if (assetNode.Path.EndsWith(".mat"))
-			return _icons.File_Material;
-
 		if (assetNode.Path.EndsWith(".cs"))
 			return _icons.File_CSharpScript;
 		
 		if (assetNode.Path.EndsWith(".hlsl"))
-			return _icons.File_Shader;
+			return _icons.File_Hlsl;
+		if (assetNode.Path.EndsWith(".fx"))
+			return _icons.File_Effect;
+		if (assetNode.Path.EndsWith(".mat"))
+			return _icons.File_Material;
 
 		return _icons.File;
 	}
diff --git a/GlitchyEditor/src/Assets/Importers/ShaderImporter.bf b/GlitchyEditor/src/Assets/Importers/ShaderImporter.bf
index 763e569..e07ea23 100644
--- a/GlitchyEditor/src/Assets/Importers/ShaderImporter.bf
+++ b/GlitchyEditor/src/Assets/Importers/ShaderImporter.bf
@@ -28,7 +28,7 @@ class ShaderImporterConfig : AssetImporterConfig
 
 class ShaderImporter : IAssetImporter
 {
-	private static readonly List<StringView> _fileExtensions = new .(){".hlsl"} ~ delete _;
+	private static readonly List<StringView> _fileExtensions = new .(){".fx"} ~ delete _;
 
 	public static List<StringView> FileExtensions => _fileExtensions;
 	
diff --git a/GlitchyEditor/src/Assets/Processors/ShaderCompiler.bf b/GlitchyEditor/src/Assets/Processors/ShaderCompiler.bf
index 34dfa78..03f335a 100644
--- a/GlitchyEditor/src/Assets/Processors/ShaderCompiler.bf
+++ b/GlitchyEditor/src/Assets/Processors/ShaderCompiler.bf
@@ -201,6 +201,7 @@ extension ShaderCompiler
 			{
 				StringView str = StringView((char8*)errorBlob.GetBufferPointer(), (int)errorBlob.GetBufferSize());
 				Log.EngineLogger.Error($"Failed to compile Shader: Error Code({(int)result}): {result} | Error Message: {str}");
+				return .Err;
 			}
 		}
 
diff --git a/GlitchyEditor/src/Assets/Processors/ShaderProcessor.bf b/GlitchyEditor/src/Assets/Processors/ShaderProcessor.bf
index 39b8c76..a8c0224 100644
--- a/GlitchyEditor/src/Assets/Processors/ShaderProcessor.bf
+++ b/GlitchyEditor/src/Assets/Processors/ShaderProcessor.bf
@@ -121,10 +121,17 @@ class ShaderProcessor : IAssetProcessor
 		// Name in Shader -> Name in Engine
 		Dictionary<StringView, StringView> engineBuffers = scope .();
 
+		ProcessedShader processedShader = null;
+
 		defer
 		{
 			ClearDictionaryAndDeleteValues!(variables);
 			ClearAndDeleteItems!(bufferNames);
+
+			if (@return case .Err)
+			{
+				delete processedShader;
+			}
 		}
 
 		String code = new String(importedShader.HlslCode);
@@ -138,7 +145,7 @@ class ShaderProcessor : IAssetProcessor
 			return .Ok;
 		}
 
-		ProcessedShader processedShader = new ProcessedShader(new AssetIdentifier(importedShader.AssetIdentifier), config.AssetHandle);
+		processedShader = new ProcessedShader(new AssetIdentifier(importedShader.AssetIdentifier), config.AssetHandle);
 
 		Try!(CompileAndReflect(vsName, psName, importedShader, code, processedShader));
 
diff --git a/GlitchyEditor/src/EditWindows/AssetViewer.bf b/GlitchyEditor/src/EditWindows/AssetViewer.bf
index 137b398..f3b3b2a 100644
--- a/GlitchyEditor/src/EditWindows/AssetViewer.bf
+++ b/GlitchyEditor/src/EditWindows/AssetViewer.bf
@@ -178,8 +178,8 @@ class TextureViewer
 
 	public this()
 	{
-		_effect = Content.LoadAsset("Resources/Shaders/textureViewerShader.hlsl", null, true);
-		AssetHandle<Effect> effect = Content.LoadAsset("Resources/Shaders/RenderTargetGroupViewer.hlsl", null, true);
+		_effect = Content.LoadAsset("Resources/Shaders/textureViewerShader.fx", null, true);
+		AssetHandle<Effect> effect = Content.LoadAsset("Resources/Shaders/RenderTargetGroupViewer.fx", null, true);
 
 		_renderTargetMaterial = new Material(effect);
 
diff --git a/GlitchyEditor/src/EditorIcons.bf b/GlitchyEditor/src/EditorIcons.bf
index f2217fc..e94959b 100644
--- a/GlitchyEditor/src/EditorIcons.bf
+++ b/GlitchyEditor/src/EditorIcons.bf
@@ -28,11 +28,12 @@ namespace GlitchyEditor
 		public SubTexture2D File_Scene ~ _.ReleaseRef();
 		public SubTexture2D File_Material ~ _.ReleaseRef();
 		public SubTexture2D File_CSharpScript ~ _.ReleaseRef();
-		public SubTexture2D File_Shader ~ _.ReleaseRef();
+		public SubTexture2D File_Effect ~ _.ReleaseRef();
 		public SubTexture2D Entity_Visible ~ _.ReleaseRef();
 		public SubTexture2D Entity_Hidden ~ _.ReleaseRef();
 		public SubTexture2D Icon_Save ~ _.ReleaseRef();
 		public SubTexture2D Icon_ContextMenu ~ _.ReleaseRef();
+		public SubTexture2D File_Hlsl ~ _.ReleaseRef();
 
 		public static EditorIcons Instance => _editorIcons;
 
@@ -66,11 +67,12 @@ namespace GlitchyEditor
 			File_Scene = GetNextGridTexture(ref pen, iconSize);
 			File_Material = GetNextGridTexture(ref pen, iconSize);
 			File_CSharpScript = GetNextGridTexture(ref pen, iconSize);
-			File_Shader = GetNextGridTexture(ref pen, iconSize);
+			File_Effect = GetNextGridTexture(ref pen, iconSize);
 			Entity_Visible = GetNextGridTexture(ref pen, iconSize);
 			Entity_Hidden = GetNextGridTexture(ref pen, iconSize);
 			Icon_Save = GetNextGridTexture(ref pen, iconSize);
 			Icon_ContextMenu = GetNextGridTexture(ref pen, iconSize);
+			File_Hlsl = GetNextGridTexture(ref pen, iconSize);
 		}
 
 		public ~this()
diff --git a/GlitchyEditor/src/EditorLayer.bf b/GlitchyEditor/src/EditorLayer.bf
index 5efd213..751afa2 100644
--- a/GlitchyEditor/src/EditorLayer.bf
+++ b/GlitchyEditor/src/EditorLayer.bf
@@ -175,6 +175,22 @@ namespace GlitchyEditor
 						SaveScene(newScene, path);
 					}
 				}, _editorIcons.File_Scene));
+			
+			Editor.Instance.ContentBrowserWindow.RegisterAssetCreator(new AssetCreator("Shader File", "New Shader", ".hlsl", new (path) =>
+				{
+					// TODO!
+				}, _editorIcons.File_Hlsl));
+
+			Editor.Instance.ContentBrowserWindow.RegisterAssetCreator(new AssetCreator("2D Effect", "New Effect", ".fx", new (path) =>
+				{
+					// TODO!
+				}, _editorIcons.File_Effect));
+
+			// TODO: 3D Effect Lit, 3D Effect unlit, etc.
+			/*Editor.Instance.ContentBrowserWindow.RegisterAssetCreator(new AssetCreator("3D Effect", "New Effect", ".fx", new (path) =>
+				{
+					// TODO!
+				}, _editorIcons.File_Effect));*/
 
 			Editor.Instance.ContentBrowserWindow.RegisterAssetCreator(new AssetCreator("Material", "New Material", ".mat", new (path) =>
 				{
diff --git a/GlitchyEngine/src/Platform/DX11/Renderer/Dx11RendererAPI.bf b/GlitchyEngine/src/Platform/DX11/Renderer/Dx11RendererAPI.bf
index 77e019b..a70d1c0 100644
--- a/GlitchyEngine/src/Platform/DX11/Renderer/Dx11RendererAPI.bf
+++ b/GlitchyEngine/src/Platform/DX11/Renderer/Dx11RendererAPI.bf
@@ -31,7 +31,7 @@ namespace GlitchyEngine.Renderer
 		{
 			Debug.Profiler.ProfileFunction!();
 
-			_clearUintFx = Content.LoadAsset("Resources/Shaders/ClearUInt.hlsl", null, true);
+			_clearUintFx = Content.LoadAsset("Resources/Shaders/ClearUInt.fx", null, true);
 			BlendStateDescription desc =.Default;
 			desc.RenderTarget[0].BlendEnable = false;
 			_nonblendingState = new BlendState(desc);
diff --git a/GlitchyEngine/src/Renderer/Renderer.bf b/GlitchyEngine/src/Renderer/Renderer.bf
index 6d0a6f7..1fd994a 100644
--- a/GlitchyEngine/src/Renderer/Renderer.bf
+++ b/GlitchyEngine/src/Renderer/Renderer.bf
@@ -150,8 +150,6 @@ namespace GlitchyEngine.Renderer
 		{
 			Debug.Profiler.ProfileFunction!();
 
-			//LineEffect = Content.LoadAsset("Shaders\\lineShader.hlsl");
-
 			LineGeometry = new GeometryBinding();
 			LineGeometry.SetPrimitiveTopology(.LineList);
 			
@@ -180,8 +178,8 @@ namespace GlitchyEngine.Renderer
 
 		static void InitDeferredRenderer()
 		{
-			TestFullscreenEffect = Content.LoadAsset("Resources/Shaders/simpleLight.hlsl", null, true);
-			s_tonemappingEffect = Content.LoadAsset("Resources/Shaders/SimpleTonemapping.hlsl", null, true);
+			TestFullscreenEffect = Content.LoadAsset("Resources/Shaders/simpleLight.fx", null, true);
+			s_tonemappingEffect = Content.LoadAsset("Resources/Shaders/SimpleTonemapping.fx", null, true);
 
 			_gBuffer = new GBuffer();
 			BlendStateDescription gBufferBlendDesc = .Default;
diff --git a/GlitchyEngine/src/Renderer/Renderer2D.bf b/GlitchyEngine/src/Renderer/Renderer2D.bf
index b0598d2..b8af70a 100644
--- a/GlitchyEngine/src/Renderer/Renderer2D.bf
+++ b/GlitchyEngine/src/Renderer/Renderer2D.bf
@@ -187,10 +187,10 @@ namespace GlitchyEngine.Renderer
 		{
 			Debug.Profiler.ProfileFunction!();
 
-			s_quadBatchEffect = Content.LoadAsset("Resources/Shaders/spritebatch.hlsl", null, true);
+			s_quadBatchEffect = Content.LoadAsset("Resources/Shaders/spritebatch.fx", null, true);
 			s_quadBatchMaterial = new Material(s_quadBatchEffect);
-			s_circleBatchEffect = Content.LoadAsset("Resources/Shaders/circlebatch.hlsl", null, true);
-			s_lineBatchEffect = Content.LoadAsset("Resources/Shaders/linebatch.hlsl", null, true);
+			s_circleBatchEffect = Content.LoadAsset("Resources/Shaders/circlebatch.fx", null, true);
+			s_lineBatchEffect = Content.LoadAsset("Resources/Shaders/linebatch.fx", null, true);
 		}
 
 		private static void InitGeometry()
diff --git a/GlitchyEngine/src/Renderer/Text/FontRenderer.bf b/GlitchyEngine/src/Renderer/Text/FontRenderer.bf
index c9b7701..ecab908 100644
--- a/GlitchyEngine/src/Renderer/Text/FontRenderer.bf
+++ b/GlitchyEngine/src/Renderer/Text/FontRenderer.bf
@@ -33,7 +33,7 @@ namespace GlitchyEngine.Renderer.Text
 			InitFreetype();
 
 			// TODO: We might get away with a non blocking load here, but not for now!
-			_msdfEffect = Content.LoadAsset("Resources/Shaders/msdfShader.hlsl", null, true);
+			_msdfEffect = Content.LoadAsset("Resources/Shaders/msdfShader.fx", null, true);
 			_msdfMaterial = new Material(_msdfEffect);
 
 			s_isInitialized = true;
diff --git a/GlitchyEngine/src/World/SceneRenderer.bf b/GlitchyEngine/src/World/SceneRenderer.bf
index 3800184..7c7ccee 100644
--- a/GlitchyEngine/src/World/SceneRenderer.bf
+++ b/GlitchyEngine/src/World/SceneRenderer.bf
@@ -47,7 +47,7 @@ class SceneRenderer
 			});
 		_cameraTarget.[Friend]Identifier = "Camera Target";
 
-		_gammaCorrectEffect = Content.LoadAsset("Resources/Shaders/GammaCorrect.hlsl", null, true);
+		_gammaCorrectEffect = Content.LoadAsset("Resources/Shaders/GammaCorrect.fx", null, true);
 	}
 
 	/// Sets the size of the viewport into which the scene will be rendered.