From e7dcffd575ebc0326716a6d22ffff4a631d2457c Mon Sep 17 00:00:00 2001
From: spatialfree <mail@ethanmerchant.com>
Date: Fri, 26 May 2023 13:05:56 -0400
Subject: [PATCH] shaders restored! ty StereoNick ^-^

---
 oriels.csproj           | 22 ++--------------------
 src/Backrooms/Mono.cs   | 10 +++++-----
 src/Greenyard/Mono.cs   |  2 +-
 src/Mono.cs             |  8 ++++----
 src/Space.cs            |  4 ++--
 src/Space/Mono.cs       |  2 +-
 src/dofs/oriel/Oriel.cs |  6 +++---
 7 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/oriels.csproj b/oriels.csproj
index fe209c8..8386ae1 100644
--- a/oriels.csproj
+++ b/oriels.csproj
@@ -3,6 +3,8 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
+    <SKAssetFolder>add</SKAssetFolder>
+    <SKAssetDestination>add</SKAssetDestination>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -16,24 +18,4 @@
 		</None>
 	</ItemGroup>
 
-  <ItemGroup>
-    <None Remove="add/shaders/oriel.hlsl" />
-    <None Remove="add/shaders/colorcube.hlsl" />
-    <None Remove="add/shaders/panes.hlsl" />
-    <None Remove="add/shaders/frame.hlsl" />
-    <None Remove="add/shaders/room.hlsl" />
-    <None Remove="add/shaders/above.hlsl" />
-    <None Remove="add/shaders/below.hlsl" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SKShader Include="add/shaders/oriel.hlsl" />
-    <SKShader Include="add/shaders/colorcube.hlsl" />
-    <SKShader Include="add/shaders/panes.hlsl" />
-    <SKShader Include="add/shaders/frame.hlsl" />
-    <SKShader Include="add/shaders/room.hlsl" />
-    <SKShader Include="add/shaders/above.hlsl" />
-    <SKShader Include="add/shaders/below.hlsl" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Backrooms/Mono.cs b/src/Backrooms/Mono.cs
index 8b67246..db3742b 100644
--- a/src/Backrooms/Mono.cs
+++ b/src/Backrooms/Mono.cs
@@ -20,27 +20,27 @@ public class Mono {
 		thing = new Thing[] {
 			new Thing(
 				model.GetMesh("Carpet"), 
-				new Material(Shader.FromFile("shaders/oriel.hlsl")),
+				new Material(Shader.FromFile("oriel.hlsl")),
 				"backrooms/Carpet.png"
 			),
 			new Thing(
 				model.GetMesh("Walls"), 
-				new Material(Shader.FromFile("shaders/oriel.hlsl")),
+				new Material(Shader.FromFile("oriel.hlsl")),
 				"backrooms/Walls.png"
 			),
 			new Thing(
 				model.GetMesh("Ceiling"),
-				new Material(Shader.FromFile("shaders/oriel.hlsl")),
+				new Material(Shader.FromFile("oriel.hlsl")),
 				"backrooms/Ceiling.png"
 			),
 			new Thing(
 				model.GetMesh("Vents"),
-				new Material(Shader.FromFile("shaders/oriel.hlsl")),
+				new Material(Shader.FromFile("oriel.hlsl")),
 				"backrooms/Vents.png"
 			),
 			new Thing(
 				model.GetMesh("Lights"),
-				new Material(Shader.FromFile("shaders/oriel.hlsl")),
+				new Material(Shader.FromFile("oriel.hlsl")),
 				"backrooms/Lights.png"
 			),
 		};
diff --git a/src/Greenyard/Mono.cs b/src/Greenyard/Mono.cs
index c900757..56ee6b5 100644
--- a/src/Greenyard/Mono.cs
+++ b/src/Greenyard/Mono.cs
@@ -10,7 +10,7 @@ public class Mono {
 
 	Model greenyardModel = Model.FromFile("greenyard.glb");
 	Mesh[] greenyard;
-	Material greenyardMat = new Material(Shader.FromFile("/shaders/oriel.hlsl"));
+	Material greenyardMat = new Material(Shader.FromFile("/oriel.hlsl"));
 
 	Matrix matrix = Matrix.Identity;
 	Vec3 offset = new Vec3(2, 1, -12);
diff --git a/src/Mono.cs b/src/Mono.cs
index c55ff80..3031964 100644
--- a/src/Mono.cs
+++ b/src/Mono.cs
@@ -7,10 +7,10 @@ public class Mono {
 	public PullRequest.Noise noise = new PullRequest.Noise(939949595);
 
 	public Material matDev;
-	public Material matHoloframe = new Material(Shader.FromFile("shaders/above.hlsl"));
-	Material matHoloframeUnder = new Material(Shader.FromFile("shaders/below.hlsl"));
-	public Material matHolo = new Material(Shader.FromFile("shaders/above.hlsl"));
-	Material matHoloUnder = new Material(Shader.FromFile("shaders/below.hlsl"));
+	public Material matHoloframe = new Material(Shader.FromFile("above.hlsl"));
+	Material matHoloframeUnder = new Material(Shader.FromFile("below.hlsl"));
+	public Material matHolo = new Material(Shader.FromFile("above.hlsl"));
+	Material matHoloUnder = new Material(Shader.FromFile("below.hlsl"));
 
 	public Rig rig = new Rig();
 	public Space space = new Space();
diff --git a/src/Space.cs b/src/Space.cs
index 8053049..751e5f8 100644
--- a/src/Space.cs
+++ b/src/Space.cs
@@ -13,8 +13,8 @@ public class Space {
   BufferData data = new BufferData();
 
   Material matFloor = new Material(Shader.Default);
-  Model shed = Model.FromFile("shed/shed.glb", Shader.FromFile("shaders/room.hlsl"));
-  Model leek = Model.FromFile("houseleek_plant.glb", Shader.FromFile("shaders/room.hlsl"));
+  Model shed = Model.FromFile("shed/shed.glb", Shader.FromFile("room.hlsl"));
+  Model leek = Model.FromFile("houseleek_plant.glb", Shader.FromFile("room.hlsl"));
   Mesh cube = Mesh.Cube;
 
 	Solid floor;
diff --git a/src/Space/Mono.cs b/src/Space/Mono.cs
index 3cfeb17..e142fb7 100644
--- a/src/Space/Mono.cs
+++ b/src/Space/Mono.cs
@@ -28,7 +28,7 @@ public class Mono {
   Mesh meshCube;
   // Model skyboxModel = Model.FromFile("fantasy_skybox.glb");
   // Mesh skybox;
-  // Material skyboxMat = new Material(Shader.FromFile("/shaders/oriel.hlsl"));
+  // Material skyboxMat = new Material(Shader.FromFile("/oriel.hlsl"));
 
   public Mono() {
 
diff --git a/src/dofs/oriel/Oriel.cs b/src/dofs/oriel/Oriel.cs
index 8da29e5..ab46e09 100644
--- a/src/dofs/oriel/Oriel.cs
+++ b/src/dofs/oriel/Oriel.cs
@@ -3,9 +3,9 @@ namespace Oriels;
 public class Oriel {
   Material matClear = new Material(Shader.Default);
   
-  public Material matOriel = new Material(Shader.FromFile("shaders/oriel.hlsl"));
-  Material matFrame = new Material(Shader.FromFile("shaders/frame.hlsl"));
-  Material matPanes = new Material(Shader.FromFile("shaders/panes.hlsl"));
+  public Material matOriel = new Material(Shader.FromFile("oriel.hlsl"));
+  Material matFrame = new Material(Shader.FromFile("frame.hlsl"));
+  Material matPanes = new Material(Shader.FromFile("panes.hlsl"));
 
   public Matrix matrix, matrixInv;
   public Bounds bounds;