From 06c9c7f61f4dcceb35e28e4fbaf0418a40068a14 Mon Sep 17 00:00:00 2001 From: Tristan Bellman-Greenwood Date: Thu, 11 Mar 2021 22:39:14 -0500 Subject: [PATCH] updating example project to Untiy 2021.1 beta --- .../Assets/Render Pipeline/URP Renderer.asset | 6 +- .../Assets/Render Pipeline/URP Settings.asset | 17 +- .../Packages/manifest.json | 4 +- .../Packages/packages-lock.json | 48 +++-- .../PackageManagerSettings.asset | 4 +- .../ProjectSettings/ProjectSettings.asset | 12 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/QualitySettings.asset | 2 +- .../SceneTemplateSettings.json | 167 ++++++++++++++++++ README.md | 6 +- 10 files changed, 225 insertions(+), 45 deletions(-) create mode 100644 Examples~/Hybrid Simulation Test Project/ProjectSettings/SceneTemplateSettings.json diff --git a/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Renderer.asset b/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Renderer.asset index 62e3bb6..1fc70f2 100644 --- a/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Renderer.asset +++ b/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Renderer.asset @@ -20,17 +20,15 @@ MonoBehaviour: copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - tileDepthInfoPS: {fileID: 4800000, guid: f451c6bec16aa51408bdfd37f70aed12, type: 3} - tileDeferredPS: {fileID: 4800000, guid: 344787727e03649488a1022c09fa74b5, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} m_OpaqueLayerMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 2147483647 m_TransparentLayerMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 2147483647 m_DefaultStencilState: overrideStencilState: 0 stencilReference: 0 diff --git a/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Settings.asset b/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Settings.asset index 3afd4ef..91e73c5 100644 --- a/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Settings.asset +++ b/Examples~/Hybrid Simulation Test Project/Assets/Render Pipeline/URP Settings.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP Settings m_EditorClassIdentifier: - k_AssetVersion: 5 - k_AssetPreviousVersion: 5 + k_AssetVersion: 7 + k_AssetPreviousVersion: 7 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -33,10 +33,14 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 - m_ShadowDistance: 1200 - m_ShadowCascades: 2 + m_AdditionalLightsShadowResolutionTierLow: 256 + m_AdditionalLightsShadowResolutionTierMedium: 512 + m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_ShadowDistance: 100 + m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.1, y: 0.3, z: 0.6} m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 1 @@ -44,11 +48,14 @@ MonoBehaviour: m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 0 m_DebugLevel: 0 + m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 2 diff --git a/Examples~/Hybrid Simulation Test Project/Packages/manifest.json b/Examples~/Hybrid Simulation Test Project/Packages/manifest.json index 5c88874..89ae089 100644 --- a/Examples~/Hybrid Simulation Test Project/Packages/manifest.json +++ b/Examples~/Hybrid Simulation Test Project/Packages/manifest.json @@ -1,9 +1,9 @@ { "dependencies": { "com.10101software.dots.hybridsimulation": "file:../../..", - "com.unity.ide.rider": "2.0.7", + "com.unity.ide.rider": "3.0.5", "com.unity.inputsystem": "1.0.2", - "com.unity.render-pipelines.universal": "10.2.2", + "com.unity.render-pipelines.universal": "11.0.0", "com.unity.ugui": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json b/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json index 6de730b..860d0da 100644 --- a/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json +++ b/Examples~/Hybrid Simulation Test Project/Packages/packages-lock.json @@ -48,18 +48,16 @@ }, "com.unity.ext.nunit": { "version": "1.0.6", - "depth": 2, + "depth": 4, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.5", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { @@ -81,7 +79,7 @@ }, "com.unity.mathematics": { "version": "1.2.1", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -96,7 +94,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0-preview", + "version": "2.0.0", "depth": 3, "source": "registry", "dependencies": {}, @@ -136,27 +134,26 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.2.2", + "version": "11.0.0", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0" + } }, "com.unity.render-pipelines.universal": { - "version": "10.2.2", + "version": "11.0.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.2.2", - "com.unity.shadergraph": "10.2.2" - }, - "url": "https://packages.unity.com" + "com.unity.render-pipelines.core": "11.0.0", + "com.unity.shadergraph": "11.0.0" + } }, "com.unity.scriptablebuildpipeline": { - "version": "1.9.0", + "version": "1.15.2", "depth": 2, "source": "registry", "dependencies": {}, @@ -183,18 +180,17 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "10.2.2", + "version": "11.0.0", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "10.2.2", + "com.unity.render-pipelines.core": "11.0.0", "com.unity.searcher": "4.3.1" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework": { - "version": "1.1.20", - "depth": 1, + "version": "1.1.22", + "depth": 3, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6", diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/PackageManagerSettings.asset b/Examples~/Hybrid Simulation Test Project/ProjectSettings/PackageManagerSettings.asset index b01b2f8..98004cd 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/PackageManagerSettings.asset +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/PackageManagerSettings.asset @@ -12,10 +12,11 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreviewPackages: 1 + m_EnablePreReleasePackages: 1 m_EnablePackageDependencies: 1 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 oneTimeWarningShown: 1 m_Registries: - m_Id: main @@ -41,3 +42,4 @@ MonoBehaviour: m_Scopes: - m_SelectedScopeIndex: 0 + m_LoadAssets: 0 diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectSettings.asset b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectSettings.asset index a529153..c4b90e0 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectSettings.asset +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectSettings.asset @@ -82,7 +82,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 @@ -93,7 +93,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -363,6 +363,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -380,6 +381,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -395,6 +397,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -410,6 +413,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -425,6 +429,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -593,11 +598,11 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -646,6 +651,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt index 4fbcff7..ff786c4 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.3f1 -m_EditorVersionWithRevision: 2020.2.3f1 (8ff31bc5bf5b) \ No newline at end of file +m_EditorVersion: 2021.1.0b11 +m_EditorVersionWithRevision: 2021.1.0b11 (ddf8e7a924bd) diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/QualitySettings.asset b/Examples~/Hybrid Simulation Test Project/ProjectSettings/QualitySettings.asset index 65f8343..792410d 100644 --- a/Examples~/Hybrid Simulation Test Project/ProjectSettings/QualitySettings.asset +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/QualitySettings.asset @@ -35,7 +35,7 @@ QualitySettings: streamingMipmapsRenderersPerFrame: 512 streamingMipmapsMaxLevelReduction: 2 streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 11024 + particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 diff --git a/Examples~/Hybrid Simulation Test Project/ProjectSettings/SceneTemplateSettings.json b/Examples~/Hybrid Simulation Test Project/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..6f3e60f --- /dev/null +++ b/Examples~/Hybrid Simulation Test Project/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/README.md b/README.md index a879b32..4a618de 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,10 @@ Prefabs and EntityArchetypes are managed in the Bootstrapper class as well. Util Add a GameObject with ResetDotsOnDestroy into your scene to clean things up when the scene transitions. -Remeber to add `UNITY_DISABLE_AUTOMATIC_SYSTEM_BOOTSTRAP` to the Scripting Define Symbols in Project Settings > Player if you want to turn off the default world that Unity creates. This doesn't stop you from using any of the default systems but you will need to set them up in a Bootstrapper. +Remember to add `UNITY_DISABLE_AUTOMATIC_SYSTEM_BOOTSTRAP` to the Scripting Define Symbols in Project Settings > Player if you want to turn off the default world that Unity creates. This doesn't stop you from using any of the default systems but you will need to set them up in a Bootstrapper. See the Example scene for more information. + +# Development Environment + +Turn on `.csproj` generation for local packages to enable IDE analysis of package files.