Unity version bump and fixes

IxxyXR · Dec 15, 2023 · 74e25f0 · 74e25f0
1 parent 6fbfd4a
commit 74e25f0
Show file tree

Hide file tree

Showing 40 changed files with 732 additions and 512 deletions.
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
+  m_Name: UniversalRenderPipelineGlobalSettings
+  m_EditorClassIdentifier: 
+  k_AssetVersion: 2
+  lightLayerName0: Light Layer default
+  lightLayerName1: Light Layer 1
+  lightLayerName2: Light Layer 2
+  lightLayerName3: Light Layer 3
+  lightLayerName4: Light Layer 4
+  lightLayerName5: Light Layer 5
+  lightLayerName6: Light Layer 6
+  lightLayerName7: Light Layer 7
+  m_StripDebugVariants: 1
+  m_StripUnusedPostProcessingVariants: 0
+  m_StripUnusedVariants: 1
+  supportRuntimeDebugDisplay: 0
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta
diff --git a/Assets/_3rdParty/MeshToSDF/Editor/MeshToSDF VFX.vfx b/Assets/_3rdParty/MeshToSDF/Editor/MeshToSDF VFX.vfx
@@ -202,7 +202,7 @@ MonoBehaviour:
     enumValues: []
     descendantCount: 0
   m_ImportDependencies: []
-  m_GraphVersion: 8
+  m_GraphVersion: 9
   m_ResourceVersion: 1
   m_SubgraphDependencies: []
   m_CategoryPath: 
@@ -252,7 +252,7 @@ MonoBehaviour:
   m_Name: VFXDataParticle
   m_EditorClassIdentifier: 
   m_UIIgnoredErrors: []
-  m_Parent: {fileID: 114350483966674976}
+  m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
   m_UICollapsed: 1
@@ -267,7 +267,7 @@ MonoBehaviour:
   stripCapacity: 16
   particlePerStripCount: 16
   needsComputeBounds: 0
-  boundsSettingMode: 1
+  boundsMode: 1
   m_Space: 0
 --- !u!114 &114512514798047786
 MonoBehaviour:
@@ -2692,7 +2692,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_UIIgnoredErrors: []
-  m_Parent: {fileID: 114350483966674976}
+  m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
   m_UICollapsed: 1

diff --git a/Assets/_3rdParty/zCode/zCore/ColorUtil.cs b/Assets/_3rdParty/zCode/zCore/ColorUtil.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using UnityEngine;
+using Color = UnityEngine.Color;
 
 /*
  * Notes
@@ -9,12 +10,12 @@
 namespace zCode.zCore
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public static class ColorUtil
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         public static Vec3d ToVec3d(this Color color)
@@ -35,7 +36,7 @@ public static Vec3d ToVec3dNorm(this Color color)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="vector"></param>
         /// <returns></returns>
@@ -60,7 +61,7 @@ public static Color ToColorNorm(Vec3d vector)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -73,7 +74,7 @@ public static Vec3d LCHtoRGB(Vec3d color)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -85,7 +86,7 @@ public static Vec3d LABtoRGB(Vec3d color)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -103,7 +104,7 @@ public static Vec3d LCHtoLAB(Vec3d color)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -126,9 +127,9 @@ double Map(double c)
             return new Vec3d(Map(x) * 95.047, Map(y) * 100.00, Map(z) * 108.883);
         }
 
-       
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -154,7 +155,7 @@ double Map(double c)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -167,7 +168,7 @@ public static Vec3d RGBtoLCH(Vec3d color)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -179,7 +180,7 @@ public static Vec3d RGBtoLAB(Vec3d color)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -208,7 +209,7 @@ double Map(double c)
 
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>
@@ -234,10 +235,10 @@ double Map(double c)
                 200.0 * (y - z)
                 );
         }
-       
+
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="color"></param>
         /// <returns></returns>