From ebf298a559bd8a0a1500ce0cbdb5cb8e3381738a Mon Sep 17 00:00:00 2001
From: spatialfree <cadetmerchant@gmail.com>
Date: Wed, 8 Dec 2021 15:42:46 -0500
Subject: [PATCH] there's your problem

---
 Assets/oriel.hlsl |  7 +++----
 Program.cs        | 20 ++++++++++++--------
 oriels.bat        |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Assets/oriel.hlsl b/Assets/oriel.hlsl
index c3bc422..c7c6dce 100644
--- a/Assets/oriel.hlsl
+++ b/Assets/oriel.hlsl
@@ -126,19 +126,18 @@ float map(float3 pos) {
   // pos.x = _center.x + pos.x;
   // pos.y = _center.y + pos.y;
   // pos.z = _center.z - pos.z;
-  // float sphere = sdSphere(pos + float3(0, 0.5, 0) - _center, 0.1);
+  float sphere = sdSphere(pos + float3(0, 0, -1) - _center, 0.1);
   // return sdLink(pos, 0.1, 0.1, 0.1);
   // float octo = sdOctahedron(pos - _center - position, 0.2);
   float frame = sdBoxFrame(pos - _center - position, float3(0.06, 0.06, 0.06), 0.004);
 
   float orielFrame = sdBoxFrame(pos - _center, _dimensions / 2, 0.004);
   // return lerp(sphere, octo, windStrength);
-
-  float plane = sdPlane(pos - _center + float3(0, 1.5, 0), float3(0, 1, 0), 0);
+  float plane = sdPlane(pos - _center + float3(0, 0.5, 0), float3(0, 1, 0), 0);
 
   // float blendd = lerp(octo, frame, windStrength);
   // return min(min(plane, orielFrame), frame);
-  return min(plane, orielFrame);
+  return min(min(plane, orielFrame), sphere);
   
   // return opRep(pos - _center, float3(0, 0, 0));
 }
diff --git a/Program.cs b/Program.cs
index 04c1654..06b70f1 100644
--- a/Program.cs
+++ b/Program.cs
@@ -665,14 +665,18 @@ public class Oriel {
 
 
     // crown.SetVector("_center", bounds.center);
-    crown.SetFloat("_height", bounds.dimensions.y);
-    crown.SetFloat("_ypos", bounds.center.y);
-    crown.FaceCull = Cull.Front;
-    crown.Transparency = Transparency.Add;
-    crown.DepthTest = DepthTest.Always;
-    // crown.QueueOffset = 0;
-    // crown.DepthWrite = false;
-    mesh.Draw(crown, Matrix.TRS(bounds.center, Quat.Identity, bounds.dimensions));
+
+
+    // crown.SetFloat("_height", bounds.dimensions.y);
+    // crown.SetFloat("_ypos", bounds.center.y);
+    // crown.FaceCull = Cull.Front;
+    // crown.Transparency = Transparency.Add;
+    // crown.DepthTest = DepthTest.Always;
+
+    // // crown.QueueOffset = 0;
+    // // crown.DepthWrite = false;
+
+    // mesh.Draw(crown, Matrix.TRS(bounds.center, Quat.Identity, bounds.dimensions));
   }
 }
 
diff --git a/oriels.bat b/oriels.bat
index ce16881..1a3a8c3 100644
--- a/oriels.bat
+++ b/oriels.bat
@@ -4,5 +4,5 @@ cd bin/Debug
 @REM echo "zipping into dofdev site"
 @REM 7z u oriels.zip %cd%/netcoreapp3.1
 @REM Xcopy "oriels.zip" "C:/dofdev/Web Development/dofdev/res/oriels.zip" /F /Y
-cd netcoreapp3.1
+cd netcoreapp6.0
 oriels.exe
\ No newline at end of file