Unity 6 migration

BLaZeKiLL · Nov 27, 2024 · 791cdfa · 791cdfa
1 parent ccdacae
commit 791cdfa
Show file tree

Hide file tree

Showing 13 changed files with 909 additions and 51 deletions.
diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset
diff --git a/Assets/Scripts/VloxyInput.cs b/Assets/Scripts/VloxyInput.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.11.1
+//     version 1.11.2
 //     from Assets/Settings/Input/VloxyEngine.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/Assets/Settings/URP/UniversalRenderPipelineAsset.asset b/Assets/Settings/URP/UniversalRenderPipelineAsset.asset
@@ -41,10 +41,10 @@ MonoBehaviour:
   m_SupportProbeVolumeScenarios: 0
   m_SupportProbeVolumeScenarioBlending: 0
   m_ProbeVolumeSHBands: 1
-  m_MainLightRenderingMode: 1
+  m_MainLightRenderingMode: 0
   m_MainLightShadowsSupported: 1
   m_MainLightShadowmapResolution: 1024
-  m_AdditionalLightsRenderingMode: 1
+  m_AdditionalLightsRenderingMode: 0
   m_AdditionalLightsPerObjectLimit: 4
   m_AdditionalLightShadowsSupported: 0
   m_AdditionalLightsShadowmapResolution: 2048

diff --git a/Assets/Settings/URP/UniversalRenderPipelineAsset_Renderer.asset b/Assets/Settings/URP/UniversalRenderPipelineAsset_Renderer.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
     failOperation: 0
     zFailOperation: 0
   m_ShadowTransparentReceive: 1
-  m_RenderingMode: 0
+  m_RenderingMode: 2
   m_DepthPrimingMode: 0
   m_CopyDepthMode: 0
   m_DepthAttachmentFormat: 0

diff --git a/Assets/Settings/URP/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/URP/UniversalRenderPipelineGlobalSettings.asset
@@ -165,7 +165,7 @@ MonoBehaviour:
       type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
-        m_EnableRenderCompatibilityMode: 1
+        m_EnableRenderCompatibilityMode: 0
     - rid: 2224248686361968650
       type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:

diff --git a/Assets/UI Toolkit/PanelSettings.asset b/Assets/UI Toolkit/PanelSettings.asset
@@ -13,8 +13,13 @@ MonoBehaviour:
   m_Name: PanelSettings
   m_EditorClassIdentifier: 
   themeUss: {fileID: -4733365628477956816, guid: 1fe995c4b5ce1b2409b6a0dacf18cc32, type: 3}
+  m_DisableNoThemeWarning: 0
   m_TargetTexture: {fileID: 0}
+  m_RenderMode: 0
+  m_WorldSpaceLayer: 0
   m_ScaleMode: 2
+  m_ReferenceSpritePixelsPerUnit: 100
+  m_PixelsPerUnit: 100
   m_Scale: 1
   m_ReferenceDpi: 96
   m_FallbackDpi: 96
@@ -23,9 +28,11 @@ MonoBehaviour:
   m_Match: 1
   m_SortingOrder: 0
   m_TargetDisplay: 0
+  m_BindingLogLevel: 0
   m_ClearDepthStencil: 1
   m_ClearColor: 0
   m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
+  m_VertexBudget: 0
   m_DynamicAtlasSettings:
     m_MinAtlasSize: 64
     m_MaxAtlasSize: 4096
@@ -34,4 +41,6 @@ MonoBehaviour:
   m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
+  m_ICUDataAsset: {fileID: 0}
+  forceGammaRendering: 0
   textSettings: {fileID: 0}
diff --git a/Packages/io.codeblaze.vloxyengine/Runtime/Engine/ThirdParty.meta b/Packages/io.codeblaze.vloxyengine/Runtime/Engine/ThirdParty.meta
diff --git a/Packages/io.codeblaze.vloxyengine/Runtime/Engine/World/VloxyWorld.cs b/Packages/io.codeblaze.vloxyengine/Runtime/Engine/World/VloxyWorld.cs
@@ -124,10 +124,10 @@ private void ConfigureSettings() {
             Settings.Chunk.LoadDistance = Settings.Chunk.DrawDistance + 2;
             Settings.Chunk.UpdateDistance = math.max(Settings.Chunk.DrawDistance - 2, 2);
 
-            // TODO : Should these be dynamic or manual ?
-            Settings.Scheduler.MeshingBatchSize = 8;
-            Settings.Scheduler.StreamingBatchSize = 12;
-            Settings.Scheduler.ColliderBatchSize = 8;
+            // TODO : these need to be dynamic or exposed ?
+            Settings.Scheduler.MeshingBatchSize = 4;
+            Settings.Scheduler.StreamingBatchSize = 8;
+            Settings.Scheduler.ColliderBatchSize = 4;
 
             WorldConfigure();
         }

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,16 +1,18 @@
 {
   "dependencies": {
-    "com.tayx.graphy": "3.0.2",
-    "com.unity.ai.navigation": "2.0.4",
+    "com.tayx.graphy": "3.0.5",
+    "com.unity.ai.navigation": "2.0.5",
     "com.unity.burst": "1.8.18",
     "com.unity.collab-proxy": "2.5.2",
     "com.unity.collections": "2.5.1",
-    "com.unity.ide.rider": "3.0.31",
-    "com.unity.inputsystem": "1.11.1",
+    "com.unity.ide.rider": "3.0.34",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.inputsystem": "1.11.2",
     "com.unity.multiplayer.center": "1.0.0",
     "com.unity.render-pipelines.universal": "17.0.3",
     "com.unity.test-framework": "1.4.5",
     "com.unity.timeline": "1.8.7",
+    "com.unity.toolchain.linux-x86_64": "2.0.10",
     "com.unity.ugui": "2.0.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "com.tayx.graphy": {
-      "version": "3.0.2",
+      "version": "3.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://package.openupm.com"
     },
     "com.unity.ai.navigation": {
-      "version": "2.0.4",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -39,8 +39,8 @@
       "source": "registry",
       "dependencies": {
         "com.unity.burst": "1.8.17",
-        "com.unity.nuget.mono-cecil": "1.11.4",
         "com.unity.test-framework": "1.4.5",
+        "com.unity.nuget.mono-cecil": "1.11.4",
         "com.unity.test-framework.performance": "3.0.3"
       },
       "url": "https://packages.unity.com"
@@ -53,16 +53,25 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.31",
+      "version": "3.0.34",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.22",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.inputsystem": {
-      "version": "1.11.1",
+      "version": "1.11.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -151,6 +160,22 @@
         "com.unity.searcher": "4.9.2"
       }
     },
+    "com.unity.sysroot": {
+      "version": "2.0.10",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "2.0.9",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.10"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
       "version": "1.4.5",
       "depth": 0,
@@ -177,13 +202,23 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.toolchain.linux-x86_64": {
+      "version": "2.0.10",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.10",
+        "com.unity.sysroot.linux-x86_64": "2.0.9"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ugui": {
       "version": "2.0.0",
       "depth": 0,