From d5e7b4111422c799fad2dcf02470a03963fda087 Mon Sep 17 00:00:00 2001 From: "Lennart R." Date: Sun, 10 Aug 2025 21:30:39 +0200 Subject: [PATCH] kp --- .vsconfig | 6 ++ Assets/Scenes/SampleScene.unity | 100 ++++++++++++++--------------- Assets/Scripts/GrassField.cs | 2 + Packages/packages-lock.json | 8 +-- ProjectSettings/ProjectVersion.txt | 4 +- 5 files changed, 64 insertions(+), 56 deletions(-) create mode 100644 .vsconfig diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..f019fd0 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5b321b5..66aeec2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -14983,7 +14983,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 90233674} - m_Mesh: {fileID: 1116240434} + m_Mesh: {fileID: 1781571828} --- !u!23 &90233677 MeshRenderer: m_ObjectHideFlags: 0 @@ -14992,7 +14992,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 90233674} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -15004,7 +15004,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -51631,7 +51631,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 346939760} - m_Mesh: {fileID: 1221698654} + m_Mesh: {fileID: 687221521} --- !u!23 &346939763 MeshRenderer: m_ObjectHideFlags: 0 @@ -51640,7 +51640,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 346939760} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -51652,7 +51652,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -69694,7 +69694,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 462934790} - m_Mesh: {fileID: 1420238109} + m_Mesh: {fileID: 1506421826} --- !u!23 &462934793 MeshRenderer: m_ObjectHideFlags: 0 @@ -69703,7 +69703,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 462934790} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -69715,7 +69715,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -74080,7 +74080,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 498600234} - m_Mesh: {fileID: 1142488810} + m_Mesh: {fileID: 904888264} --- !u!23 &498600237 MeshRenderer: m_ObjectHideFlags: 0 @@ -74101,7 +74101,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84449,7 +84449,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577417894} - m_Mesh: {fileID: 1253277976} + m_Mesh: {fileID: 663755680} --- !u!23 &577417897 MeshRenderer: m_ObjectHideFlags: 0 @@ -84470,7 +84470,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -86150,7 +86150,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 584577491} - m_Mesh: {fileID: 871925010} + m_Mesh: {fileID: 1763455613} --- !u!23 &584577494 MeshRenderer: m_ObjectHideFlags: 0 @@ -86159,7 +86159,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 584577491} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -86171,7 +86171,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -112719,7 +112719,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773380413} - m_Mesh: {fileID: 658220888} + m_Mesh: {fileID: 755271470} --- !u!23 &773380416 MeshRenderer: m_ObjectHideFlags: 0 @@ -112740,7 +112740,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -114306,7 +114306,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 787427247} - m_Mesh: {fileID: 1490227190} + m_Mesh: {fileID: 475689305} --- !u!23 &787427250 MeshRenderer: m_ObjectHideFlags: 0 @@ -114315,7 +114315,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 787427247} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -114327,7 +114327,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -114414,7 +114414,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789985202} - m_Mesh: {fileID: 145658542} + m_Mesh: {fileID: 1015590501} --- !u!23 &789985205 MeshRenderer: m_ObjectHideFlags: 0 @@ -114435,7 +114435,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -123675,7 +123675,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 859508517} - m_Mesh: {fileID: 1535435504} + m_Mesh: {fileID: 869348275} --- !u!23 &859508520 MeshRenderer: m_ObjectHideFlags: 0 @@ -123684,7 +123684,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 859508517} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -123696,7 +123696,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -136598,7 +136598,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 942140413} - m_Mesh: {fileID: 601687339} + m_Mesh: {fileID: 1671461130} --- !u!23 &942140416 MeshRenderer: m_ObjectHideFlags: 0 @@ -136619,7 +136619,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -140863,13 +140863,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} serializedVersion: 2 - m_LocalRotation: {x: 0.23339066, y: 0.37273654, z: -0.097438015, w: 0.8928058} - m_LocalPosition: {x: 6.6, y: 3.5, z: 4.2} + m_LocalRotation: {x: 0.23506844, y: 0.3851214, z: -0.1021131, w: 0.8865649} + m_LocalPosition: {x: 6.34, y: 2.02, z: 3.8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 29.3, y: 45.32, z: 0} + m_LocalEulerAnglesHint: {x: 29.7, y: 46.96, z: 0} --- !u!43 &963631122 Mesh: m_ObjectHideFlags: 0 @@ -171534,7 +171534,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186762702} - m_Mesh: {fileID: 1116676414} + m_Mesh: {fileID: 811416661} --- !u!23 &1186762705 MeshRenderer: m_ObjectHideFlags: 0 @@ -171555,7 +171555,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -171972,7 +171972,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188818393} - m_Mesh: {fileID: 1034374045} + m_Mesh: {fileID: 932024252} --- !u!23 &1188818396 MeshRenderer: m_ObjectHideFlags: 0 @@ -171993,7 +171993,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -176910,7 +176910,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229489200} - m_Mesh: {fileID: 547905413} + m_Mesh: {fileID: 1790509331} --- !u!23 &1229489203 MeshRenderer: m_ObjectHideFlags: 0 @@ -176931,7 +176931,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -181956,7 +181956,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259718493} - m_Mesh: {fileID: 426043794} + m_Mesh: {fileID: 773094812} --- !u!23 &1259718496 MeshRenderer: m_ObjectHideFlags: 0 @@ -181977,7 +181977,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -191388,7 +191388,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1314535846} - m_Mesh: {fileID: 322926976} + m_Mesh: {fileID: 671083140} --- !u!23 &1314535849 MeshRenderer: m_ObjectHideFlags: 0 @@ -191409,7 +191409,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -206970,7 +206970,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430497980} - m_Mesh: {fileID: 16904396} + m_Mesh: {fileID: 1226309064} --- !u!23 &1430497983 MeshRenderer: m_ObjectHideFlags: 0 @@ -206979,7 +206979,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430497980} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -206991,7 +206991,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} + - {fileID: 2100000, guid: 91fb1ec3cf2133a4b931798a8822d055, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -210315,7 +210315,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449322683} - m_Mesh: {fileID: 1922265943} + m_Mesh: {fileID: 447456844} --- !u!23 &1449322686 MeshRenderer: m_ObjectHideFlags: 0 @@ -210336,7 +210336,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -259365,7 +259365,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1786986290} - m_Mesh: {fileID: 1690255161} + m_Mesh: {fileID: 20114828} --- !u!23 &1786986293 MeshRenderer: m_ObjectHideFlags: 0 @@ -259386,7 +259386,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -280920,7 +280920,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937472215} - m_Mesh: {fileID: 44190719} + m_Mesh: {fileID: 843278902} --- !u!23 &1937472218 MeshRenderer: m_ObjectHideFlags: 0 @@ -280941,7 +280941,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b747ca32ff9b8ee408e794d093cbdd54, type: 2} + - {fileID: 2100000, guid: ad7fd76c0f67ff04e8f51f21faf1739d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scripts/GrassField.cs b/Assets/Scripts/GrassField.cs index 4ed64a9..0dc2cc4 100644 --- a/Assets/Scripts/GrassField.cs +++ b/Assets/Scripts/GrassField.cs @@ -73,6 +73,8 @@ public class GrassField : MonoBehaviour { Debug.LogError(this.name + ": Existing chunks does not match numChunks."); gameObject.SetActive(false); } + + UpdateLODsAndMaterials(); } private void OnDisable() { diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index df448ed..0576cd4 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -27,16 +27,16 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.rider": "3.0.31", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.test-framework": "1.1.33", - "com.unity.testtools.codecoverage": "1.2.6" + "com.unity.testtools.codecoverage": "1.2.5" } }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.28", "depth": 1, "source": "registry", "dependencies": { @@ -102,7 +102,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.6", + "version": "1.2.5", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 1e3d799..d8a3358 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.46f1 -m_EditorVersionWithRevision: 2022.3.46f1 (8e9b8558c41a) +m_EditorVersion: 2022.3.30f1 +m_EditorVersionWithRevision: 2022.3.30f1 (70558241b701)