diff --git a/Dots101/Entities101/Assets/Firefighters/Common/Bot.mat b/Dots101/Entities101/Assets/Firefighters/Common/Bot.mat index 8e83db218..03cee5ee6 100644 --- a/Dots101/Entities101/Assets/Firefighters/Common/Bot.mat +++ b/Dots101/Entities101/Assets/Firefighters/Common/Bot.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/Firefighters/Common/Bucket.mat b/Dots101/Entities101/Assets/Firefighters/Common/Bucket.mat index cf10b34e7..1e0e3f335 100644 --- a/Dots101/Entities101/Assets/Firefighters/Common/Bucket.mat +++ b/Dots101/Entities101/Assets/Firefighters/Common/Bucket.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/Firefighters/Common/ExecuteAuthoring.cs b/Dots101/Entities101/Assets/Firefighters/Common/ExecuteAuthoring.cs index ea43edc25..ddfc03d82 100644 --- a/Dots101/Entities101/Assets/Firefighters/Common/ExecuteAuthoring.cs +++ b/Dots101/Entities101/Assets/Firefighters/Common/ExecuteAuthoring.cs @@ -11,7 +11,7 @@ public class ExecuteAuthoring : MonoBehaviour public bool ExecuteTeamSystem; public bool ExecuteUISystem; public bool ExecuteAnimationSystem; - + class Baker : Baker { public override void Bake(ExecuteAuthoring authoring) @@ -36,12 +36,12 @@ public override void Bake(ExecuteAuthoring authoring) { AddComponent(entity); } - + if (authoring.ExecuteUISystem) { AddComponent(entity); } - + if (authoring.ExecuteAnimationSystem) { AddComponent(entity); @@ -50,27 +50,15 @@ public override void Bake(ExecuteAuthoring authoring) } } - public struct ExecuteHeat : IComponentData - { - } + public struct ExecuteHeat : IComponentData { } - public struct ExecuteBot : IComponentData - { - } + public struct ExecuteBot : IComponentData { } - public struct ExecuteBucket : IComponentData - { - } + public struct ExecuteBucket : IComponentData { } - public struct ExecuteTeam : IComponentData - { - } - - public struct ExecuteUI : IComponentData - { - } - - public struct ExecuteAnimation : IComponentData - { - } + public struct ExecuteTeam : IComponentData { } + + public struct ExecuteUI : IComponentData { } + + public struct ExecuteAnimation : IComponentData { } } diff --git a/Dots101/Entities101/Assets/Firefighters/Common/GroundCell.mat b/Dots101/Entities101/Assets/Firefighters/Common/GroundCell.mat index 4e33ec581..b2799f2ff 100644 --- a/Dots101/Entities101/Assets/Firefighters/Common/GroundCell.mat +++ b/Dots101/Entities101/Assets/Firefighters/Common/GroundCell.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/Firefighters/Common/Pond.mat b/Dots101/Entities101/Assets/Firefighters/Common/Pond.mat index 1e3857ad0..3de449e4a 100644 --- a/Dots101/Entities101/Assets/Firefighters/Common/Pond.mat +++ b/Dots101/Entities101/Assets/Firefighters/Common/Pond.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/Firefighters/Common/Warrior/Materials/MAT_Warrior_Red.mat b/Dots101/Entities101/Assets/Firefighters/Common/Warrior/Materials/MAT_Warrior_Red.mat index d62d891be..f2d4b7f82 100644 --- a/Dots101/Entities101/Assets/Firefighters/Common/Warrior/Materials/MAT_Warrior_Red.mat +++ b/Dots101/Entities101/Assets/Firefighters/Common/Warrior/Materials/MAT_Warrior_Red.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHATEST_ON + - _EMISSION - _METALLICSPECGLOSSMAP - _NORMALMAP m_InvalidKeywords: [] @@ -87,6 +88,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - _AlphaToMask: 1 - _Blend: 0 @@ -133,6 +135,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -156,4 +159,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/Firefighters/Step 1/Components.cs b/Dots101/Entities101/Assets/Firefighters/Step 1/Components.cs index 782cd484d..2ebed44e6 100644 --- a/Dots101/Entities101/Assets/Firefighters/Step 1/Components.cs +++ b/Dots101/Entities101/Assets/Firefighters/Step 1/Components.cs @@ -17,17 +17,15 @@ public struct TeamMember : IBufferElementData } // used as a flag to signal that the team needs to be repositioned - public struct RepositionLine : IComponentData, IEnableableComponent - { - } + public struct RepositionLine : IComponentData, IEnableableComponent { } public struct Heat : IBufferElementData { public float Value; } - + public class BotAnimation : IComponentData { - public GameObject AnimatedGO; // the GO that is rendered and animated + public GameObject AnimatedGO; // the GO that is rendered and animated } } diff --git a/Dots101/Entities101/Assets/Firefighters/Step 1/GroundCellAuthoring.cs b/Dots101/Entities101/Assets/Firefighters/Step 1/GroundCellAuthoring.cs index 6f1f9257d..033fb0df4 100644 --- a/Dots101/Entities101/Assets/Firefighters/Step 1/GroundCellAuthoring.cs +++ b/Dots101/Entities101/Assets/Firefighters/Step 1/GroundCellAuthoring.cs @@ -15,9 +15,5 @@ public override void Bake(GroundCellAuthoring authoring) } } - public struct GroundCell : IComponentData - { - - } + public struct GroundCell : IComponentData { } } - diff --git a/Dots101/Entities101/Assets/Firefighters/Step 1/PondAuthoring.cs b/Dots101/Entities101/Assets/Firefighters/Step 1/PondAuthoring.cs index dd4b961b4..fff96cf9a 100644 --- a/Dots101/Entities101/Assets/Firefighters/Step 1/PondAuthoring.cs +++ b/Dots101/Entities101/Assets/Firefighters/Step 1/PondAuthoring.cs @@ -15,9 +15,5 @@ public override void Bake(PondAuthoring authoring) } } - public struct Pond : IComponentData - { - - } + public struct Pond : IComponentData { } } - diff --git a/Dots101/Entities101/Assets/HelloCube/1. MainThread/HelloCube_MainThread.unity b/Dots101/Entities101/Assets/HelloCube/1. MainThread/HelloCube_MainThread.unity index cfe80380a..5deee51a2 100644 --- a/Dots101/Entities101/Assets/HelloCube/1. MainThread/HelloCube_MainThread.unity +++ b/Dots101/Entities101/Assets/HelloCube/1. MainThread/HelloCube_MainThread.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -159,8 +155,8 @@ Camera: m_GameObject: {fileID: 194095666} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -208,14 +204,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 194095666} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + serializedVersion: 2 + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 3, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!114 &194095670 MonoBehaviour: m_ObjectHideFlags: 0 @@ -246,19 +242,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &948347921 GameObject: m_ObjectHideFlags: 0 @@ -285,10 +282,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948347921} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -298,7 +294,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.5 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -337,8 +333,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &948347923 Transform: m_ObjectHideFlags: 0 @@ -346,13 +346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948347921} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &948347924 MonoBehaviour: @@ -366,17 +366,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1382613142 GameObject: m_ObjectHideFlags: 0 @@ -422,11 +428,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382613142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 194095669} + - {fileID: 948347923} + - {fileID: 1382613144} diff --git a/Dots101/Entities101/Assets/HelloCube/1. MainThread/Subscenes/HelloCube_MainThreadSubscene.unity b/Dots101/Entities101/Assets/HelloCube/1. MainThread/Subscenes/HelloCube_MainThreadSubscene.unity index 4ad3c1d3e..06af26c68 100644 --- a/Dots101/Entities101/Assets/HelloCube/1. MainThread/Subscenes/HelloCube_MainThreadSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/1. MainThread/Subscenes/HelloCube_MainThreadSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -148,13 +144,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 177836922} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 328130068} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &177836925 MeshRenderer: @@ -173,10 +169,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -194,6 +195,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -242,10 +244,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -263,6 +270,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -282,6 +290,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 328130064} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -289,7 +298,6 @@ Transform: m_Children: - {fileID: 177836923} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &328130069 MonoBehaviour: @@ -328,13 +336,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1486264437} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1486264440 MonoBehaviour: @@ -350,9 +358,20 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 1 IJobEntity: 0 - Aspects: 0 Prefabs: 0 IJobChunk: 0 Reparenting: 0 EnableableComponents: 0 GameObjectSync: 0 + CrossQuery: 0 + RandomSpawn: 0 + FirstPersonController: 0 + FixedTimestep: 0 + StateChange: 0 + ClosestTarget: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 328130068} + - {fileID: 1486264439} diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/CameraSystem.cs b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/CameraSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/CameraSystem.cs rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/CameraSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/CameraSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/CameraSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/CameraSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/CameraSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerAuthoring.cs similarity index 97% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerAuthoring.cs index 6a7f9b511..2ed16cbb1 100644 --- a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerAuthoring.cs @@ -1,6 +1,5 @@ using Unity.Entities; using UnityEngine; -using UnityEngine.Serialization; namespace HelloCube.FirstPersonController { diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerSystem.cs b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerSystem.cs rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/ControllerSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/ControllerSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/FirstPersonController.unity b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/FirstPersonController.unity similarity index 92% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/FirstPersonController.unity rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/FirstPersonController.unity index 9df5047d0..656757787 100644 --- a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/FirstPersonController.unity +++ b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/FirstPersonController.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -149,10 +145,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 966494817} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -201,8 +196,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &966494819 Transform: m_ObjectHideFlags: 0 @@ -210,13 +209,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 966494817} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &966494820 MonoBehaviour: @@ -230,17 +229,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1098635693 GameObject: m_ObjectHideFlags: 0 @@ -286,13 +291,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098635693} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1210702951 GameObject: @@ -330,8 +335,8 @@ Camera: m_GameObject: {fileID: 1210702951} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -379,13 +384,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1210702951} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1210702955 MonoBehaviour: @@ -417,16 +422,24 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1210702954} + - {fileID: 966494819} + - {fileID: 1098635695} diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/FirstPersonController.unity.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/FirstPersonController.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/FirstPersonController.unity.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/FirstPersonController.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/InputSystem.cs b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/InputSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/InputSystem.cs rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/InputSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/InputSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/InputSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/InputSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/InputSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity similarity index 95% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity index d2a9f3fe6..a7cd1346c 100644 --- a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity @@ -194,10 +194,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -215,6 +217,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -302,10 +305,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -323,6 +328,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -396,10 +402,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -417,6 +425,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -519,10 +528,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -540,6 +551,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -627,10 +639,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -648,6 +662,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -706,7 +721,6 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 0 IJobEntity: 0 - Aspects: 0 Prefabs: 0 IJobChunk: 0 Reparenting: 0 @@ -757,10 +771,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -778,6 +794,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -817,7 +834,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8da8ac377c974551bbcfd5066213800e, type: 3} m_Name: m_EditorClassIdentifier: - MouseSensitivity: 2 + MouseSensitivity: 1 PlayerSpeed: 5 JumpSpeed: 5 --- !u!1 &919937022 @@ -895,10 +912,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -916,6 +935,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1003,10 +1023,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1024,6 +1046,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1111,10 +1134,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1132,6 +1157,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1219,10 +1245,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1240,6 +1268,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1327,10 +1356,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1348,6 +1379,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1435,10 +1467,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1456,6 +1490,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1543,10 +1578,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1564,6 +1601,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1651,10 +1689,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1672,6 +1712,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1759,10 +1800,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1780,6 +1823,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1867,10 +1911,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1888,6 +1934,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1975,10 +2022,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1996,6 +2045,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -2144,10 +2194,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2165,6 +2217,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/11. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/10. FirstPersonController/Subscenes/FirstPersonControllerSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerAuthoring.cs similarity index 88% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerAuthoring.cs index fb446d5f3..e494816f7 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerAuthoring.cs @@ -6,7 +6,7 @@ namespace HelloCube.FixedTimestep { public class DefaultRateSpawnerAuthoring : MonoBehaviour { - public GameObject projectilePrefab; + public GameObject ProjectilePrefab; class Baker : Baker { @@ -16,7 +16,7 @@ public override void Bake(DefaultRateSpawnerAuthoring authoring) var spawnerData = new DefaultRateSpawner { - Prefab = GetEntity(authoring.projectilePrefab, TransformUsageFlags.Dynamic), + Prefab = GetEntity(authoring.ProjectilePrefab, TransformUsageFlags.Dynamic), SpawnPos = GetComponent().position, }; AddComponent(entity, spawnerData); diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerSystem.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerSystem.cs similarity index 88% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerSystem.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerSystem.cs index ed2d2b1ff..324b8cc30 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerSystem.cs @@ -26,11 +26,7 @@ public void OnUpdate(ref SystemState state) spawnPos.y += 0.3f * math.sin(5.0f * spawnTime); SystemAPI.SetComponent(projectileEntity, LocalTransform.FromPosition(spawnPos)); - SystemAPI.SetComponent(projectileEntity, new Projectile - { - SpawnTime = spawnTime, - SpawnPos = spawnPos, - }); + SystemAPI.SetComponent(projectileEntity, new Projectile { SpawnTime = spawnTime, SpawnPos = spawnPos, }); } } } diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/DefaultRateSpawnerSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/DefaultRateSpawnerSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerAuthoring.cs similarity index 88% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerAuthoring.cs index b32cf94c0..3c0676220 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerAuthoring.cs @@ -6,7 +6,7 @@ namespace HelloCube.FixedTimestep { public class FixedRateSpawnerAuthoring : MonoBehaviour { - public GameObject projectilePrefab; + public GameObject ProjectilePrefab; class Baker : Baker { @@ -16,7 +16,7 @@ public override void Bake(FixedRateSpawnerAuthoring authoring) var spawnerData = new FixedRateSpawner { - Prefab = GetEntity(authoring.projectilePrefab, TransformUsageFlags.Dynamic), + Prefab = GetEntity(authoring.ProjectilePrefab, TransformUsageFlags.Dynamic), SpawnPos = GetComponent().position, }; AddComponent(entity, spawnerData); diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerSystem.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerSystem.cs similarity index 90% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerSystem.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerSystem.cs index 4d2a3e305..c2823e22e 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerSystem.cs @@ -29,11 +29,7 @@ public void OnUpdate(ref SystemState state) spawnPos.y += 0.3f * math.sin(5.0f * spawnTime); SystemAPI.SetComponent(projectileEntity, LocalTransform.FromPosition(spawnPos)); - SystemAPI.SetComponent(projectileEntity, new Projectile - { - SpawnTime = spawnTime, - SpawnPos = spawnPos, - }); + SystemAPI.SetComponent(projectileEntity, new Projectile { SpawnTime = spawnTime, SpawnPos = spawnPos, }); } } } diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedRateSpawnerSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedRateSpawnerSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedTimestep.unity b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedTimestep.unity similarity index 92% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedTimestep.unity rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedTimestep.unity index 351d55a54..265c1bb78 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedTimestep.unity +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedTimestep.unity @@ -94,7 +94,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 973522771} + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -187,10 +187,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 540419900} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -330, y: -212} - m_SizeDelta: {x: 160, y: 30} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 360, y: -167} + m_SizeDelta: {x: 400, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &85521382 MonoBehaviour: @@ -213,9 +213,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 18 - m_FontStyle: 1 + m_Font: {fileID: 2230732570650464555, guid: 9f7eb5a84fc57b44ba619820a628e48d, type: 3} + m_FontSize: 20 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 @@ -414,8 +414,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -329, y: -185} - m_SizeDelta: {x: 160, y: 20} + m_AnchoredPosition: {x: -600, y: -142} + m_SizeDelta: {x: 400, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &440198148 MonoBehaviour: @@ -492,7 +492,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95880485189b3b347ac5829f36ac643a, type: 3} m_Name: m_EditorClassIdentifier: - sliderValueText: {fileID: 85521382} + SliderValueText: {fileID: 85521382} --- !u!1 &491290669 GameObject: m_ObjectHideFlags: 0 @@ -525,11 +525,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 540419900} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -208, y: -60} - m_SizeDelta: {x: 393.41443, y: 86.83388} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 160, y: -71} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &491290671 MonoBehaviour: m_ObjectHideFlags: 0 @@ -551,9 +551,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 18 - m_FontStyle: 1 + m_Font: {fileID: 2230732570650464555, guid: 9f7eb5a84fc57b44ba619820a628e48d, type: 3} + m_FontSize: 20 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 @@ -684,67 +684,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!850595691 &973522771 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Settings.lighting - serializedVersion: 9 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_LightmapSizeFixed: 0 - m_UseMipmapLimits: 1 - m_BakeResolution: 40 - m_Padding: 2 - m_LightmapCompression: 2 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} - m_ExportTrainingData: 0 - m_EnableWorkerProcessBaking: 1 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 1 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &1193976983 GameObject: m_ObjectHideFlags: 0 @@ -830,11 +769,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 540419900} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -202.86, y: 186} - m_SizeDelta: {x: 405.7125, y: 87.99095} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 160, y: 360} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1329052569 MonoBehaviour: m_ObjectHideFlags: 0 @@ -856,9 +795,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 18 - m_FontStyle: 1 + m_Font: {fileID: 2230732570650464555, guid: 9f7eb5a84fc57b44ba619820a628e48d, type: 3} + m_FontSize: 20 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 @@ -912,7 +851,7 @@ Light: m_Enabled: 1 serializedVersion: 11 m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -994,17 +933,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1507691757 GameObject: m_ObjectHideFlags: 0 @@ -1192,7 +1137,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -1284,7 +1229,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -1292,6 +1236,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &2120383419 GameObject: m_ObjectHideFlags: 0 @@ -1325,7 +1270,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} + m_AnchoredPosition: {x: -5.0000305, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1660057539 &9223372036854775807 diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedTimestep.unity.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedTimestep.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/FixedTimestep.unity.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/FixedTimestep.unity.meta diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/InstanceMat.mat similarity index 99% rename from EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/InstanceMat.mat index 45fd07e35..dab33483f 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/InstanceMat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/InstanceMat.mat.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/InstanceMat.mat.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/MoveProjectilesSystem.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/MoveProjectilesSystem.cs similarity index 94% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/MoveProjectilesSystem.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/MoveProjectilesSystem.cs index 4eb3cc933..38f028c91 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/MoveProjectilesSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/MoveProjectilesSystem.cs @@ -9,6 +9,7 @@ public partial struct MoveProjectilesSystem : ISystem [BurstCompile] public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); state.RequireForUpdate(); } @@ -16,7 +17,6 @@ public void OnCreate(ref SystemState state) public void OnUpdate(ref SystemState state) { var ecbSingleton = SystemAPI.GetSingleton(); - new MoveJob { TimeSinceLoad = (float)SystemAPI.Time.ElapsedTime, @@ -41,8 +41,8 @@ void Execute(Entity projectileEntity, [ChunkIndexInQuery] int chunkIndex, ref Lo { ECBWriter.DestroyEntity(chunkIndex, projectileEntity); } + transform.Position.x = projectile.SpawnPos.x + aliveTime * ProjectileSpeed; } } } - diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/MoveProjectilesSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/MoveProjectilesSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/MoveProjectilesSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/MoveProjectilesSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Projectile.prefab b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Projectile.prefab similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Projectile.prefab rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Projectile.prefab diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Projectile.prefab.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Projectile.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Projectile.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Projectile.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/ProjectileAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/ProjectileAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/ProjectileAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/ProjectileAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/ProjectileAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/ProjectileAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/ProjectileAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/ProjectileAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/RotatingCube.prefab b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/RotatingCube.prefab similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/RotatingCube.prefab rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/RotatingCube.prefab diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/RotatingCube.prefab.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/RotatingCube.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/RotatingCube.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/RotatingCube.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/SliderHandler.cs b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/SliderHandler.cs similarity index 91% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/SliderHandler.cs rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/SliderHandler.cs index b5a4c80d6..f74bc1740 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/SliderHandler.cs +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/SliderHandler.cs @@ -6,7 +6,7 @@ namespace HelloCube.FixedTimestep { public class SliderHandler : MonoBehaviour { - public Text sliderValueText; + public Text SliderValueText; public void OnSliderChange() { @@ -22,8 +22,9 @@ public void OnSliderChange() { // The group timestep can be set at runtime: fixedSimulationGroup.Timestep = 1.0f / fixedFps; + // The current timestep can also be retrieved: - sliderValueText.text = $"{(int)(1.0f / fixedSimulationGroup.Timestep)} updates/sec"; + SliderValueText.text = $"{(int)(1.0f / fixedSimulationGroup.Timestep)} updates/sec"; } } } diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/SliderHandler.cs.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/SliderHandler.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/SliderHandler.cs.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/SliderHandler.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes/FixedTimestepSubscene.unity b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes/FixedTimestepSubscene.unity similarity index 93% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes/FixedTimestepSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes/FixedTimestepSubscene.unity index 6a6f6897f..99fe4fd93 100644 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes/FixedTimestepSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes/FixedTimestepSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -167,6 +163,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -188,9 +189,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &17223678 Transform: @@ -219,7 +222,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2e4abfb324fcd740848067b8ddfa71e, type: 3} m_Name: m_EditorClassIdentifier: - projectilePrefab: {fileID: 7756226592167583472, guid: da5aa1b408b7d4b269c4f24603ba3aac, + ProjectilePrefab: {fileID: 7756226592167583472, guid: da5aa1b408b7d4b269c4f24603ba3aac, type: 3} --- !u!1 &118432041 GameObject: @@ -257,6 +260,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -278,9 +286,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &118432044 Transform: @@ -317,7 +327,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 770bfcfd201c4fb8b97117046c004a6c, type: 3} m_Name: m_EditorClassIdentifier: - projectilePrefab: {fileID: 7756226592167583472, guid: da5aa1b408b7d4b269c4f24603ba3aac, + ProjectilePrefab: {fileID: 7756226592167583472, guid: da5aa1b408b7d4b269c4f24603ba3aac, type: 3} --- !u!1 &340881315 GameObject: @@ -375,6 +385,8 @@ MonoBehaviour: RandomSpawn: 0 FirstPersonController: 0 FixedTimestep: 1 + StateChange: 0 + ClosestTarget: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes/FixedTimestepSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes/FixedTimestepSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/Subscenes/FixedTimestepSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/11. FixedTimestep/Subscenes/FixedTimestepSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Circle.png b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Circle.png similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Circle.png rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Circle.png diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Circle.png.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Circle.png.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Circle.png.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Circle.png.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Custom2DTransforms.unity b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Custom2DTransforms.unity similarity index 92% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Custom2DTransforms.unity rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Custom2DTransforms.unity index 4826c042a..20e9b141b 100644 --- a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Custom2DTransforms.unity +++ b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Custom2DTransforms.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -160,7 +156,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0} + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -208,13 +204,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 586339609} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &586339613 MonoBehaviour: @@ -246,19 +242,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &905464547 GameObject: m_ObjectHideFlags: 0 @@ -285,9 +282,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 905464547} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -337,8 +333,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &905464549 Transform: m_ObjectHideFlags: 0 @@ -346,13 +346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 905464547} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &905464550 MonoBehaviour: @@ -366,17 +366,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 2 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 + m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1612464037 GameObject: m_ObjectHideFlags: 0 @@ -422,11 +428,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1612464037} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 586339612} + - {fileID: 905464549} + - {fileID: 1612464039} diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Custom2DTransforms.unity.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Custom2DTransforms.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Custom2DTransforms.unity.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Custom2DTransforms.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/CustomTransforms.asmdef b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/CustomTransforms.asmdef similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/CustomTransforms.asmdef rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/CustomTransforms.asmdef diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/CustomTransforms.asmdef.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/CustomTransforms.asmdef.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/CustomTransforms.asmdef.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/CustomTransforms.asmdef.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/LocalToWorld2DSystem.cs b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/LocalToWorld2DSystem.cs similarity index 96% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/LocalToWorld2DSystem.cs rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/LocalToWorld2DSystem.cs index e5a52ba7d..f37b0bd28 100644 --- a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/LocalToWorld2DSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/LocalToWorld2DSystem.cs @@ -32,9 +32,12 @@ public void OnCreate(ref SystemState state) [BurstCompile] public void OnUpdate(ref SystemState state) { - var rootsQuery = SystemAPI.QueryBuilder().WithAll().WithAllRW() + var rootsQuery = SystemAPI.QueryBuilder() + .WithAll() + .WithAllRW() .WithNone().Build(); - var parentsQuery = SystemAPI.QueryBuilder().WithAll() + var parentsQuery = SystemAPI.QueryBuilder() + .WithAll() .WithAllRW() .WithNone().Build(); var localToWorldWriteGroupMask = SystemAPI.QueryBuilder() @@ -127,7 +130,7 @@ public void Execute(in ArchetypeChunk chunk, int unfilteredChunkIndex, bool useE Assert.IsFalse(useEnabledMask); bool updateChildrenTransform = chunk.DidChange(ref ChildTypeHandle, LastSystemVersion); - BufferAccessor chunkChildBuffers = chunk.GetBufferAccessor(ref ChildTypeHandle); + BufferAccessor chunkChildBuffers = chunk.GetBufferAccessorRO(ref ChildTypeHandle); updateChildrenTransform = updateChildrenTransform || chunk.DidChange(ref LocalToWorldTypeHandleRW, LastSystemVersion); LocalToWorld* chunkLocalToWorlds = diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/LocalToWorld2DSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/LocalToWorld2DSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/LocalToWorld2DSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/LocalToWorld2DSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/MovementSystem.cs b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/MovementSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/MovementSystem.cs rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/MovementSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/MovementSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/MovementSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/MovementSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/MovementSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity similarity index 97% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity index f23b33bfb..7a82eeb62 100644 --- a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity @@ -154,6 +154,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &150648170 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -172,6 +173,8 @@ SpriteRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -193,10 +196,13 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 7482667652216324306, guid: f5167e752b40c47de84ed0ce2532d2f0, type: 3} + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: f5167e752b40c47de84ed0ce2532d2f0, + type: 3} m_Color: {r: 0.9150943, g: 0.42518294, b: 0.10791205, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -205,7 +211,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!114 &150648171 MonoBehaviour: @@ -239,6 +244,7 @@ GameObject: m_IsActive: 1 --- !u!212 &1008641956 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -257,6 +263,8 @@ SpriteRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -278,10 +286,13 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -2413806693520163455, guid: 9123a5d4109f4447b871291041f77382, type: 3} + m_MaskInteraction: 0 + m_Sprite: {fileID: -2413806693520163455, guid: 9123a5d4109f4447b871291041f77382, + type: 3} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -290,7 +301,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1008641957 Transform: diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Subscenes/Custom2DTransformsSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Transform2DAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Transform2DAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Transform2DAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Transform2DAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Transform2DAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Transform2DAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Transform2DAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Transform2DAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Triangle.png b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Triangle.png similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Triangle.png rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Triangle.png diff --git a/Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Triangle.png.meta b/Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Triangle.png.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/13. CustomTransforms/Triangle.png.meta rename to Dots101/Entities101/Assets/HelloCube/12. CustomTransforms/Triangle.png.meta diff --git a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat b/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat deleted file mode 100644 index 45fd07e35..000000000 --- a/Dots101/Entities101/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat +++ /dev/null @@ -1,142 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-303947083916886597 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: InstanceMat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ClearCoatMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoat: 0 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _UVSec: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 0.7647059, g: 0.873428, b: 1, a: 1} - - _Color: {r: 0.7647059, g: 0.873428, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/ConfigAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/ConfigAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/ConfigAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/ConfigAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/ConfigAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/ConfigAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/ConfigAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/ConfigAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Cube.prefab b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Cube.prefab similarity index 95% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Cube.prefab rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Cube.prefab index f107d9f4c..98eba73d1 100644 --- a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Cube.prefab +++ b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Cube.prefab @@ -62,10 +62,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: bd11108a6fea44479a411569e348aeb2, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -83,6 +85,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Cube.prefab.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Cube.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Cube.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Cube.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/CubeSpawnSystem.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/CubeSpawnSystem.cs similarity index 94% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/CubeSpawnSystem.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/CubeSpawnSystem.cs index 67b5aedc2..5145a52d6 100644 --- a/Dots101/Entities101/Assets/HelloCube/14. StateChange/CubeSpawnSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/13. StateChange/CubeSpawnSystem.cs @@ -8,7 +8,7 @@ namespace HelloCube.StateChange { public partial struct CubeSpawnSystem : ISystem { - Config priorConfig; + Config m_PriorConfig; [BurstCompile] public void OnCreate(ref SystemState state) @@ -22,11 +22,11 @@ public void OnUpdate(ref SystemState state) { var config = SystemAPI.GetSingleton(); - if (ConfigEquals(priorConfig, config)) + if (ConfigEquals(m_PriorConfig, config)) { return; } - priorConfig = config; + m_PriorConfig = config; var query = SystemAPI.QueryBuilder().WithAll().Build(); state.EntityManager.DestroyEntity(query); diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/CubeSpawnSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/CubeSpawnSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/CubeSpawnSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/CubeSpawnSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/InputSystem.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/InputSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/InputSystem.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/InputSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/InputSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/InputSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/InputSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/InputSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/ProfilerModuleSystem.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/ProfilerModuleSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/ProfilerModuleSystem.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/ProfilerModuleSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/ProfilerModuleSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/ProfilerModuleSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/ProfilerModuleSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/ProfilerModuleSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/StateChangeProfilerModule.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/StateChangeProfilerModule.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/StateChangeProfilerModule.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/StateChangeProfilerModule.cs diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/StateChangeProfilerModule.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/StateChangeProfilerModule.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Profiling/StateChangeProfilerModule.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Profiling/StateChangeProfilerModule.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/SetStateSystem.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/SetStateSystem.cs similarity index 98% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/SetStateSystem.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/SetStateSystem.cs index 5722b56cd..c4d370a19 100644 --- a/Dots101/Entities101/Assets/HelloCube/14. StateChange/SetStateSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/13. StateChange/SetStateSystem.cs @@ -13,6 +13,7 @@ public partial struct SetStateSystem : ISystem [BurstCompile] public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); state.RequireForUpdate(); state.RequireForUpdate(); state.RequireForUpdate(); diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/SetStateSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/SetStateSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/SetStateSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/SetStateSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/SpinSystem.cs b/Dots101/Entities101/Assets/HelloCube/13. StateChange/SpinSystem.cs similarity index 97% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/SpinSystem.cs rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/SpinSystem.cs index b4a289228..30a808732 100644 --- a/Dots101/Entities101/Assets/HelloCube/14. StateChange/SpinSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/13. StateChange/SpinSystem.cs @@ -11,6 +11,7 @@ public partial struct SpinSystem : ISystem [BurstCompile] public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); state.RequireForUpdate(); } diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/SpinSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/SpinSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/SpinSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/SpinSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/StateChange.unity b/Dots101/Entities101/Assets/HelloCube/13. StateChange/StateChange.unity similarity index 92% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/StateChange.unity rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/StateChange.unity index dcd294ab8..c5e483081 100644 --- a/Dots101/Entities101/Assets/HelloCube/14. StateChange/StateChange.unity +++ b/Dots101/Entities101/Assets/HelloCube/13. StateChange/StateChange.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -149,10 +145,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60605258} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -201,8 +196,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &60605260 Transform: m_ObjectHideFlags: 0 @@ -210,6 +209,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60605258} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -217,7 +217,6 @@ Transform: m_Children: - {fileID: 613658176} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &60605261 MonoBehaviour: @@ -231,17 +230,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &547103424 GameObject: m_ObjectHideFlags: 0 @@ -278,8 +283,8 @@ Camera: m_GameObject: {fileID: 547103424} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -327,13 +332,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547103424} + serializedVersion: 2 m_LocalRotation: {x: 0.2897422, y: -0.6462266, z: 0.29118505, w: 0.6431578} m_LocalPosition: {x: 83.11433, y: 76.85404, z: -3.911323} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!114 &547103428 MonoBehaviour: @@ -365,19 +370,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &613658175 GameObject: m_ObjectHideFlags: 0 @@ -401,13 +407,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 613658175} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 60605260} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1225607846 GameObject: @@ -454,11 +460,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1225607846} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 547103427} + - {fileID: 60605260} + - {fileID: 1225607848} diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/StateChange.unity.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/StateChange.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/StateChange.unity.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/StateChange.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes/StateChangeSubscene.unity b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes/StateChangeSubscene.unity similarity index 96% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes/StateChangeSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes/StateChangeSubscene.unity index 049a48aa3..3b9dfe278 100644 --- a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes/StateChangeSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes/StateChangeSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -169,7 +165,6 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 0 IJobEntity: 0 - Aspects: 0 Prefabs: 0 IJobChunk: 0 Reparenting: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes/StateChangeSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes/StateChangeSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/14. StateChange/Subscenes/StateChangeSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/13. StateChange/Subscenes/StateChangeSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/ClosestTarget.unity b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/ClosestTarget.unity similarity index 90% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/ClosestTarget.unity rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/ClosestTarget.unity index 0e9e0b4ea..1ad7d860d 100644 --- a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/ClosestTarget.unity +++ b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/ClosestTarget.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -168,13 +164,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 413672723} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &882972423 GameObject: @@ -212,8 +208,8 @@ Camera: m_GameObject: {fileID: 882972423} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -261,14 +257,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882972423} - m_LocalRotation: {x: 0.30192518, y: -0, z: -0, w: 0.95333165} - m_LocalPosition: {x: 0, y: 14.44, z: -10} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 15, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 35.147, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!114 &882972427 MonoBehaviour: m_ObjectHideFlags: 0 @@ -299,19 +295,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1654971241 GameObject: m_ObjectHideFlags: 0 @@ -338,10 +335,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1654971241} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -390,8 +386,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1654971243 Transform: m_ObjectHideFlags: 0 @@ -399,13 +399,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1654971241} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1654971244 MonoBehaviour: @@ -419,14 +419,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 882972426} + - {fileID: 1654971243} + - {fileID: 413672725} diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/ClosestTarget.unity.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/ClosestTarget.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/ClosestTarget.unity.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/ClosestTarget.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/DebugLinesSystem.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/DebugLinesSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/DebugLinesSystem.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/DebugLinesSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/DebugLinesSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/DebugLinesSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/DebugLinesSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/DebugLinesSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/InitializationSystem.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/InitializationSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/InitializationSystem.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/InitializationSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/InitializationSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/InitializationSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/InitializationSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/InitializationSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/KDTree.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/KDTree.cs similarity index 99% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/KDTree.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/KDTree.cs index 77e9ca567..a3bc3694a 100644 --- a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/KDTree.cs +++ b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/KDTree.cs @@ -9,7 +9,6 @@ using Unity.Burst; using Unity.Collections; using Unity.Collections.LowLevel.Unsafe; -using Unity.Entities; using Unity.Jobs; using Unity.Jobs.LowLevel.Unsafe; using Unity.Mathematics; @@ -750,4 +749,4 @@ internal void CheckChildNodes(uint leftNode, uint rightNode, uint parentCount) } #endif -} \ No newline at end of file +} diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/KDTree.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/KDTree.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/KDTree.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/KDTree.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/NativePriorityHeap.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/NativePriorityHeap.cs similarity index 99% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/NativePriorityHeap.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/NativePriorityHeap.cs index e09dd510a..bb6a7086a 100644 --- a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/NativePriorityHeap.cs +++ b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/NativePriorityHeap.cs @@ -4,7 +4,6 @@ using System; using Unity.Collections; using Unity.Collections.LowLevel.Unsafe; -using Unity.Mathematics; namespace NativePriorityHeap { @@ -220,4 +219,4 @@ void BubbleDown(int initialIndex) int GetParentIndex(int i) { return (i - 1) / 2; } int GetLeftChildIndex(int i) { return 2 * i + 1; } int GetRightChildIndex(int i) { return 2 * i + 2; } -} \ No newline at end of file +} diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/NativePriorityHeap.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/NativePriorityHeap.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/NativePriorityHeap.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/NativePriorityHeap.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/SpatialTree.asmdef b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/SpatialTree.asmdef similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/SpatialTree.asmdef rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/SpatialTree.asmdef diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/SpatialTree.asmdef.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/SpatialTree.asmdef.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/KDTree/SpatialTree.asmdef.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/KDTree/SpatialTree.asmdef.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementSystem.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementSystem.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/MovementSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/MovementSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/SettingsAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/SettingsAuthoring.cs similarity index 61% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/SettingsAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/SettingsAuthoring.cs index 565f9b3fe..b4d41cc38 100644 --- a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/SettingsAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/SettingsAuthoring.cs @@ -5,13 +5,13 @@ namespace HelloCube.ClosestTarget { public class SettingsAuthoring : MonoBehaviour { - public int unitCount; - public GameObject unitPrefab; + public int UnitCount; + public GameObject UnitPrefab; - public int targetCount; - public GameObject targetPrefab; + public int TargetCount; + public GameObject TargetPrefab; - public TargetingSystem.SpatialPartitioningType spatialPartitioning; + public TargetingSystem.SpatialPartitioningType SpatialPartitioning; class Baker : Baker { @@ -20,11 +20,11 @@ public override void Bake(SettingsAuthoring authoring) var entity = GetEntity(TransformUsageFlags.None); AddComponent(entity, new Settings { - UnitCount = authoring.unitCount, - UnitPrefab = GetEntity(authoring.unitPrefab, TransformUsageFlags.Dynamic), - TargetCount = authoring.targetCount, - TargetPrefab = GetEntity(authoring.targetPrefab, TransformUsageFlags.Dynamic), - SpatialPartitioning = authoring.spatialPartitioning + UnitCount = authoring.UnitCount, + UnitPrefab = GetEntity(authoring.UnitPrefab, TransformUsageFlags.Dynamic), + TargetCount = authoring.TargetCount, + TargetPrefab = GetEntity(authoring.TargetPrefab, TransformUsageFlags.Dynamic), + SpatialPartitioning = authoring.SpatialPartitioning }); } } diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/SettingsAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/SettingsAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/SettingsAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/SettingsAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes/ClosestTargetSubscene.unity b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes/ClosestTargetSubscene.unity similarity index 94% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes/ClosestTargetSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes/ClosestTargetSubscene.unity index bfa111eb7..9888d4fba 100644 --- a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes/ClosestTargetSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes/ClosestTargetSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -152,13 +148,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 251b2e6451b14f8693fe8afc86edf3bf, type: 3} m_Name: m_EditorClassIdentifier: - unitCount: 4000 - unitPrefab: {fileID: 1425423955843570488, guid: e2cbc64ad63f35e439a128e262e1d8f5, + UnitCount: 4000 + UnitPrefab: {fileID: 1425423955843570488, guid: e2cbc64ad63f35e439a128e262e1d8f5, type: 3} - targetCount: 5000 - targetPrefab: {fileID: 3903282987089014872, guid: 1f1e19d91e4ba9f47a6410b5982b28e7, + TargetCount: 5000 + TargetPrefab: {fileID: 3903282987089014872, guid: 1f1e19d91e4ba9f47a6410b5982b28e7, type: 3} - spatialPartitioning: 1 + SpatialPartitioning: 1 --- !u!4 &1103256106 Transform: m_ObjectHideFlags: 0 @@ -230,6 +226,7 @@ MonoBehaviour: RandomSpawn: 0 FirstPersonController: 0 FixedTimestep: 0 + StateChange: 0 ClosestTarget: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes/ClosestTargetSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes/ClosestTargetSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Subscenes/ClosestTargetSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Subscenes/ClosestTargetSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Target.prefab b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Target.prefab similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Target.prefab rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Target.prefab diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Target.prefab.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Target.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Target.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Target.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetingSystem.cs b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetingSystem.cs similarity index 93% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetingSystem.cs rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetingSystem.cs index e1ff64e5f..ec62569aa 100644 --- a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetingSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetingSystem.cs @@ -150,18 +150,18 @@ public partial struct SimplePartitioning : IJobEntity [ReadOnly] public NativeArray TargetEntities; [ReadOnly] public NativeArray Positions; - public void Execute(ref Target target, in LocalTransform translation) + void Execute(ref Target target, in LocalTransform translation) { - var ownpos = new PositionAndIndex { Position = translation.Position.xz }; - var index = Positions.BinarySearch(ownpos, new AxisXComparer()); + var ownPos = new PositionAndIndex { Position = translation.Position.xz }; + var index = Positions.BinarySearch(ownPos, new AxisXComparer()); if (index < 0) index = ~index; if (index >= Positions.Length) index = Positions.Length - 1; - var closestDistSq = math.distancesq(ownpos.Position, Positions[index].Position); + var closestDistSq = math.distancesq(ownPos.Position, Positions[index].Position); var closestEntity = index; - Search(index + 1, Positions.Length, +1, ref closestDistSq, ref closestEntity, ownpos); - Search(index - 1, -1, -1, ref closestDistSq, ref closestEntity, ownpos); + Search(index + 1, Positions.Length, +1, ref closestDistSq, ref closestEntity, ownPos); + Search(index - 1, -1, -1, ref closestDistSq, ref closestEntity, ownPos); target.Value = TargetEntities[Positions[closestEntity].Index]; } @@ -171,10 +171,10 @@ void Search(int startIndex, int endIndex, int step, ref float closestDistSqRef, { for (int i = startIndex; i != endIndex; i += step) { - var xdiff = ownpos.Position.x - Positions[i].Position.x; - xdiff *= xdiff; + var xDiff = ownpos.Position.x - Positions[i].Position.x; + xDiff *= xDiff; - if (xdiff > closestDistSqRef) break; + if (xDiff > closestDistSqRef) break; var distSq = math.distancesq(Positions[i].Position, ownpos.Position); @@ -195,7 +195,7 @@ public partial struct NoPartitioning : IJobEntity [ReadOnly] public NativeArray TargetEntities; - public void Execute(ref Target target, in LocalTransform translation) + void Execute(ref Target target, in LocalTransform translation) { var closestDistSq = float.MaxValue; var closestEntity = Entity.Null; diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetingSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetingSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/TargetingSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/TargetingSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Unit.prefab b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Unit.prefab similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Unit.prefab rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Unit.prefab diff --git a/Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Unit.prefab.meta b/Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Unit.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/15. ClosestTarget/Unit.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/14. ClosestTarget/Unit.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/3. Aspects.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef.meta similarity index 77% rename from Dots101/Entities101/Assets/HelloCube/3. Aspects.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef.meta index 317e6068e..73ff1126e 100644 --- a/Dots101/Entities101/Assets/HelloCube/3. Aspects.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d4dbf9316c524cf08a35fddc17390c6 +guid: 3d34b57794ef13c42b2632d186059bd7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/EntitiesSamples/Assets/Boids/Editor Default Resources.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation.meta similarity index 77% rename from EntitiesSamples/Assets/Boids/Editor Default Resources.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation.meta index eb54f68ef..b0c8245c4 100644 --- a/EntitiesSamples/Assets/Boids/Editor Default Resources.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 902198d88e7e4f04ab61b39c8f622b81 +guid: 8a7fdaab037c6224d9b32e21eebf6649 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/AC_RotatingCube.controller b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/AC_RotatingCube.controller new file mode 100644 index 000000000..e3665afde --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/AC_RotatingCube.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-63173074463389776 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RotatingCube + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 69b531ba0859c1241973fd09b880fe6f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AC_RotatingCube + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6301552962014995782} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &6301552962014995782 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -63173074463389776} + m_Position: {x: 270, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -63173074463389776} diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall1.mat.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/AC_RotatingCube.controller.meta similarity index 64% rename from EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall1.mat.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/AC_RotatingCube.controller.meta index da18a3359..1a29e7348 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall1.mat.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/AC_RotatingCube.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e970940527c5c49748840ccc8b04a881 +guid: ba9926fde2fe42647854b0cf2b274e88 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/RotatingCube.anim b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/RotatingCube.anim new file mode 100644 index 000000000..87cdf3c08 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/RotatingCube.anim @@ -0,0 +1,249 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RotatingCube + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 360, z: 0} + outSlope: {x: 0, y: 360, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 180, z: 0} + inSlope: {x: 0, y: 360, z: 0} + outSlope: {x: 0, y: 360, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 360, z: 0} + inSlope: {x: 0, y: 360, z: 0} + outSlope: {x: 0, y: 360, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 1 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 360 + outSlope: 360 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 180 + inSlope: 360 + outSlope: 360 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 360 + inSlope: 360 + outSlope: 360 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Dots101/Physics101/Assets/Readme.asset.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/RotatingCube.anim.meta similarity index 64% rename from Dots101/Physics101/Assets/Readme.asset.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/RotatingCube.anim.meta index ab3ad4535..fe11851c6 100644 --- a/Dots101/Physics101/Assets/Readme.asset.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Animation/RotatingCube.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 8105016687592461f977c054a80ce2f2 +guid: 69b531ba0859c1241973fd09b880fe6f NativeFormatImporter: externalObjects: {} - mainObjectFileID: 0 + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/AnimatorAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/AnimatorAuthoring.cs new file mode 100644 index 000000000..12fe2d1c2 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/AnimatorAuthoring.cs @@ -0,0 +1,21 @@ +using Unity.Entities; +using UnityEngine; + +public class AnimatorAuthoring : MonoBehaviour +{ + public GameObject AnimatorPrefab; + + public class AnimatorBaker : Baker + { + public override void Bake(AnimatorAuthoring authoring) + { + var e = GetEntity(TransformUsageFlags.Renderable); + AddComponent(e, new AnimatorRefComponent { AnimatorAsGO = authoring.AnimatorPrefab }); + } + } +} + +public struct AnimatorRefComponent : IComponentData +{ + public UnityObjectRef AnimatorAsGO; +} diff --git a/PhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracerSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/AnimatorAuthoring.cs.meta similarity index 83% rename from PhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracerSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/AnimatorAuthoring.cs.meta index a072984b5..140e5d4c3 100644 --- a/PhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracerSystem.cs.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/AnimatorAuthoring.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7de48c1bd6f9e744ebb96e3eaba65c5a +guid: ea85fc8701688e047be6af37fe3cbec3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/ChangeRotationAnimationSystem.cs b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/ChangeRotationAnimationSystem.cs new file mode 100644 index 000000000..54b033a44 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/ChangeRotationAnimationSystem.cs @@ -0,0 +1,18 @@ +using Unity.Entities; +using UnityEngine; + +#if !UNITY_DISABLE_MANAGED_COMPONENTS +[assembly: RegisterUnityEngineComponentType(typeof(Animator))] + +public partial struct ChangeRotationAnimationSystem : ISystem +{ + public void OnUpdate(ref SystemState state) + { + foreach (var animator in SystemAPI.Query>()) + { + var sineSpeed = 1f + Mathf.Sin(Time.time); + animator.Value.speed = sineSpeed; + } + } +} +#endif diff --git a/PhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracer.cs.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/ChangeRotationAnimationSystem.cs.meta similarity index 83% rename from PhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracer.cs.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/ChangeRotationAnimationSystem.cs.meta index 9e31819bb..c54d3a0f6 100644 --- a/PhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracer.cs.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/ChangeRotationAnimationSystem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e58fa05729b45843898311e1221115d +guid: be134fa40d5131f4ea67dc16bb90e249 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/RotatingCubePrefab.prefab b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/RotatingCubePrefab.prefab new file mode 100644 index 000000000..0f0eb4630 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/RotatingCubePrefab.prefab @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4568691465473315575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8626479074380442692} + - component: {fileID: 6894506920510072427} + - component: {fileID: 3912000069501507223} + - component: {fileID: 710721873408772201} + - component: {fileID: 6428387558800169395} + m_Layer: 0 + m_Name: RotatingCubePrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8626479074380442692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4568691465473315575} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6894506920510072427 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4568691465473315575} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3912000069501507223 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4568691465473315575} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &710721873408772201 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4568691465473315575} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!95 &6428387558800169395 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4568691465473315575} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ba9926fde2fe42647854b0cf2b274e88, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/RotatingCubePrefab.prefab.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/RotatingCubePrefab.prefab.meta new file mode 100644 index 000000000..6b3ad55a8 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/RotatingCubePrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2af17a412015b834187ef262e4e994e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/SpawnAnimatedCubeSystem.cs b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/SpawnAnimatedCubeSystem.cs new file mode 100644 index 000000000..99dc2d742 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/SpawnAnimatedCubeSystem.cs @@ -0,0 +1,37 @@ +using Unity.Entities; +using UnityEngine; + +public partial struct SpawnAnimatedCubeSystem : ISystem +{ + EntityQuery m_AnimatorRefComponentQuery; + + public void OnCreate(ref SystemState state) + { + m_AnimatorRefComponentQuery = SystemAPI.QueryBuilder() + .WithAll() + .WithNone() + .Build(); + state.RequireForUpdate(m_AnimatorRefComponentQuery); + } + + public void OnUpdate(ref SystemState state) + { + var entities = SystemAPI.QueryBuilder() + .WithAll() + .WithNone() + .Build() + .ToEntityArray(state.WorldUpdateAllocator); + + foreach (var entity in entities) + { + //Get the animator reference + var animRef = SystemAPI.GetComponent(entity); + + //Instantiate the GO + var rotatingCube = (GameObject)Object.Instantiate(animRef.AnimatorAsGO); + + //Add the animator to the entity + state.EntityManager.AddComponentObject(entity, rotatingCube.GetComponent()); + } + } +} diff --git a/EntitiesSamples/Assets/Boids/ImageEffects/Scripts/PostEffectsBase.cs.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/SpawnAnimatedCubeSystem.cs.meta similarity index 65% rename from EntitiesSamples/Assets/Boids/ImageEffects/Scripts/PostEffectsBase.cs.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/SpawnAnimatedCubeSystem.cs.meta index a31053424..f3c7e20eb 100644 --- a/EntitiesSamples/Assets/Boids/ImageEffects/Scripts/PostEffectsBase.cs.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/SpawnAnimatedCubeSystem.cs.meta @@ -1,9 +1,11 @@ fileFormatVersion: 2 -guid: b6f4318ec6c2bf643a0f9edfeeaba0ec +guid: 54979b3734d83024d8d64dc154b4767f MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/HelloCube/3. Aspects/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes.meta similarity index 77% rename from Dots101/Entities101/Assets/HelloCube/3. Aspects/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes.meta index 13b7846d1..bd7152466 100644 --- a/Dots101/Entities101/Assets/HelloCube/3. Aspects/Subscenes.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca6b50bcce65248c684eeea31ab70def +guid: 782c933e5d9672f479e286850954d3bc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes/UnityObjectRefSubscene.unity b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes/UnityObjectRefSubscene.unity new file mode 100644 index 000000000..e558cd073 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes/UnityObjectRefSubscene.unity @@ -0,0 +1,172 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &426256295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 426256296} + - component: {fileID: 426256297} + m_Layer: 0 + m_Name: Spawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &426256296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426256295} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &426256297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426256295} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea85fc8701688e047be6af37fe3cbec3, type: 3} + m_Name: + m_EditorClassIdentifier: + AnimatorPrefab: {fileID: 4568691465473315575, guid: 2af17a412015b834187ef262e4e994e2, + type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 426256296} diff --git a/Dots101/Entities101/Assets/HelloCube/3. Aspects/HelloCube_Aspects.unity.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes/UnityObjectRefSubscene.unity.meta similarity index 74% rename from Dots101/Entities101/Assets/HelloCube/3. Aspects/HelloCube_Aspects.unity.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes/UnityObjectRefSubscene.unity.meta index 1a230c908..706630dba 100644 --- a/Dots101/Entities101/Assets/HelloCube/3. Aspects/HelloCube_Aspects.unity.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/Subscenes/UnityObjectRefSubscene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7308bfc84dee44e8596caadeaa5e6f52 +guid: ed9596f42c2049a4da6476dfc213dc4f DefaultImporter: externalObjects: {} userData: diff --git a/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/UnityObjectRef.unity b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/UnityObjectRef.unity new file mode 100644 index 000000000..b7506dd26 --- /dev/null +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/UnityObjectRef.unity @@ -0,0 +1,445 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &112217252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 112217254} + - component: {fileID: 112217253} + m_Layer: 0 + m_Name: UnityObjectRefSubscene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &112217253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112217252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3} + m_Name: + m_EditorClassIdentifier: + _SceneAsset: {fileID: 102900000, guid: ed9596f42c2049a4da6476dfc213dc4f, type: 3} + _HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + AutoLoadScene: 1 + _SceneGUID: + Value: + x: 1332304350 + y: 1251214018 + z: 4251403949 + w: 4107088172 +--- !u!4 &112217254 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112217252} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1544662363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544662367} + - component: {fileID: 1544662366} + - component: {fileID: 1544662365} + - component: {fileID: 1544662364} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1544662364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544662363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &1544662365 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544662363} + m_Enabled: 1 +--- !u!20 &1544662366 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544662363} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1544662367 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544662363} + serializedVersion: 2 + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 3, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} +--- !u!1 &2015099035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2015099038} + - component: {fileID: 2015099037} + - component: {fileID: 2015099036} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2015099036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015099035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &2015099037 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015099035} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 0.5 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &2015099038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015099035} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2015099038} + - {fileID: 1544662367} + - {fileID: 112217254} diff --git a/Dots101/Entities101/Assets/HelloCube/3. Aspects/Subscenes/HelloCube_AspectsSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/UnityObjectRef.unity.meta similarity index 74% rename from Dots101/Entities101/Assets/HelloCube/3. Aspects/Subscenes/HelloCube_AspectsSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/UnityObjectRef.unity.meta index c586c0f1b..c5c958c7c 100644 --- a/Dots101/Entities101/Assets/HelloCube/3. Aspects/Subscenes/HelloCube_AspectsSubscene.unity.meta +++ b/Dots101/Entities101/Assets/HelloCube/15. UnityObjectRef/UnityObjectRef.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 45e33b02c0ad9443abf5505643ff9522 +guid: 5c32f3618c1f76142b6c1b41b5fc3483 DefaultImporter: externalObjects: {} userData: diff --git a/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/HelloCube_IJobEntity.unity b/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/HelloCube_IJobEntity.unity index 45b689b98..74f39bfed 100644 --- a/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/HelloCube_IJobEntity.unity +++ b/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/HelloCube_IJobEntity.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -159,8 +155,8 @@ Camera: m_GameObject: {fileID: 194095666} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -208,13 +204,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 194095666} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &194095670 MonoBehaviour: @@ -246,19 +242,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &948347921 GameObject: m_ObjectHideFlags: 0 @@ -285,9 +282,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948347921} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -337,8 +333,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &948347923 Transform: m_ObjectHideFlags: 0 @@ -346,13 +346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948347921} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &948347924 MonoBehaviour: @@ -366,17 +366,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1382613142 GameObject: m_ObjectHideFlags: 0 @@ -422,11 +428,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382613142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 194095669} + - {fileID: 948347923} + - {fileID: 1382613144} diff --git a/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/RotationSystem.cs b/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/RotationSystem.cs index fd6153f5d..53f444d3a 100644 --- a/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/RotationSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/RotationSystem.cs @@ -18,8 +18,7 @@ public void OnUpdate(ref SystemState state) { var job = new RotateAndScaleJob { - deltaTime = SystemAPI.Time.DeltaTime, - elapsedTime = (float)SystemAPI.Time.ElapsedTime + DeltaTime = SystemAPI.Time.DeltaTime, ElapsedTime = (float)SystemAPI.Time.ElapsedTime }; job.Schedule(); } @@ -28,16 +27,16 @@ public void OnUpdate(ref SystemState state) [BurstCompile] partial struct RotateAndScaleJob : IJobEntity { - public float deltaTime; - public float elapsedTime; + public float DeltaTime; + public float ElapsedTime; // In source generation, a query is created from the parameters of Execute(). // Here, the query will match all entities having a LocalTransform, PostTransformMatrix, and RotationSpeed component. // (In the scene, the root cube has a non-uniform scale, so it is given a PostTransformMatrix component in baking.) void Execute(ref LocalTransform transform, ref PostTransformMatrix postTransform, in RotationSpeed speed) { - transform = transform.RotateY(speed.RadiansPerSecond * deltaTime); - postTransform.Value = float4x4.Scale(1, math.sin(elapsedTime), 1); + transform = transform.RotateY(speed.RadiansPerSecond * DeltaTime); + postTransform.Value = float4x4.Scale(1, math.sin(ElapsedTime), 1); } } } diff --git a/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/Subscenes/HelloCube_IJobEntitySubscene.unity b/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/Subscenes/HelloCube_IJobEntitySubscene.unity index d147a70d2..fcad708ff 100644 --- a/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/Subscenes/HelloCube_IJobEntitySubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/2. IJobEntity/Subscenes/HelloCube_IJobEntitySubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -148,13 +144,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 177836922} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 328130068} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &177836925 MeshRenderer: @@ -173,10 +169,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -194,6 +195,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -242,10 +244,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -263,6 +270,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -282,6 +290,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 328130064} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 2, z: 1} @@ -289,7 +298,6 @@ Transform: m_Children: - {fileID: 177836923} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &328130069 MonoBehaviour: @@ -328,13 +336,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1504272498} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1504272501 MonoBehaviour: @@ -350,9 +358,20 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 0 IJobEntity: 1 - Aspects: 0 Prefabs: 0 IJobChunk: 0 Reparenting: 0 EnableableComponents: 0 GameObjectSync: 0 + CrossQuery: 0 + RandomSpawn: 0 + FirstPersonController: 0 + FixedTimestep: 0 + StateChange: 0 + ClosestTarget: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 328130068} + - {fileID: 1504272500} diff --git a/Dots101/Entities101/Assets/HelloCube/3. Aspects/RotationSystem.cs b/Dots101/Entities101/Assets/HelloCube/3. Aspects/RotationSystem.cs deleted file mode 100644 index 239570017..000000000 --- a/Dots101/Entities101/Assets/HelloCube/3. Aspects/RotationSystem.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Unity.Burst; -using Unity.Entities; -using Unity.Mathematics; -using Unity.Transforms; - -namespace HelloCube.Aspects -{ - public partial struct RotationSystem : ISystem - { - [BurstCompile] - public void OnCreate(ref SystemState state) - { - state.RequireForUpdate(); - } - - [BurstCompile] - public void OnUpdate(ref SystemState state) - { - float deltaTime = SystemAPI.Time.DeltaTime; - double elapsedTime = SystemAPI.Time.ElapsedTime; - - // Rotate the cube directly without using the aspect. - // The query matches all entities having the LocalTransform and RotationSpeed components. - foreach (var (transform, speed) in - SystemAPI.Query, RefRO>()) - { - transform.ValueRW = transform.ValueRO.RotateY(speed.ValueRO.RadiansPerSecond * deltaTime); - } - - // Rotate the cube using the aspect. - // The query will include all components of VerticalMovementAspect. - // Note that, unlike components, aspect type params of SystemAPI.Query are not wrapped in a RefRW or RefRO. - foreach (var movement in - SystemAPI.Query()) - { - movement.Move(elapsedTime); - } - } - } - - // An instance of this aspect wraps the LocalTransform and RotationSpeed components of a single entity. - // (This trivial example is arguably not a worthwhile use case for aspects, but larger examples better demonstrate their utility.) - readonly partial struct VerticalMovementAspect : IAspect - { - readonly RefRW m_Transform; - readonly RefRO m_Speed; - - public void Move(double elapsedTime) - { - m_Transform.ValueRW.Position.y = (float)math.sin(elapsedTime * m_Speed.ValueRO.RadiansPerSecond); - } - } -} diff --git a/Dots101/Entities101/Assets/HelloCube/3. Aspects/RotationSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/3. Aspects/RotationSystem.cs.meta deleted file mode 100644 index b2c95f001..000000000 --- a/Dots101/Entities101/Assets/HelloCube/3. Aspects/RotationSystem.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2e177a4ffb14f4cf2816b3708ee32b42 -timeCreated: 1660328313 \ No newline at end of file diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/FallAndDestroySystem.cs b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/FallAndDestroySystem.cs similarity index 96% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/FallAndDestroySystem.cs rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/FallAndDestroySystem.cs index b3c8e8ca7..a3c948680 100644 --- a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/FallAndDestroySystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/FallAndDestroySystem.cs @@ -10,6 +10,7 @@ public partial struct FallAndDestroySystem : ISystem [BurstCompile] public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); state.RequireForUpdate(); } diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/FallAndDestroySystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/FallAndDestroySystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/FallAndDestroySystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/FallAndDestroySystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/HelloCube_Prefabs.unity b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/HelloCube_Prefabs.unity similarity index 91% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/HelloCube_Prefabs.unity rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/HelloCube_Prefabs.unity index b8d636e72..f43792f04 100644 --- a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/HelloCube_Prefabs.unity +++ b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/HelloCube_Prefabs.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -159,8 +155,8 @@ Camera: m_GameObject: {fileID: 194095666} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -208,13 +204,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 194095666} - m_LocalRotation: {x: -0.07955015, y: 0.91982377, z: -0.2533903, w: -0.28877214} - m_LocalPosition: {x: 19.301508, y: 24.567123, z: 25.170086} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 25, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &194095670 MonoBehaviour: @@ -246,19 +242,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &948347921 GameObject: m_ObjectHideFlags: 0 @@ -285,10 +282,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948347921} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -298,7 +294,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.6 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -337,8 +333,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &948347923 Transform: m_ObjectHideFlags: 0 @@ -346,13 +346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948347921} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &948347924 MonoBehaviour: @@ -366,17 +366,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1382613142 GameObject: m_ObjectHideFlags: 0 @@ -422,11 +428,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382613142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 194095669} + - {fileID: 948347923} + - {fileID: 1382613144} diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/HelloCube_Prefabs.unity.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/HelloCube_Prefabs.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/HelloCube_Prefabs.unity.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/HelloCube_Prefabs.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/RotatingCube.prefab b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/RotatingCube.prefab similarity index 91% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/RotatingCube.prefab rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/RotatingCube.prefab index 6a86b70c3..39376b5db 100644 --- a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/RotatingCube.prefab +++ b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/RotatingCube.prefab @@ -26,6 +26,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4913866460384743286} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: m_Children: - {fileID: 4913866460535128605} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4913866460384743285 MeshFilter: @@ -60,10 +60,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -81,6 +86,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -124,13 +130,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4913866460535128604} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4913866460384743282} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4913866460535128600 MeshFilter: @@ -157,10 +163,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -178,6 +189,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/RotatingCube.prefab.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/RotatingCube.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/RotatingCube.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/RotatingCube.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnSystem.cs b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnSystem.cs similarity index 94% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnSystem.cs rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnSystem.cs index bda803dd9..625decf04 100644 --- a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnSystem.cs @@ -8,7 +8,7 @@ namespace HelloCube.Prefabs { public partial struct SpawnSystem : ISystem { - uint updateCounter; + uint m_UpdateCounter; [BurstCompile] public void OnCreate(ref SystemState state) @@ -36,7 +36,7 @@ public void OnUpdate(ref SystemState state) // Unlike new Random(), CreateFromIndex() hashes the random seed // so that similar seeds don't produce similar results. - var random = Random.CreateFromIndex(updateCounter++); + var random = Random.CreateFromIndex(m_UpdateCounter++); foreach (var entity in instances) { diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnerAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnerAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnerAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnerAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnerAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnerAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/SpawnerAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/SpawnerAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity diff --git a/Dots101/Entities101/Assets/HelloCube/4. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/3. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/4. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/3. Prefabs/Subscenes/HelloCube_PrefabsSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk.meta b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk.meta rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk.meta diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/HelloCube_IJobChunk.unity b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/HelloCube_IJobChunk.unity similarity index 84% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/HelloCube_IJobChunk.unity rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/HelloCube_IJobChunk.unity index 59b7cd631..62a9171be 100644 --- a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/HelloCube_IJobChunk.unity +++ b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/HelloCube_IJobChunk.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -123,7 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &194095666 +--- !u!1 &1382613142 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,135 +127,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 194095669} - - component: {fileID: 194095668} - - component: {fileID: 194095667} - - component: {fileID: 194095670} + - component: {fileID: 1382613144} + - component: {fileID: 1382613143} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: EntityScene + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &194095667 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} - m_Enabled: 1 ---- !u!20 &194095668 -Camera: +--- !u!114 &1382613143 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} + m_GameObject: {fileID: 1382613142} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &194095669 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3} + m_Name: + m_EditorClassIdentifier: + _SceneAsset: {fileID: 102900000, guid: 85ca66482ad234a288ae8019e609a6b8, type: 3} + _HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + AutoLoadScene: 1 + _SceneGUID: + Value: + x: 2221321304 + y: 709045666 + z: 2433280648 + w: 2339016814 +--- !u!4 &1382613144 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} + m_GameObject: {fileID: 1382613142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &194095670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1 &948347921 +--- !u!1 &1475428471 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -267,9 +180,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 948347923} - - component: {fileID: 948347922} - - component: {fileID: 948347924} + - component: {fileID: 1475428474} + - component: {fileID: 1475428473} + - component: {fileID: 1475428472} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -277,18 +190,46 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &948347922 +--- !u!114 &1475428472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475428471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &1475428473 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948347921} + m_GameObject: {fileID: 1475428471} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -298,7 +239,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.5 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -337,47 +278,28 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!4 &948347923 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &1475428474 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948347921} + m_GameObject: {fileID: 1475428471} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &948347924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948347921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 2 ---- !u!1 &1382613142 +--- !u!1 &2056120066 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -385,48 +307,139 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1382613144} - - component: {fileID: 1382613143} + - component: {fileID: 2056120070} + - component: {fileID: 2056120069} + - component: {fileID: 2056120068} + - component: {fileID: 2056120067} m_Layer: 0 - m_Name: EntityScene - m_TagString: Untagged + m_Name: Main Camera + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1382613143 +--- !u!114 &2056120067 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382613142} + m_GameObject: {fileID: 2056120066} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3} + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - _SceneAsset: {fileID: 102900000, guid: 85ca66482ad234a288ae8019e609a6b8, type: 3} - _HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - AutoLoadScene: 1 - _SceneGUID: - Value: - x: 2221321304 - y: 709045666 - z: 2433280648 - w: 2339016814 ---- !u!4 &1382613144 + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &2056120068 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2056120066} + m_Enabled: 1 +--- !u!20 &2056120069 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2056120066} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &2056120070 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382613142} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 2056120066} + serializedVersion: 2 + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 3, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1475428474} + - {fileID: 2056120070} + - {fileID: 1382613144} diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/HelloCube_IJobChunk.unity.meta b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/HelloCube_IJobChunk.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/HelloCube_IJobChunk.unity.meta rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/HelloCube_IJobChunk.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/RotationSystem.cs b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/RotationSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/RotationSystem.cs rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/RotationSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/RotationSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/RotationSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/RotationSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/RotationSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity similarity index 91% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity index f74cc5042..75f3ef37f 100644 --- a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -147,13 +143,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 29928834} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &29928837 MonoBehaviour: @@ -169,12 +165,17 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 0 IJobEntity: 0 - Aspects: 0 Prefabs: 0 IJobChunk: 1 Reparenting: 0 EnableableComponents: 0 GameObjectSync: 0 + CrossQuery: 0 + RandomSpawn: 0 + FirstPersonController: 0 + FixedTimestep: 0 + StateChange: 0 + ClosestTarget: 0 --- !u!1 &177836922 GameObject: m_ObjectHideFlags: 0 @@ -201,13 +202,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 177836922} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 328130068} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &177836924 BoxCollider: @@ -247,10 +248,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -268,6 +274,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -316,10 +323,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -337,6 +349,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -356,6 +369,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 328130064} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -363,7 +377,6 @@ Transform: m_Children: - {fileID: 177836923} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &328130069 MonoBehaviour: @@ -378,3 +391,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: DegreesPerSecond: 360 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 328130068} + - {fileID: 29928836} diff --git a/Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/5. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/4. IJobChunk/Subscenes/HelloCube_IJobChunkSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting.meta b/Dots101/Entities101/Assets/HelloCube/5. Reparenting.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting.meta rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting.meta diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/HelloCube_Reparenting.unity b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/HelloCube_Reparenting.unity similarity index 76% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/HelloCube_Reparenting.unity rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/HelloCube_Reparenting.unity index acac67521..573469acf 100644 --- a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/HelloCube_Reparenting.unity +++ b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/HelloCube_Reparenting.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -123,7 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &820697446 +--- !u!1 &617986473 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,9 +127,146 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 820697448} - - component: {fileID: 820697447} - - component: {fileID: 820697449} + - component: {fileID: 617986477} + - component: {fileID: 617986476} + - component: {fileID: 617986475} + - component: {fileID: 617986474} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &617986474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617986473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &617986475 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617986473} + m_Enabled: 1 +--- !u!20 &617986476 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617986473} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &617986477 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617986473} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 4, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!1 &1120487240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120487243} + - component: {fileID: 1120487242} + - component: {fileID: 1120487241} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -141,18 +274,46 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &820697447 +--- !u!114 &1120487241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120487240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &1120487242 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 820697446} + m_GameObject: {fileID: 1120487240} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -162,7 +323,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.5 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -201,46 +362,27 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!4 &820697448 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &1120487243 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 820697446} + m_GameObject: {fileID: 1120487240} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &820697449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 820697446} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 --- !u!1 &1289567552 GameObject: m_ObjectHideFlags: 0 @@ -286,103 +428,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1289567552} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1897470870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1897470873} - - component: {fileID: 1897470872} - - component: {fileID: 1897470871} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1897470871 -AudioListener: +--- !u!1660057539 &9223372036854775807 +SceneRoots: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1897470870} - m_Enabled: 1 ---- !u!20 &1897470872 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1897470870} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1897470873 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1897470870} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Roots: + - {fileID: 617986477} + - {fileID: 1120487243} + - {fileID: 1289567554} diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/HelloCube_Reparenting.unity.meta b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/HelloCube_Reparenting.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/HelloCube_Reparenting.unity.meta rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/HelloCube_Reparenting.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/ReparentingSystem.cs b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/ReparentingSystem.cs similarity index 90% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/ReparentingSystem.cs rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/ReparentingSystem.cs index db933a271..159415d99 100644 --- a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/ReparentingSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/ReparentingSystem.cs @@ -8,15 +8,15 @@ namespace HelloCube.Reparenting { public partial struct ReparentingSystem : ISystem { - bool attached; - float timer; - const float interval = 0.7f; + bool m_Attached; + float m_Timer; + const float k_Interval = 0.7f; [BurstCompile] public void OnCreate(ref SystemState state) { - timer = interval; - attached = true; + m_Timer = k_Interval; + m_Attached = true; state.RequireForUpdate(); state.RequireForUpdate(); } @@ -24,17 +24,17 @@ public void OnCreate(ref SystemState state) [BurstCompile] public void OnUpdate(ref SystemState state) { - timer -= SystemAPI.Time.DeltaTime; - if (timer > 0) + m_Timer -= SystemAPI.Time.DeltaTime; + if (m_Timer > 0) { return; } - timer = interval; + m_Timer = k_Interval; var rotatorEntity = SystemAPI.GetSingletonEntity(); var ecb = new EntityCommandBuffer(Allocator.Temp); - if (attached) + if (m_Attached) { // Detach all children from the rotator by removing the Parent component from the children. // (The next time TransformSystemGroup updates, it will update the Child buffer and transforms accordingly.) @@ -78,7 +78,7 @@ public void OnUpdate(ref SystemState state) ecb.Playback(state.EntityManager); - attached = !attached; + m_Attached = !m_Attached; } } } diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/ReparentingSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/ReparentingSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/ReparentingSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/ReparentingSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/RotationSystem.cs b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/RotationSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/RotationSystem.cs rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/RotationSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/RotationSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/RotationSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/RotationSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/RotationSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity similarity index 90% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity index 48dd32ae5..64054a3b9 100644 --- a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -148,13 +144,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 315459125} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.74, y: 1.44, z: -0.65} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1110097490} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &315459127 MeshRenderer: @@ -173,10 +169,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -194,6 +195,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -230,13 +232,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913946452} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &913946455 MonoBehaviour: @@ -252,12 +254,17 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 0 IJobEntity: 0 - Aspects: 0 Prefabs: 0 IJobChunk: 0 Reparenting: 1 EnableableComponents: 0 GameObjectSync: 0 + CrossQuery: 0 + RandomSpawn: 0 + FirstPersonController: 0 + FixedTimestep: 0 + StateChange: 0 + ClosestTarget: 0 --- !u!1 &1110097486 GameObject: m_ObjectHideFlags: 0 @@ -307,10 +314,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -328,6 +340,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -347,6 +360,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1110097486} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -357,7 +371,6 @@ Transform: - {fileID: 1164240933} - {fileID: 1568107852} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1164240932 GameObject: @@ -384,13 +397,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1164240932} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.85, z: 0.31} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1110097490} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1164240934 MeshRenderer: @@ -409,10 +422,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -430,6 +448,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -467,13 +486,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1568107851} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.75, y: 2.75, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1110097490} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1568107853 MeshRenderer: @@ -492,10 +511,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -513,6 +537,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -550,13 +575,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1718737125} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1110097490} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1718737127 MeshRenderer: @@ -575,10 +600,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -596,6 +626,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -608,3 +639,9 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1718737125} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1110097490} + - {fileID: 913946454} diff --git a/Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/6. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/5. Reparenting/Subscenes/HelloCube_ReparentingSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents.meta b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents.meta rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents.meta diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/HelloCube_EnableableComponents.unity b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/HelloCube_EnableableComponents.unity similarity index 84% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/HelloCube_EnableableComponents.unity rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/HelloCube_EnableableComponents.unity index ef489dbdd..eb55f2dcf 100644 --- a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/HelloCube_EnableableComponents.unity +++ b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/HelloCube_EnableableComponents.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -123,7 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &240723876 +--- !u!1 &193620633 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,9 +127,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 240723878} - - component: {fileID: 240723877} - - component: {fileID: 240723879} + - component: {fileID: 193620636} + - component: {fileID: 193620635} + - component: {fileID: 193620634} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -141,18 +137,46 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &240723877 +--- !u!114 &193620634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 193620633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &193620635 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240723876} + m_GameObject: {fileID: 193620633} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -162,7 +186,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.5 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -201,47 +225,81 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!4 &240723878 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &193620636 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240723876} + m_GameObject: {fileID: 193620633} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &240723879 +--- !u!1 &1495625251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495625253} + - component: {fileID: 1495625252} + m_Layer: 0 + m_Name: EntityScene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1495625252 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240723876} + m_GameObject: {fileID: 1495625251} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &606994008 + _SceneAsset: {fileID: 102900000, guid: 559079c10711846fdae9ad75f77a4682, type: 3} + _HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + AutoLoadScene: 1 + _SceneGUID: + Value: + x: 479660373 + y: 4131918192 + z: 1473945261 + w: 677685119 +--- !u!4 &1495625253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495625251} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1919935906 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -249,10 +307,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 606994011} - - component: {fileID: 606994010} - - component: {fileID: 606994009} - - component: {fileID: 606994012} + - component: {fileID: 1919935910} + - component: {fileID: 1919935909} + - component: {fileID: 1919935908} + - component: {fileID: 1919935907} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -260,25 +318,69 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &606994009 +--- !u!114 &1919935907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919935906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &1919935908 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606994008} + m_GameObject: {fileID: 1919935906} m_Enabled: 1 ---- !u!20 &606994010 +--- !u!20 &1919935909 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606994008} + m_GameObject: {fileID: 1919935906} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -319,114 +421,25 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &606994011 +--- !u!4 &1919935910 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606994008} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_GameObject: {fileID: 1919935906} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 5, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &606994012 -MonoBehaviour: + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606994008} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1 &1495625251 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1495625253} - - component: {fileID: 1495625252} - m_Layer: 0 - m_Name: EntityScene - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1495625252 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1495625251} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3} - m_Name: - m_EditorClassIdentifier: - _SceneAsset: {fileID: 102900000, guid: 559079c10711846fdae9ad75f77a4682, type: 3} - _HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - AutoLoadScene: 1 - _SceneGUID: - Value: - x: 479660373 - y: 4131918192 - z: 1473945261 - w: 677685119 ---- !u!4 &1495625253 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1495625251} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Roots: + - {fileID: 193620636} + - {fileID: 1919935910} + - {fileID: 1495625253} diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/HelloCube_EnableableComponents.unity.meta b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/HelloCube_EnableableComponents.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/HelloCube_EnableableComponents.unity.meta rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/HelloCube_EnableableComponents.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSpeedAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSpeedAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSpeedAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSpeedAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSpeedAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSpeedAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSpeedAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSpeedAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSystem.cs b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSystem.cs similarity index 86% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSystem.cs rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSystem.cs index 0e5a1ffb8..f300384b3 100644 --- a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSystem.cs @@ -6,13 +6,13 @@ namespace HelloCube.EnableableComponents { public partial struct RotationSystem : ISystem { - float timer; - const float interval = 1.3f; + float m_Timer; + const float k_Interval = 1.3f; [BurstCompile] public void OnCreate(ref SystemState state) { - timer = interval; + m_Timer = k_Interval; state.RequireForUpdate(); } @@ -20,10 +20,10 @@ public void OnCreate(ref SystemState state) public void OnUpdate(ref SystemState state) { float deltaTime = SystemAPI.Time.DeltaTime; - timer -= deltaTime; + m_Timer -= deltaTime; // Toggle the enabled state of every RotationSpeed - if (timer < 0) + if (m_Timer < 0) { foreach (var rotationSpeedEnabled in SystemAPI.Query>() @@ -32,7 +32,7 @@ public void OnUpdate(ref SystemState state) rotationSpeedEnabled.ValueRW = !rotationSpeedEnabled.ValueRO; } - timer = interval; + m_Timer = k_Interval; } // The query only matches entities whose RotationSpeed is enabled. diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/RotationSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/RotationSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity similarity index 89% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity index 9c2825e2e..4f659af27 100644 --- a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity +++ b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -173,10 +169,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -194,6 +195,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -213,6 +215,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134026090} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.67, y: 2.69, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -220,7 +223,6 @@ Transform: m_Children: - {fileID: 495163702} m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &349847624 GameObject: @@ -272,10 +274,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -293,6 +300,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -312,6 +320,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 349847624} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.67, y: 2.69, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -319,7 +328,6 @@ Transform: m_Children: - {fileID: 1950975729} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445367596 GameObject: @@ -346,13 +354,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 445367596} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 465612116} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &445367598 MeshRenderer: @@ -371,10 +379,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -392,6 +405,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -454,10 +468,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -475,6 +494,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -494,6 +514,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 465612112} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.04, y: 2.69, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -501,7 +522,6 @@ Transform: m_Children: - {fileID: 445367597} m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &495163701 GameObject: @@ -528,13 +548,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495163701} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 134026094} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &495163703 MeshRenderer: @@ -553,10 +573,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -574,6 +599,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -610,13 +636,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873939495} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &873939498 MonoBehaviour: @@ -632,12 +658,17 @@ MonoBehaviour: m_EditorClassIdentifier: MainThread: 0 IJobEntity: 0 - Aspects: 0 Prefabs: 0 IJobChunk: 0 Reparenting: 0 EnableableComponents: 1 GameObjectSync: 0 + CrossQuery: 0 + RandomSpawn: 0 + FirstPersonController: 0 + FixedTimestep: 0 + StateChange: 0 + ClosestTarget: 0 --- !u!1 &894922310 GameObject: m_ObjectHideFlags: 0 @@ -663,13 +694,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 894922310} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1242639140} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &894922312 MeshRenderer: @@ -688,10 +719,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -709,6 +745,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -757,10 +794,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -778,6 +820,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -797,6 +840,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 960516751} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -804,7 +848,6 @@ Transform: m_Children: - {fileID: 1654566063} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &960516756 MonoBehaviour: @@ -845,13 +888,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040318067} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2053633722} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1040318069 MeshRenderer: @@ -870,10 +913,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -891,6 +939,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -953,10 +1002,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -974,6 +1028,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -993,6 +1048,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1242639136} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.68, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1000,7 +1056,6 @@ Transform: m_Children: - {fileID: 894922311} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1544883765 GameObject: @@ -1052,10 +1107,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1073,6 +1133,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1092,6 +1153,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544883765} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.57, y: 2.69, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1099,7 +1161,6 @@ Transform: m_Children: - {fileID: 1683189058} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1654566062 GameObject: @@ -1126,13 +1187,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1654566062} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 960516755} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1654566064 MeshRenderer: @@ -1151,10 +1212,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1172,6 +1238,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1209,13 +1276,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1683189057} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1544883769} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1683189059 MeshRenderer: @@ -1234,10 +1301,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1255,6 +1327,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1292,13 +1365,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950975728} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 349847628} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1950975730 MeshRenderer: @@ -1317,10 +1390,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1338,6 +1416,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1400,10 +1479,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1421,6 +1505,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1440,6 +1525,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053633718} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.57, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1447,5 +1533,16 @@ Transform: m_Children: - {fileID: 1040318068} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 960516755} + - {fileID: 1242639140} + - {fileID: 2053633722} + - {fileID: 1544883769} + - {fileID: 465612116} + - {fileID: 349847628} + - {fileID: 134026094} + - {fileID: 873939497} diff --git a/Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/7. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/6. EnableableComponents/Subscenes/HelloCube_EnableableComponentsSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Directory.cs b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Directory.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Directory.cs rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Directory.cs diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Directory.cs.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Directory.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Directory.cs.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Directory.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/DirectoryInitSystem.cs b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/DirectoryInitSystem.cs similarity index 86% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/DirectoryInitSystem.cs rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/DirectoryInitSystem.cs index ccdc81010..cd4568b77 100644 --- a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/DirectoryInitSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/DirectoryInitSystem.cs @@ -22,13 +22,13 @@ public void OnUpdate(ref SystemState state) { state.Enabled = false; - var go = GameObject.Find("Directory"); - if (go == null) + var directoryObject = GameObject.Find("Directory"); + if (directoryObject == null) { throw new Exception("GameObject 'Directory' not found."); } - var directory = go.GetComponent(); + var directory = directoryObject.GetComponent(); var directoryManaged = new DirectoryManaged(); directoryManaged.RotatorPrefab = directory.RotatorPrefab; @@ -45,9 +45,7 @@ public class DirectoryManaged : IComponentData public Toggle RotationToggle; // Every IComponentData class must have a no-arg constructor. - public DirectoryManaged() - { - } + public DirectoryManaged() { } } #endif } diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/DirectoryInitSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/DirectoryInitSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/DirectoryInitSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/DirectoryInitSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/HelloCube_GameObjectSync.unity b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/HelloCube_GameObjectSync.unity similarity index 90% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/HelloCube_GameObjectSync.unity rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/HelloCube_GameObjectSync.unity index 03ae24b60..43941e4e0 100644 --- a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/HelloCube_GameObjectSync.unity +++ b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/HelloCube_GameObjectSync.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -123,260 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &194095666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 194095669} - - component: {fileID: 194095668} - - component: {fileID: 194095667} - - component: {fileID: 194095670} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &194095667 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} - m_Enabled: 1 ---- !u!20 &194095668 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &194095669 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &194095670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194095666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1 &948347921 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 948347923} - - component: {fileID: 948347922} - - component: {fileID: 948347924} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &948347922 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948347921} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &948347923 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948347921} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &948347924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948347921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 2 --- !u!1 &1130323206 GameObject: m_ObjectHideFlags: 0 @@ -437,13 +179,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1130323206} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1162874378 GameObject: @@ -476,13 +218,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1333827441} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9, y: -0.5} - m_SizeDelta: {x: -28, y: -3} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: 0} + m_SizeDelta: {x: 200, y: 27} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1162874380 MonoBehaviour: m_ObjectHideFlags: 0 @@ -496,7 +237,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -504,16 +245,16 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_Font: {fileID: 2230732570650464555, guid: 9f7eb5a84fc57b44ba619820a628e48d, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Rotation ON / OFF @@ -525,6 +266,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162874378} m_CullTransparentMesh: 1 +--- !u!1 &1221109994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1221109997} + - component: {fileID: 1221109996} + - component: {fileID: 1221109995} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1221109995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221109994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &1221109996 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221109994} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 0.5 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &1221109997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221109994} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1269486635 GameObject: m_ObjectHideFlags: 0 @@ -601,6 +469,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -620,13 +489,149 @@ RectTransform: m_Children: - {fileID: 1333827441} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1287413648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1287413652} + - component: {fileID: 1287413651} + - component: {fileID: 1287413650} + - component: {fileID: 1287413649} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1287413649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287413648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &1287413650 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287413648} + m_Enabled: 1 +--- !u!20 &1287413651 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287413648} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1287413652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287413648} + serializedVersion: 2 + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 3, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!1 &1333827440 GameObject: m_ObjectHideFlags: 0 @@ -659,12 +664,11 @@ RectTransform: - {fileID: 1377176214} - {fileID: 1162874379} m_Father: {fileID: 1269486639} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -32.7, y: 43.7} - m_SizeDelta: {x: 160, y: 20} + m_AnchoredPosition: {x: 6.165, y: 250} + m_SizeDelta: {x: 239.9314, y: 29.436} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1333827442 MonoBehaviour: @@ -746,13 +750,12 @@ RectTransform: m_Children: - {fileID: 1796791710} m_Father: {fileID: 1333827441} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1377176215 MonoBehaviour: m_ObjectHideFlags: 0 @@ -836,13 +839,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382613142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1423322255 GameObject: @@ -868,13 +871,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423322255} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 831.6708, y: 462.47836, z: -118.623795} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1423322257 MonoBehaviour: @@ -888,8 +891,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c81e41d6d87c400ab209a72d1af95d8a, type: 3} m_Name: m_EditorClassIdentifier: - RotatorPrefab: {fileID: 6621473474885163000, guid: 0c6bcb75ab3ec4e43a0ab610f688d123, - type: 3} + RotatorPrefab: {fileID: 6621473474885163000, guid: 0c6bcb75ab3ec4e43a0ab610f688d123, type: 3} RotationToggle: {fileID: 1333827442} --- !u!1 &1796791709 GameObject: @@ -922,12 +924,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1377176214} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1796791711 MonoBehaviour: @@ -967,3 +968,13 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796791709} m_CullTransparentMesh: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1287413652} + - {fileID: 1221109997} + - {fileID: 1423322256} + - {fileID: 1269486639} + - {fileID: 1130323209} + - {fileID: 1382613144} diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/HelloCube_GameObjectSync.unity.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/HelloCube_GameObjectSync.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/HelloCube_GameObjectSync.unity.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/HelloCube_GameObjectSync.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatingCube.prefab b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatingCube.prefab similarity index 89% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatingCube.prefab rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatingCube.prefab index e80f571a8..f5f4a72fa 100644 --- a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatingCube.prefab +++ b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatingCube.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6621473474498321042} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6621473474885163004} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6621473474498321046 MeshFilter: @@ -58,10 +58,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -79,6 +84,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -108,6 +114,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6621473474885163000} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -115,7 +122,6 @@ Transform: m_Children: - {fileID: 6621473474498321043} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6621473474885163003 MeshFilter: @@ -142,10 +148,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -163,6 +174,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatingCube.prefab.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatingCube.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatingCube.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatingCube.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotationSystem.cs b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotationSystem.cs similarity index 98% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotationSystem.cs rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotationSystem.cs index dbe17e0df..8043fc3a7 100644 --- a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotationSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotationSystem.cs @@ -1,6 +1,5 @@ using Unity.Burst; using Unity.Entities; -using Unity.Mathematics; using Unity.Transforms; namespace HelloCube.GameObjectSync diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotationSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotationSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotationSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotationSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatorInitSystem.cs b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatorInitSystem.cs similarity index 93% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatorInitSystem.cs rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatorInitSystem.cs index 6580f262c..9575dfa2c 100644 --- a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatorInitSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatorInitSystem.cs @@ -23,8 +23,8 @@ public void OnUpdate(ref SystemState state) var ecb = new EntityCommandBuffer(Allocator.Temp); // Instantiate the associated GameObject from the prefab. - foreach (var (goPrefab, entity) in - SystemAPI.Query() + foreach (var (rotationSpeed, entity) in + SystemAPI.Query>() .WithNone() .WithEntityAccess()) { diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatorInitSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatorInitSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/RotatorInitSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/RotatorInitSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity diff --git a/Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/8. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/7. GameObjectSync/Subscenes/HelloCube_GameObjectSyncSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Box.prefab b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Box.prefab similarity index 93% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Box.prefab rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Box.prefab index 0412974a7..053184e07 100644 --- a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Box.prefab +++ b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Box.prefab @@ -28,13 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8214605303314820507} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &8214605303314820502 MeshRenderer: @@ -53,6 +53,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -74,6 +79,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -98,11 +104,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 54b6467bcd530cd4d809fae70ea0ca9d, type: 3} m_Name: m_EditorClassIdentifier: - Value: - x: 0 - y: 0 - z: 0 - w: 0 + color: {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 0} --- !u!114 &4026716851381919149 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Box.prefab.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Box.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Box.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Box.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CollisionSystem.cs b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CollisionSystem.cs similarity index 96% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CollisionSystem.cs rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CollisionSystem.cs index 4dd00cf55..74011cc12 100644 --- a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CollisionSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CollisionSystem.cs @@ -33,13 +33,13 @@ public void OnUpdate(ref SystemState state) OtherChunks = boxQuery.ToArchetypeChunkArray(state.WorldUpdateAllocator) }.ScheduleParallel(boxQuery, state.Dependency).Complete(); #else + // Simple solution, but it requires creating temporary copies of all box translations and entity IDs var boxTransforms = boxQuery.ToComponentDataArray(Allocator.Temp); var boxEntities = boxQuery.ToEntityArray(Allocator.Temp); - foreach (var (transform, defaultColor, color, entity) in - SystemAPI.Query, RefRO, - RefRW>() + foreach (var (transform, defaultColor, color, entity) + in SystemAPI.Query, RefRO, RefRW>() .WithEntityAccess()) { // reset color of the box to its default diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CollisionSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CollisionSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CollisionSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CollisionSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CrossQuery.unity b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CrossQuery.unity similarity index 92% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CrossQuery.unity rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CrossQuery.unity index b366d459d..7414da226 100644 --- a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CrossQuery.unity +++ b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CrossQuery.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -159,8 +155,8 @@ Camera: m_GameObject: {fileID: 633938554} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.30817598, g: 0.30817598, b: 0.30817598, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -208,13 +204,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 633938554} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &633938558 MonoBehaviour: @@ -246,19 +242,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!115 &1160279099 MonoScript: m_ObjectHideFlags: 0 @@ -300,10 +297,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322053621} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -352,8 +348,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1322053623 Transform: m_ObjectHideFlags: 0 @@ -361,13 +361,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322053621} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1322053624 MonoBehaviour: @@ -381,17 +381,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1491208654 GameObject: m_ObjectHideFlags: 0 @@ -437,11 +443,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1491208654} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 633938557} + - {fileID: 1322053623} + - {fileID: 1491208656} diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CrossQuery.unity.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CrossQuery.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/CrossQuery.unity.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/CrossQuery.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/DefaultColorAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/DefaultColorAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/DefaultColorAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/DefaultColorAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/DefaultColorAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/DefaultColorAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/DefaultColorAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/DefaultColorAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/MoveSystem.cs b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/MoveSystem.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/MoveSystem.cs rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/MoveSystem.cs diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/MoveSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/MoveSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/MoveSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/MoveSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/PrefabCollectionAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/PrefabCollectionAuthoring.cs similarity index 99% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/PrefabCollectionAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/PrefabCollectionAuthoring.cs index 41e1df912..9ba67c9bf 100644 --- a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/PrefabCollectionAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/PrefabCollectionAuthoring.cs @@ -26,4 +26,3 @@ public struct PrefabCollection : IComponentData public Entity Box; } } - diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/PrefabCollectionAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/PrefabCollectionAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/PrefabCollectionAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/PrefabCollectionAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/SpawnSystem.cs b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/SpawnSystem.cs similarity index 95% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/SpawnSystem.cs rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/SpawnSystem.cs index 780b908f4..4c161413b 100644 --- a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/SpawnSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/SpawnSystem.cs @@ -18,11 +18,6 @@ public void OnCreate(ref SystemState state) state.RequireForUpdate(); } - [BurstCompile] - public void OnDestroy(ref SystemState state) - { - } - [BurstCompile] public void OnUpdate(ref SystemState state) { diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/SpawnSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/SpawnSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/SpawnSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/SpawnSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Subscenes/CrossQuerySubscene.unity b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Subscenes/CrossQuerySubscene.unity similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Subscenes/CrossQuerySubscene.unity rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Subscenes/CrossQuerySubscene.unity diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Subscenes/CrossQuerySubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Subscenes/CrossQuerySubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/Subscenes/CrossQuerySubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/Subscenes/CrossQuerySubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/VelocityAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/VelocityAuthoring.cs similarity index 99% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/VelocityAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/VelocityAuthoring.cs index a9d42c458..d90306fe9 100644 --- a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/VelocityAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/VelocityAuthoring.cs @@ -26,6 +26,4 @@ public struct Velocity : IComponentData { public float3 Value; } - } - diff --git a/Dots101/Entities101/Assets/HelloCube/9. CrossQuery/VelocityAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/8. CrossQuery/VelocityAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/9. CrossQuery/VelocityAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/8. CrossQuery/VelocityAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/ConfigAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/ConfigAuthoring.cs similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/ConfigAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/ConfigAuthoring.cs diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/ConfigAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/ConfigAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/ConfigAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/ConfigAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Cube.prefab b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Cube.prefab similarity index 90% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Cube.prefab rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Cube.prefab index f24877837..ed13f4807 100644 --- a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Cube.prefab +++ b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Cube.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 77419304162410708} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7374293872500731978 MeshFilter: @@ -59,10 +59,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: d40eb709ed69c4270b1e352c249168f6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -80,6 +85,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Cube.prefab.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Cube.prefab.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Cube.prefab.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Cube.prefab.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/CubeAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/CubeAuthoring.cs similarity index 81% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/CubeAuthoring.cs rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/CubeAuthoring.cs index be597afdd..1e3bc7de3 100644 --- a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/CubeAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/CubeAuthoring.cs @@ -16,11 +16,7 @@ public override void Bake(CubeAuthoring authoring) } } - public struct Cube : IComponentData - { - } + public struct Cube : IComponentData { } - public struct NewSpawn : IComponentData - { - } + public struct NewSpawn : IComponentData { } } diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/CubeAuthoring.cs.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/CubeAuthoring.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/CubeAuthoring.cs.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/CubeAuthoring.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/MovementSystem.cs b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/MovementSystem.cs similarity index 93% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/MovementSystem.cs rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/MovementSystem.cs index bd48066e0..2b3927762 100644 --- a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/MovementSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/MovementSystem.cs @@ -10,6 +10,7 @@ public partial struct MovementSystem : ISystem [BurstCompile] public void OnCreate(ref SystemState state) { + state.RequireForUpdate(); state.RequireForUpdate(); } diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/MovementSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/MovementSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/MovementSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/MovementSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/RandomSpawn.unity b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/RandomSpawn.unity similarity index 91% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/RandomSpawn.unity rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/RandomSpawn.unity index 189e3a0e9..8418acf4c 100644 --- a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/RandomSpawn.unity +++ b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/RandomSpawn.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -183,13 +179,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269848866} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1589840927 GameObject: @@ -217,10 +213,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1589840927} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -230,7 +225,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.5 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -269,8 +264,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1589840929 Transform: m_ObjectHideFlags: 0 @@ -278,13 +277,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1589840927} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1589840930 MonoBehaviour: @@ -298,17 +297,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1789822152 GameObject: m_ObjectHideFlags: 0 @@ -345,8 +350,8 @@ Camera: m_GameObject: {fileID: 1789822152} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -394,14 +399,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789822152} - m_LocalRotation: {x: -0.17856856, y: -0, z: -0, w: 0.98392755} + serializedVersion: 2 + m_LocalRotation: {x: -0.17364825, y: 0, z: 0, w: 0.9848078} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -20.573, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -20, y: 0, z: 0} --- !u!114 &1789822156 MonoBehaviour: m_ObjectHideFlags: 0 @@ -432,16 +437,24 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 m_UseScreenCoordOverride: 0 m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1789822155} + - {fileID: 1589840929} + - {fileID: 1269848868} diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/RandomSpawn.unity.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/RandomSpawn.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/RandomSpawn.unity.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/RandomSpawn.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/SpawnSystem.cs b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/SpawnSystem.cs similarity index 81% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/SpawnSystem.cs rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/SpawnSystem.cs index fcfc6e579..8021d76c4 100644 --- a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/SpawnSystem.cs +++ b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/SpawnSystem.cs @@ -9,8 +9,8 @@ namespace HelloCube.RandomSpawn { public partial struct SpawnSystem : ISystem { - uint seedOffset; - float spawnTimer; + uint m_SeedOffset; + float m_SpawnTimer; [BurstCompile] public void OnCreate(ref SystemState state) @@ -25,13 +25,13 @@ public void OnUpdate(ref SystemState state) const int count = 200; const float spawnWait = 0.05f; // 0.05 seconds - spawnTimer -= SystemAPI.Time.DeltaTime; - if (spawnTimer > 0) + m_SpawnTimer -= SystemAPI.Time.DeltaTime; + if (m_SpawnTimer > 0) { return; } - spawnTimer = spawnWait; + m_SpawnTimer = spawnWait; // Remove the NewSpawn tag component from the entities spawned in the prior frame. var newSpawnQuery = SystemAPI.QueryBuilder().WithAll().Build(); @@ -43,12 +43,9 @@ public void OnUpdate(ref SystemState state) // Every spawned box needs a unique seed, so the // seedOffset must be incremented by the number of boxes every frame. - seedOffset += count; + m_SeedOffset += count; - new RandomPositionJob - { - SeedOffset = seedOffset - }.ScheduleParallel(); + new RandomPositionJob { SeedOffset = m_SeedOffset }.ScheduleParallel(); } } @@ -58,7 +55,7 @@ partial struct RandomPositionJob : IJobEntity { public uint SeedOffset; - public void Execute([EntityIndexInQuery] int index, ref LocalTransform transform) + void Execute([EntityIndexInQuery] int index, ref LocalTransform transform) { // Random instances with similar seeds produce similar results, so to get proper // randomness here, we use CreateFromIndex, which hashes the seed. diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/SpawnSystem.cs.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/SpawnSystem.cs.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/SpawnSystem.cs.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/SpawnSystem.cs.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Subscenes.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Subscenes.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Subscenes.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Subscenes.meta diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Subscenes/RandomSpawnSubscene.unity b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Subscenes/RandomSpawnSubscene.unity similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Subscenes/RandomSpawnSubscene.unity rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Subscenes/RandomSpawnSubscene.unity diff --git a/Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Subscenes/RandomSpawnSubscene.unity.meta b/Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Subscenes/RandomSpawnSubscene.unity.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/10. RandomSpawn/Subscenes/RandomSpawnSubscene.unity.meta rename to Dots101/Entities101/Assets/HelloCube/9. RandomSpawn/Subscenes/RandomSpawnSubscene.unity.meta diff --git a/Dots101/Entities101/Assets/HelloCube/HelloCube.asmdef b/Dots101/Entities101/Assets/HelloCube/HelloCube.asmdef index 70e6fc21d..08f76e6a1 100644 --- a/Dots101/Entities101/Assets/HelloCube/HelloCube.asmdef +++ b/Dots101/Entities101/Assets/HelloCube/HelloCube.asmdef @@ -10,7 +10,6 @@ "Unity.Entities.Graphics", "Unity.Transforms", "Unity.Scenes", - "EntityAuthoringUtils", "Unity.Profiling.Core", "SpatialTree" ], @@ -23,4 +22,4 @@ "defineConstraints": [], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file diff --git a/Dots101/Entities101/Assets/HelloCube/README.md b/Dots101/Entities101/Assets/HelloCube/README.md index 61a885064..e2787c963 100644 --- a/Dots101/Entities101/Assets/HelloCube/README.md +++ b/Dots101/Entities101/Assets/HelloCube/README.md @@ -14,10 +14,6 @@ The larger cube has a `RotationSpeedAuthoring` MonoBehavior, which adds a `Rotat This sample is the same as "MainThread", except the `RotationSpeedSystem` now uses a job (an `IJobEntity`) to spin the cubes instead of doing so directly on the main thread. Also, the Y-axis scale of the cube is fluctuated between 1 and -1 by setting the cube's `PostTransformMatrix` component. -## Aspects sample - -This sample is like "MainThread", except the `RotationSpeedSystem` now uses an aspect to move the cube up and down. - ## Prefabs sample The sample contains a single non-rendered entity with a `Spawner` component that references a cube prefab. diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/ExecuteAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/_Common/ExecuteAuthoring.cs index ab37463cf..6e2c16656 100644 --- a/Dots101/Entities101/Assets/HelloCube/_Common/ExecuteAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/_Common/ExecuteAuthoring.cs @@ -7,7 +7,6 @@ public class ExecuteAuthoring : MonoBehaviour { public bool MainThread; public bool IJobEntity; - public bool Aspects; public bool Prefabs; public bool IJobChunk; public bool Reparenting; @@ -28,7 +27,6 @@ public override void Bake(ExecuteAuthoring authoring) if (authoring.MainThread) AddComponent(entity); if (authoring.IJobEntity) AddComponent(entity); - if (authoring.Aspects) AddComponent(entity); if (authoring.Prefabs) AddComponent(entity); if (authoring.IJobChunk) AddComponent(entity); if (authoring.GameObjectSync) AddComponent(entity); @@ -44,59 +42,29 @@ public override void Bake(ExecuteAuthoring authoring) } } - public struct ExecuteMainThread : IComponentData - { - } + public struct ExecuteMainThread : IComponentData { } - public struct ExecuteIJobEntity : IComponentData - { - } + public struct ExecuteIJobEntity : IComponentData { } - public struct ExecuteAspects : IComponentData - { - } + public struct ExecutePrefabs : IComponentData { } - public struct ExecutePrefabs : IComponentData - { - } + public struct ExecuteIJobChunk : IComponentData { } - public struct ExecuteIJobChunk : IComponentData - { - } + public struct ExecuteGameObjectSync : IComponentData { } - public struct ExecuteGameObjectSync : IComponentData - { - } + public struct ExecuteReparenting : IComponentData { } - public struct ExecuteReparenting : IComponentData - { - } + public struct ExecuteEnableableComponents : IComponentData { } - public struct ExecuteEnableableComponents : IComponentData - { - } + public struct ExecuteCrossQuery : IComponentData { } - public struct ExecuteCrossQuery : IComponentData - { - } + public struct ExecuteRandomSpawn : IComponentData { } - public struct ExecuteRandomSpawn : IComponentData - { - } - - public struct ExecuteFirstPersonController : IComponentData - { - } + public struct ExecuteFirstPersonController : IComponentData { } - public struct ExecuteFixedTimestep : IComponentData - { - } + public struct ExecuteFixedTimestep : IComponentData { } - public struct ExecuteStateChange : IComponentData - { - } + public struct ExecuteStateChange : IComponentData { } - public struct ExecuteClosestTarget : IComponentData - { - } + public struct ExecuteClosestTarget : IComponentData { } } diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Box.mat b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Box.mat index 7e8442b39..f3f88baf9 100644 --- a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Box.mat +++ b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Box.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -96,6 +96,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -126,10 +127,11 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _BaseColor: {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0} + - _Color: {r: 0.35686272, g: 0.35686272, b: 0.35686272, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Target.mat b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Target.mat index 0c0c6f1cb..08970662f 100644 --- a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Target.mat +++ b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Target.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -96,6 +96,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -125,10 +126,11 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 0, b: 0.12796736, a: 1} - - _Color: {r: 1, g: 0, b: 0.12796733, a: 1} + - _BaseColor: {r: 0.8616352, g: 0.21527934, b: 0.18153933, a: 1} + - _Color: {r: 0.8616352, g: 0.21527931, b: 0.1815393, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Unit.mat b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Unit.mat index 26d891352..65709a9d2 100644 --- a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Unit.mat +++ b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Unit.mat @@ -83,6 +83,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -112,10 +113,11 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.13509333, g: 1, b: 0, a: 1} - - _Color: {r: 0.1350933, g: 1, b: 0, a: 1} + - _BaseColor: {r: 0.8013663, g: 0.9559748, b: 0.27356493, a: 1} + - _Color: {r: 0.8013663, g: 0.95597476, b: 0.2735649, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] @@ -132,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Default.mat b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/White.mat similarity index 95% rename from Dots101/Entities101/Assets/HelloCube/_Common/Materials/Default.mat rename to Dots101/Entities101/Assets/HelloCube/_Common/Materials/White.mat index 39cb66cd0..369a64c19 100644 --- a/Dots101/Entities101/Assets/HelloCube/_Common/Materials/Default.mat +++ b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/White.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Default + m_Name: White m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -83,6 +83,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -112,10 +113,11 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1} - - _Color: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -132,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/Default.mat.meta b/Dots101/Entities101/Assets/HelloCube/_Common/Materials/White.mat.meta similarity index 100% rename from Dots101/Entities101/Assets/HelloCube/_Common/Default.mat.meta rename to Dots101/Entities101/Assets/HelloCube/_Common/Materials/White.mat.meta diff --git a/Dots101/Entities101/Assets/HelloCube/_Common/RotationSpeedAuthoring.cs b/Dots101/Entities101/Assets/HelloCube/_Common/RotationSpeedAuthoring.cs index 66c8d1f08..ab12d3a90 100644 --- a/Dots101/Entities101/Assets/HelloCube/_Common/RotationSpeedAuthoring.cs +++ b/Dots101/Entities101/Assets/HelloCube/_Common/RotationSpeedAuthoring.cs @@ -17,10 +17,7 @@ public override void Bake(RotationSpeedAuthoring authoring) { // The entity will be moved var entity = GetEntity(TransformUsageFlags.Dynamic); - AddComponent(entity, new RotationSpeed - { - RadiansPerSecond = math.radians(authoring.DegreesPerSecond) - }); + AddComponent(entity, new RotationSpeed { RadiansPerSecond = math.radians(authoring.DegreesPerSecond) }); } } } diff --git a/Dots101/Entities101/Assets/Kickball/Common/Ball.mat b/Dots101/Entities101/Assets/Kickball/Common/Ball.mat index d87451c33..69785695c 100644 --- a/Dots101/Entities101/Assets/Kickball/Common/Ball.mat +++ b/Dots101/Entities101/Assets/Kickball/Common/Ball.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/Entities101/Assets/Kickball/Common/Ground.mat b/Dots101/Entities101/Assets/Kickball/Common/Ground.mat index 05c0e72c2..9ae24f766 100644 --- a/Dots101/Entities101/Assets/Kickball/Common/Ground.mat +++ b/Dots101/Entities101/Assets/Kickball/Common/Ground.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/Entities101/Assets/Kickball/Common/Player.mat b/Dots101/Entities101/Assets/Kickball/Common/Player.mat index e11ce32ca..85f267250 100644 --- a/Dots101/Entities101/Assets/Kickball/Common/Player.mat +++ b/Dots101/Entities101/Assets/Kickball/Common/Player.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/1dcc6875c7563164b8aac27b946bb47e.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/1dcc6875c7563164b8aac27b946bb47e.sceneWithBuildSettings new file mode 100644 index 000000000..f1867b161 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/1dcc6875c7563164b8aac27b946bb47e.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/1dcc6875c7563164b8aac27b946bb47e.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/1dcc6875c7563164b8aac27b946bb47e.sceneWithBuildSettings.meta new file mode 100644 index 000000000..c26e23df1 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/1dcc6875c7563164b8aac27b946bb47e.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1dcc6875c7563164b8aac27b946bb47e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/1eee41f54159f11d5d32d43ced114149.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/1eee41f54159f11d5d32d43ced114149.sceneWithBuildSettings new file mode 100644 index 000000000..4938e7314 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/1eee41f54159f11d5d32d43ced114149.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/1eee41f54159f11d5d32d43ced114149.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/1eee41f54159f11d5d32d43ced114149.sceneWithBuildSettings.meta new file mode 100644 index 000000000..1583f2f63 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/1eee41f54159f11d5d32d43ced114149.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1eee41f54159f11d5d32d43ced114149 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/427a21cc13f165f19f280995c94ee10b.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/427a21cc13f165f19f280995c94ee10b.sceneWithBuildSettings new file mode 100644 index 000000000..421c569a9 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/427a21cc13f165f19f280995c94ee10b.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/427a21cc13f165f19f280995c94ee10b.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/427a21cc13f165f19f280995c94ee10b.sceneWithBuildSettings.meta new file mode 100644 index 000000000..fa4203e73 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/427a21cc13f165f19f280995c94ee10b.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 427a21cc13f165f19f280995c94ee10b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/5b381810e75167b8518699c0ee600908.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/5b381810e75167b8518699c0ee600908.sceneWithBuildSettings new file mode 100644 index 000000000..e74fa8189 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/5b381810e75167b8518699c0ee600908.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/5b381810e75167b8518699c0ee600908.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/5b381810e75167b8518699c0ee600908.sceneWithBuildSettings.meta new file mode 100644 index 000000000..ee978dec0 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/5b381810e75167b8518699c0ee600908.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b381810e75167b8518699c0ee600908 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/6ce9e3c44df1c97f9e4092e2d039632d.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/6ce9e3c44df1c97f9e4092e2d039632d.sceneWithBuildSettings new file mode 100644 index 000000000..c08a2f9cf Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/6ce9e3c44df1c97f9e4092e2d039632d.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/6ce9e3c44df1c97f9e4092e2d039632d.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/6ce9e3c44df1c97f9e4092e2d039632d.sceneWithBuildSettings.meta new file mode 100644 index 000000000..015c2e4e5 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/6ce9e3c44df1c97f9e4092e2d039632d.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ce9e3c44df1c97f9e4092e2d039632d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/75096fa927ac92d18d396dd9533ea000.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/75096fa927ac92d18d396dd9533ea000.sceneWithBuildSettings new file mode 100644 index 000000000..a7a4815bc Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/75096fa927ac92d18d396dd9533ea000.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/75096fa927ac92d18d396dd9533ea000.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/75096fa927ac92d18d396dd9533ea000.sceneWithBuildSettings.meta new file mode 100644 index 000000000..8935405d0 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/75096fa927ac92d18d396dd9533ea000.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 75096fa927ac92d18d396dd9533ea000 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/75f08aec5a008bb81342a4caf48ced7d.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/75f08aec5a008bb81342a4caf48ced7d.sceneWithBuildSettings new file mode 100644 index 000000000..f84c850d0 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/75f08aec5a008bb81342a4caf48ced7d.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/75f08aec5a008bb81342a4caf48ced7d.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/75f08aec5a008bb81342a4caf48ced7d.sceneWithBuildSettings.meta new file mode 100644 index 000000000..1924cdd92 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/75f08aec5a008bb81342a4caf48ced7d.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 75f08aec5a008bb81342a4caf48ced7d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/7efff222ecf4cdff6b9eba0a97dab1ff.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/7efff222ecf4cdff6b9eba0a97dab1ff.sceneWithBuildSettings new file mode 100644 index 000000000..9c1c18b29 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/7efff222ecf4cdff6b9eba0a97dab1ff.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/7efff222ecf4cdff6b9eba0a97dab1ff.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/7efff222ecf4cdff6b9eba0a97dab1ff.sceneWithBuildSettings.meta new file mode 100644 index 000000000..5bf4e8f20 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/7efff222ecf4cdff6b9eba0a97dab1ff.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7efff222ecf4cdff6b9eba0a97dab1ff +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/8506336ec6eaa70a95c58487e1895ef2.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/8506336ec6eaa70a95c58487e1895ef2.sceneWithBuildSettings new file mode 100644 index 000000000..5f7790c08 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/8506336ec6eaa70a95c58487e1895ef2.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/8506336ec6eaa70a95c58487e1895ef2.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/8506336ec6eaa70a95c58487e1895ef2.sceneWithBuildSettings.meta new file mode 100644 index 000000000..8e8dc145b --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/8506336ec6eaa70a95c58487e1895ef2.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8506336ec6eaa70a95c58487e1895ef2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/8675d561f58fea5cdece51644d7cba71.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/8675d561f58fea5cdece51644d7cba71.sceneWithBuildSettings new file mode 100644 index 000000000..81e8d3625 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/8675d561f58fea5cdece51644d7cba71.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/8675d561f58fea5cdece51644d7cba71.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/8675d561f58fea5cdece51644d7cba71.sceneWithBuildSettings.meta new file mode 100644 index 000000000..ec07f22a3 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/8675d561f58fea5cdece51644d7cba71.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8675d561f58fea5cdece51644d7cba71 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/8b0ee4a8b0304cbb380cadc4efcd4c62.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/8b0ee4a8b0304cbb380cadc4efcd4c62.sceneWithBuildSettings new file mode 100644 index 000000000..a391e7ed9 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/8b0ee4a8b0304cbb380cadc4efcd4c62.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/8b0ee4a8b0304cbb380cadc4efcd4c62.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/8b0ee4a8b0304cbb380cadc4efcd4c62.sceneWithBuildSettings.meta new file mode 100644 index 000000000..673373aee --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/8b0ee4a8b0304cbb380cadc4efcd4c62.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b0ee4a8b0304cbb380cadc4efcd4c62 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/9f904e942c120ac70567bad24895efb7.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/9f904e942c120ac70567bad24895efb7.sceneWithBuildSettings new file mode 100644 index 000000000..84ac51af5 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/9f904e942c120ac70567bad24895efb7.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/9f904e942c120ac70567bad24895efb7.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/9f904e942c120ac70567bad24895efb7.sceneWithBuildSettings.meta new file mode 100644 index 000000000..2f6f1d71d --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/9f904e942c120ac70567bad24895efb7.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9f904e942c120ac70567bad24895efb7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/a83a263323e41ff06a5ee61f73a6d2f4.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/a83a263323e41ff06a5ee61f73a6d2f4.sceneWithBuildSettings new file mode 100644 index 000000000..a8df9f374 Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/a83a263323e41ff06a5ee61f73a6d2f4.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/a83a263323e41ff06a5ee61f73a6d2f4.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/a83a263323e41ff06a5ee61f73a6d2f4.sceneWithBuildSettings.meta new file mode 100644 index 000000000..48ccb3160 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/a83a263323e41ff06a5ee61f73a6d2f4.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a83a263323e41ff06a5ee61f73a6d2f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/c3bd7176e9d1366001a2e6688fde6efb.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/c3bd7176e9d1366001a2e6688fde6efb.sceneWithBuildSettings new file mode 100644 index 000000000..7508d251c Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/c3bd7176e9d1366001a2e6688fde6efb.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/c3bd7176e9d1366001a2e6688fde6efb.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/c3bd7176e9d1366001a2e6688fde6efb.sceneWithBuildSettings.meta new file mode 100644 index 000000000..6db09984d --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/c3bd7176e9d1366001a2e6688fde6efb.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c3bd7176e9d1366001a2e6688fde6efb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/e083fdf488e45d724c5762748280d56e.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/e083fdf488e45d724c5762748280d56e.sceneWithBuildSettings new file mode 100644 index 000000000..d67d4a67e Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/e083fdf488e45d724c5762748280d56e.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/e083fdf488e45d724c5762748280d56e.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/e083fdf488e45d724c5762748280d56e.sceneWithBuildSettings.meta new file mode 100644 index 000000000..bae925dff --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/e083fdf488e45d724c5762748280d56e.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e083fdf488e45d724c5762748280d56e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/f1f7e65cc626600a3f4e93e5de83ac02.sceneWithBuildSettings b/Dots101/Entities101/Assets/SceneDependencyCache/f1f7e65cc626600a3f4e93e5de83ac02.sceneWithBuildSettings new file mode 100644 index 000000000..c9ef8f89b Binary files /dev/null and b/Dots101/Entities101/Assets/SceneDependencyCache/f1f7e65cc626600a3f4e93e5de83ac02.sceneWithBuildSettings differ diff --git a/Dots101/Entities101/Assets/SceneDependencyCache/f1f7e65cc626600a3f4e93e5de83ac02.sceneWithBuildSettings.meta b/Dots101/Entities101/Assets/SceneDependencyCache/f1f7e65cc626600a3f4e93e5de83ac02.sceneWithBuildSettings.meta new file mode 100644 index 000000000..eb72a0211 --- /dev/null +++ b/Dots101/Entities101/Assets/SceneDependencyCache/f1f7e65cc626600a3f4e93e5de83ac02.sceneWithBuildSettings.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f1f7e65cc626600a3f4e93e5de83ac02 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dots101/Entities101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Dots101/Entities101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index d3ba6cce5..2e36f36f4 100644 --- a/Dots101/Entities101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Dots101/Entities101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -54,6 +54,14 @@ MonoBehaviour: - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 271671140784537600 + - rid: 3402206351077408768 + - rid: 3402206351077408769 + - rid: 3402206351077408770 + - rid: 3402206351077408771 + - rid: 3402206351077408772 + - rid: 3402206351077408773 + - rid: 3402206351077408774 + - rid: 3402206351077408775 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -92,6 +100,133 @@ MonoBehaviour: m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 3402206351077408768 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3} + m_ShaderResourcesVersion: 0 + - rid: 3402206351077408769 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 3402206351077408770 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} + - rid: 3402206351077408771 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 3402206351077408772 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 3402206351077408773 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + - rid: 3402206351077408774 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + - rid: 3402206351077408775 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 - rid: 6852985685364965376 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -105,9 +240,6 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} @@ -118,6 +250,8 @@ MonoBehaviour: m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - rid: 6852985685364965379 type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -134,6 +268,9 @@ MonoBehaviour: m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - rid: 6852985685364965381 type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Dots101/Entities101/Assets/Tornado/Tornado.unity b/Dots101/Entities101/Assets/Tornado/Tornado.unity index cd5f3c8dd..7f50719e0 100644 --- a/Dots101/Entities101/Assets/Tornado/Tornado.unity +++ b/Dots101/Entities101/Assets/Tornado/Tornado.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 0 @@ -97,9 +93,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 362200becd6d34a4f903ce7c38897c73, - type: 2} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 362200becd6d34a4f903ce7c38897c73, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -136,6 +131,7 @@ GameObject: - component: {fileID: 681067781} - component: {fileID: 681067780} - component: {fileID: 681067779} + - component: {fileID: 681067783} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -217,14 +213,58 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681067778} + serializedVersion: 2 m_LocalRotation: {x: -0.22028808, y: -0.24787813, z: 0.057986468, w: -0.9416301} m_LocalPosition: {x: -43.374245, y: 47.84481, z: -77.78398} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &681067783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681067778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1005247804 GameObject: m_ObjectHideFlags: 0 @@ -270,13 +310,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005247804} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1951368732 GameObject: @@ -313,6 +353,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -334,6 +379,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -353,13 +399,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951368732} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 300, y: 300, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1964716861 GameObject: @@ -387,9 +433,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964716861} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -439,8 +484,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1964716863 Transform: m_ObjectHideFlags: 0 @@ -448,13 +497,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964716861} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1964716864 MonoBehaviour: @@ -468,14 +517,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 681067782} + - {fileID: 1964716863} + - {fileID: 1951368735} + - {fileID: 1005247806} diff --git a/Dots101/Entities101/Packages/manifest.json b/Dots101/Entities101/Packages/manifest.json index 3f348ca97..028cae2c3 100644 --- a/Dots101/Entities101/Packages/manifest.json +++ b/Dots101/Entities101/Packages/manifest.json @@ -1,17 +1,17 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.5", - "com.unity.collab-proxy": "2.6.0", - "com.unity.entities.graphics": "1.3.2", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.11.2", + "com.unity.ai.navigation": "2.0.9", + "com.unity.collab-proxy": "2.10.1", + "com.unity.entities.graphics": "1.4.16", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.inputsystem": "1.14.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.render-pipelines.universal": "17.2.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.5", + "com.unity.visualscripting": "1.9.9", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Dots101/Entities101/Packages/packages-lock.json b/Dots101/Entities101/Packages/packages-lock.json index 3e0358803..89fadd76b 100644 --- a/Dots101/Entities101/Packages/packages-lock.json +++ b/Dots101/Entities101/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "2.0.5", + "version": "2.0.9", "depth": 0, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.25", "depth": 2, "source": "registry", "dependencies": { @@ -20,53 +20,54 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.6.0", + "version": "2.10.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.6.3", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.burst": "1.8.25", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.entities": { - "version": "1.3.2", + "version": "1.4.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.collections": "2.5.1", - "com.unity.mathematics": "1.3.1", + "com.unity.burst": "1.8.25", + "com.unity.collections": "2.6.3", + "com.unity.mathematics": "1.3.2", "com.unity.modules.audio": "1.0.0", - "com.unity.serialization": "3.1.1", + "com.unity.serialization": "3.1.2", "com.unity.profiling.core": "1.0.2", "com.unity.modules.physics": "1.0.0", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "1.21.21", + "com.unity.scriptablebuildpipeline": "1.21.25", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.entities.graphics": { - "version": "1.3.2", + "version": "1.4.16", "depth": 0, "source": "registry", "dependencies": { - "com.unity.entities": "1.3.2", - "com.unity.render-pipelines.core": "14.0.9", + "com.unity.entities": "1.4.3", + "com.unity.render-pipelines.core": "14.0.10", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -74,12 +75,11 @@ "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.38", "depth": 0, "source": "registry", "dependencies": { @@ -88,16 +88,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.25", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.11.2", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { @@ -121,7 +121,7 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 2, "source": "registry", "dependencies": {}, @@ -135,7 +135,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.3", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { @@ -150,12 +150,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.0.3", + "version": "17.2.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.shadergraph": "17.0.3", + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.shadergraph": "17.2.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -178,14 +178,17 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.1.4", + "version": "2.4.3", "depth": 2, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.2", + "version": "4.9.3", "depth": 2, "source": "registry", "dependencies": {}, @@ -202,37 +205,36 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.3", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.searcher": "4.9.2" + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.searcher": "4.9.3" } }, "com.unity.test-framework": { - "version": "1.4.5", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.2.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.8.7", + "version": "1.8.9", "depth": 0, "source": "registry", "dependencies": { @@ -253,7 +255,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.5", + "version": "1.9.9", "depth": 0, "source": "registry", "dependencies": { @@ -410,7 +412,8 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Dots101/Entities101/ProjectSettings/ProjectSettings.asset b/Dots101/Entities101/ProjectSettings/ProjectSettings.asset index 9c6c334bd..1aae2d83d 100644 --- a/Dots101/Entities101/ProjectSettings/ProjectSettings.asset +++ b/Dots101/Entities101/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 1 androidDefaultWindowWidth: 1920 @@ -86,6 +87,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -132,6 +134,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -273,6 +276,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -527,6 +533,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 0200000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -542,6 +551,7 @@ PlayerSettings: - serializedVersion: 2 m_BuildTarget: Android m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: @@ -810,12 +820,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -943,3 +953,5 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} diff --git a/Dots101/Entities101/ProjectSettings/ProjectVersion.txt b/Dots101/Entities101/ProjectSettings/ProjectVersion.txt index d1c9097a6..1ddb36df4 100644 --- a/Dots101/Entities101/ProjectSettings/ProjectVersion.txt +++ b/Dots101/Entities101/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.32f1 -m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) +m_EditorVersion: 6000.2.10f1 +m_EditorVersionWithRevision: 6000.2.10f1 (d3d30d158480) diff --git a/Dots101/Entities101/ProjectSettings/ShaderGraphSettings.asset b/Dots101/Entities101/ProjectSettings/ShaderGraphSettings.asset index e66042a7c..ce8c24328 100644 --- a/Dots101/Entities101/ProjectSettings/ShaderGraphSettings.asset +++ b/Dots101/Entities101/ProjectSettings/ShaderGraphSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0} diff --git a/Dots101/Entities101/ProjectSettings/URPProjectSettings.asset b/Dots101/Entities101/ProjectSettings/URPProjectSettings.asset index 08faf0336..64a8674a2 100644 --- a/Dots101/Entities101/ProjectSettings/URPProjectSettings.asset +++ b/Dots101/Entities101/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 10 diff --git a/Dots101/Jobs101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Dots101/Jobs101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index fc7b2c83e..a6de765e2 100644 --- a/Dots101/Jobs101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Dots101/Jobs101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -54,6 +54,14 @@ MonoBehaviour: - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 271671140950999040 + - rid: 335976768234061824 + - rid: 335976768234061825 + - rid: 335976768234061826 + - rid: 335976768234061827 + - rid: 335976768234061828 + - rid: 335976768234061829 + - rid: 335976768234061830 + - rid: 335976768234061831 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -92,6 +100,133 @@ MonoBehaviour: m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 335976768234061824 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3} + m_ShaderResourcesVersion: 0 + - rid: 335976768234061825 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 335976768234061826 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} + - rid: 335976768234061827 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 335976768234061828 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 335976768234061829 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + - rid: 335976768234061830 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + - rid: 335976768234061831 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 - rid: 6852985685364965376 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -105,9 +240,6 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} @@ -118,6 +250,8 @@ MonoBehaviour: m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - rid: 6852985685364965379 type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -134,6 +268,9 @@ MonoBehaviour: m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - rid: 6852985685364965381 type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 1/Step1_NoJobs.unity b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 1/Step1_NoJobs.unity index 3e2896531..df0e58db1 100644 --- a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 1/Step1_NoJobs.unity +++ b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 1/Step1_NoJobs.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -133,6 +129,7 @@ GameObject: m_Component: - component: {fileID: 705507995} - component: {fileID: 705507994} + - component: {fileID: 705507996} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -148,9 +145,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -200,8 +196,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -209,14 +209,43 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &705507996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -228,6 +257,7 @@ GameObject: - component: {fileID: 963194228} - component: {fileID: 963194227} - component: {fileID: 963194226} + - component: {fileID: 963194229} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -257,9 +287,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -293,14 +331,58 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} + serializedVersion: 2 m_LocalRotation: {x: -0.52408355, y: -0.0923559, z: 0.05730094, w: -0.84470326} m_LocalPosition: {x: 44.183537, y: 69.35484, z: 2.531105} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &963194229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1691666526 GameObject: m_ObjectHideFlags: 0 @@ -342,11 +424,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691666526} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 963194228} + - {fileID: 705507995} + - {fileID: 1691666528} diff --git a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 2/Step2_SingleThreadedJob.unity b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 2/Step2_SingleThreadedJob.unity index 4c0e17e5c..1ecc84a0a 100644 --- a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 2/Step2_SingleThreadedJob.unity +++ b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 2/Step2_SingleThreadedJob.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -133,6 +129,7 @@ GameObject: m_Component: - component: {fileID: 705507995} - component: {fileID: 705507994} + - component: {fileID: 705507996} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -148,9 +145,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -200,8 +196,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -209,14 +209,43 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &705507996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -228,6 +257,7 @@ GameObject: - component: {fileID: 963194228} - component: {fileID: 963194227} - component: {fileID: 963194226} + - component: {fileID: 963194229} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -301,14 +331,58 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} + serializedVersion: 2 m_LocalRotation: {x: -0.52408355, y: -0.0923559, z: 0.05730094, w: -0.84470326} m_LocalPosition: {x: 44.183537, y: 69.35484, z: 2.531105} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &963194229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1691666526 GameObject: m_ObjectHideFlags: 0 @@ -334,13 +408,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691666526} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1691666530 MonoBehaviour: @@ -371,3 +445,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec411010c4ce457195c0178edcfa6cc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 963194228} + - {fileID: 705507995} + - {fileID: 1691666528} diff --git a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 3/Step3_ParallelJob.unity b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 3/Step3_ParallelJob.unity index ffcddc79b..f25e6ff43 100644 --- a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 3/Step3_ParallelJob.unity +++ b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 3/Step3_ParallelJob.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -149,9 +145,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -201,8 +196,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -210,13 +209,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &705507996 MonoBehaviour: @@ -230,17 +229,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -252,6 +257,7 @@ GameObject: - component: {fileID: 963194228} - component: {fileID: 963194227} - component: {fileID: 963194226} + - component: {fileID: 963194229} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -325,14 +331,58 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} + serializedVersion: 2 m_LocalRotation: {x: -0.52408355, y: -0.0923559, z: 0.05730094, w: -0.84470326} m_LocalPosition: {x: 44.183537, y: 69.35484, z: 2.531105} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &963194229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1691666526 GameObject: m_ObjectHideFlags: 0 @@ -358,13 +408,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691666526} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1691666529 MonoBehaviour: @@ -390,10 +440,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9810eb555a94440b3b99d4d62bd6793c, type: 3} m_Name: m_EditorClassIdentifier: - SeekerPrefab: {fileID: 6799008890615508230, guid: 265799596ba044b83b3aefb9605005b1, - type: 3} - TargetPrefab: {fileID: 6799008890615508230, guid: 442de73e07b96454581bb5f8a98825ab, - type: 3} + SeekerPrefab: {fileID: 6799008890615508230, guid: 265799596ba044b83b3aefb9605005b1, type: 3} + TargetPrefab: {fileID: 6799008890615508230, guid: 442de73e07b96454581bb5f8a98825ab, type: 3} NumSeekers: 5000 NumTargets: 5000 Bounds: {x: 500, y: 500} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 963194228} + - {fileID: 705507995} + - {fileID: 1691666528} diff --git a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 4/Step4_ParallelJob_Sorting.unity b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 4/Step4_ParallelJob_Sorting.unity index b524d009f..28a7006ea 100644 --- a/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 4/Step4_ParallelJob_Sorting.unity +++ b/Dots101/Jobs101/Assets/TargetsAndSeekers/Step 4/Step4_ParallelJob_Sorting.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -133,6 +129,7 @@ GameObject: m_Component: - component: {fileID: 705507995} - component: {fileID: 705507994} + - component: {fileID: 705507996} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -148,9 +145,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -200,8 +196,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -209,14 +209,43 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &705507996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -228,6 +257,7 @@ GameObject: - component: {fileID: 963194228} - component: {fileID: 963194227} - component: {fileID: 963194226} + - component: {fileID: 963194229} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -301,14 +331,58 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} + serializedVersion: 2 m_LocalRotation: {x: -0.52408355, y: -0.0923559, z: 0.05730094, w: -0.84470326} m_LocalPosition: {x: 44.183537, y: 69.35484, z: 2.531105} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &963194229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1691666526 GameObject: m_ObjectHideFlags: 0 @@ -334,13 +408,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691666526} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1691666529 MonoBehaviour: @@ -371,3 +445,10 @@ MonoBehaviour: NumSeekers: 10000 NumTargets: 10000 Bounds: {x: 500, y: 500} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 963194228} + - {fileID: 705507995} + - {fileID: 1691666528} diff --git a/Dots101/Jobs101/Packages/manifest.json b/Dots101/Jobs101/Packages/manifest.json index 3eb9e15c0..b14f3a3e0 100644 --- a/Dots101/Jobs101/Packages/manifest.json +++ b/Dots101/Jobs101/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.5", - "com.unity.collab-proxy": "2.6.0", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.11.2", + "com.unity.ai.navigation": "2.0.9", + "com.unity.collab-proxy": "2.10.1", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.inputsystem": "1.14.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.render-pipelines.universal": "17.2.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.5", + "com.unity.visualscripting": "1.9.9", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Dots101/Jobs101/Packages/packages-lock.json b/Dots101/Jobs101/Packages/packages-lock.json index cb199c04f..f11d74429 100644 --- a/Dots101/Jobs101/Packages/packages-lock.json +++ b/Dots101/Jobs101/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "2.0.5", + "version": "2.0.9", "depth": 0, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.25", "depth": 2, "source": "registry", "dependencies": { @@ -20,20 +20,21 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.6.0", + "version": "2.10.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.6.2", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.burst": "1.8.23", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" @@ -41,12 +42,11 @@ "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.38", "depth": 0, "source": "registry", "dependencies": { @@ -55,16 +55,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.25", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.11.2", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { @@ -88,14 +88,14 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 3, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.3", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { @@ -110,12 +110,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.0.3", + "version": "17.2.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.shadergraph": "17.0.3", + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.shadergraph": "17.2.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -138,44 +138,43 @@ } }, "com.unity.searcher": { - "version": "4.9.2", + "version": "4.9.3", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.3", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.searcher": "4.9.2" + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.searcher": "4.9.3" } }, "com.unity.test-framework": { - "version": "1.4.5", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.2.0", "depth": 3, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.8.7", + "version": "1.8.9", "depth": 0, "source": "registry", "dependencies": { @@ -196,7 +195,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.5", + "version": "1.9.9", "depth": 0, "source": "registry", "dependencies": { @@ -353,7 +352,8 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Dots101/Jobs101/ProjectSettings/ProjectSettings.asset b/Dots101/Jobs101/ProjectSettings/ProjectSettings.asset index 792455999..0998dc201 100644 --- a/Dots101/Jobs101/ProjectSettings/ProjectSettings.asset +++ b/Dots101/Jobs101/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 1 androidDefaultWindowWidth: 1920 @@ -86,6 +87,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -132,6 +134,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -273,6 +276,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -527,6 +533,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 0200000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -542,6 +551,7 @@ PlayerSettings: - serializedVersion: 2 m_BuildTarget: Android m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: @@ -810,12 +820,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -943,3 +953,5 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} diff --git a/Dots101/Jobs101/ProjectSettings/ProjectVersion.txt b/Dots101/Jobs101/ProjectSettings/ProjectVersion.txt index d1c9097a6..1ddb36df4 100644 --- a/Dots101/Jobs101/ProjectSettings/ProjectVersion.txt +++ b/Dots101/Jobs101/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.32f1 -m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) +m_EditorVersion: 6000.2.10f1 +m_EditorVersionWithRevision: 6000.2.10f1 (d3d30d158480) diff --git a/Dots101/Jobs101/ProjectSettings/SceneTemplateSettings.json b/Dots101/Jobs101/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 000000000..ede5887b3 --- /dev/null +++ b/Dots101/Jobs101/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/Dots101/Jobs101/ProjectSettings/ShaderGraphSettings.asset b/Dots101/Jobs101/ProjectSettings/ShaderGraphSettings.asset index e66042a7c..ce8c24328 100644 --- a/Dots101/Jobs101/ProjectSettings/ShaderGraphSettings.asset +++ b/Dots101/Jobs101/ProjectSettings/ShaderGraphSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0} diff --git a/Dots101/Jobs101/ProjectSettings/URPProjectSettings.asset b/Dots101/Jobs101/ProjectSettings/URPProjectSettings.asset index 08faf0336..64a8674a2 100644 --- a/Dots101/Jobs101/ProjectSettings/URPProjectSettings.asset +++ b/Dots101/Jobs101/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 10 diff --git a/Dots101/Netcode101/Assets/Settings/InputSystem.inputsettings.asset b/Dots101/Netcode101/Assets/InputSystem.inputsettings.asset similarity index 92% rename from Dots101/Netcode101/Assets/Settings/InputSystem.inputsettings.asset rename to Dots101/Netcode101/Assets/InputSystem.inputsettings.asset index 87996a1dd..9656f6e5c 100644 --- a/Dots101/Netcode101/Assets/Settings/InputSystem.inputsettings.asset +++ b/Dots101/Netcode101/Assets/InputSystem.inputsettings.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3} m_Name: InputSystem.inputsettings - m_EditorClassIdentifier: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputSettings m_SupportedDevices: [] m_UpdateMode: 1 m_ScrollDeltaBehavior: 0 diff --git a/Dots101/Netcode101/Assets/Settings/InputSystem.inputsettings.asset.meta b/Dots101/Netcode101/Assets/InputSystem.inputsettings.asset.meta similarity index 79% rename from Dots101/Netcode101/Assets/Settings/InputSystem.inputsettings.asset.meta rename to Dots101/Netcode101/Assets/InputSystem.inputsettings.asset.meta index 8002ab34f..f312dcb6d 100644 --- a/Dots101/Netcode101/Assets/Settings/InputSystem.inputsettings.asset.meta +++ b/Dots101/Netcode101/Assets/InputSystem.inputsettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7092c6f50272baf4f8b859eeac4f7111 +guid: 662b53235f130c74fb6d0e8e497761a0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Dots101/Netcode101/Assets/Kickball.unity b/Dots101/Netcode101/Assets/Kickball.unity index b13d5d0fa..d836a2eb5 100644 --- a/Dots101/Netcode101/Assets/Kickball.unity +++ b/Dots101/Netcode101/Assets/Kickball.unity @@ -248,7 +248,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -256,6 +255,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -366,17 +366,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 diff --git a/Dots101/Netcode101/Assets/Materials/Box.mat b/Dots101/Netcode101/Assets/Materials/Box.mat index d4d138004..c1139f1a1 100644 --- a/Dots101/Netcode101/Assets/Materials/Box.mat +++ b/Dots101/Netcode101/Assets/Materials/Box.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/Netcode101/Assets/Materials/Default.mat b/Dots101/Netcode101/Assets/Materials/Default.mat index 39cb66cd0..8d22e09e6 100644 --- a/Dots101/Netcode101/Assets/Materials/Default.mat +++ b/Dots101/Netcode101/Assets/Materials/Default.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/Netcode101/Assets/Settings/InputSystem_Actions.inputactions b/Dots101/Netcode101/Assets/Settings/InputSystem_Actions.inputactions index 37c87e5e4..6435bad84 100644 --- a/Dots101/Netcode101/Assets/Settings/InputSystem_Actions.inputactions +++ b/Dots101/Netcode101/Assets/Settings/InputSystem_Actions.inputactions @@ -1,4 +1,5 @@ { + "version": 1, "name": "InputSystem_Actions", "maps": [ { diff --git a/Dots101/Netcode101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Dots101/Netcode101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 7b515d228..eb4e385fb 100644 --- a/Dots101/Netcode101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Dots101/Netcode101/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -54,18 +54,16 @@ MonoBehaviour: - rid: 6391757312239861899 - rid: 6391757312239861900 - rid: 6391757238176055316 + - rid: 335976813406715933 + - rid: 335976813406715934 + - rid: 335976813406715935 + - rid: 335976813406715936 + - rid: 335976813406715937 + - rid: 335976813406715938 + - rid: 335976813406715939 + - rid: 335976813406715940 m_RuntimeSettings: - m_List: - - rid: 6391757238176055296 - - rid: 6391757238176055298 - - rid: 6391757238176055299 - - rid: 6391757238176055301 - - rid: 6391757238176055303 - - rid: 6391757238176055305 - - rid: 6391757238176055306 - - rid: 6391757238176055308 - - rid: 6391757238176055313 - - rid: 6391757238176055316 + m_List: [] m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -96,6 +94,155 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: 335976813406715933 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, + type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, + type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, + type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, + type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, + type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, + type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, + type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, + type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, + type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, + type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, + type: 3} + m_ShaderResourcesVersion: 0 + - rid: 335976813406715934 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 335976813406715935 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, + type: 2} + - rid: 335976813406715936 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 335976813406715937 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 335976813406715938 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, + asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + - rid: 335976813406715939 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, + asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, + type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, + type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + - rid: 335976813406715940 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 - rid: 6391757238176055296 type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -142,6 +289,12 @@ MonoBehaviour: m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, + type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, + type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, + type: 3} - rid: 6391757238176055305 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -152,6 +305,10 @@ MonoBehaviour: type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, + type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, + type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - rid: 6391757238176055306 @@ -225,12 +382,6 @@ MonoBehaviour: type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, - type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, - type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, - type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, @@ -251,6 +402,8 @@ MonoBehaviour: type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, + type: 2} - rid: 6391757312239861894 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: diff --git a/Dots101/Netcode101/Assets/Systems/PlayerInputSystem.cs b/Dots101/Netcode101/Assets/Systems/PlayerInputSystem.cs index 3315cbbbe..67d30f23f 100644 --- a/Dots101/Netcode101/Assets/Systems/PlayerInputSystem.cs +++ b/Dots101/Netcode101/Assets/Systems/PlayerInputSystem.cs @@ -8,35 +8,32 @@ namespace KickBall [UpdateInGroup(typeof(GhostInputSystemGroup))] public partial struct PlayerInputSystem : ISystem { - public class InputActions : IComponentData - { - public InputAction MoveAction; - } - public void OnCreate(ref SystemState state) { - state.EntityManager.AddComponentObject(state.SystemHandle, new InputActions - { - MoveAction = InputSystem.actions.FindAction("Move"), - }); + var moveAction = InputSystem.actions.FindAction("Move"); + moveAction.Enable(); } public void OnUpdate(ref SystemState state) { + var moveAction = InputSystem.actions.FindAction("Move"); + var moveValue = moveAction.ReadValue(); + // WithAll so that we only modify the input buffer of the local client, not other clients // (it's possible and sometimes useful for clients to receive copies of each other's input buffers, but even in // those cases we wouldn't want to modify the copies of other players' input buffers) - foreach (var input in - SystemAPI.Query>() + foreach (var input in SystemAPI.Query>() .WithAll()) { input.ValueRW = default; + + // var moveAction = InputSystem.actions.FindAction("Move"); + // var moveValue = moveAction.ReadValue(); + // + // Debug.Log(moveValue); - var actions = state.EntityManager.GetComponentObject(state.SystemHandle); - var move = actions.MoveAction.ReadValue(); - - input.ValueRW.Horizontal = move.x; - input.ValueRW.Vertical = move.y; + input.ValueRW.Horizontal = moveValue.x; + input.ValueRW.Vertical = moveValue.y; var keyboard = Keyboard.current; if (keyboard != null) diff --git a/Dots101/Netcode101/Packages/manifest.json b/Dots101/Netcode101/Packages/manifest.json index 734fdc3eb..1cc132670 100644 --- a/Dots101/Netcode101/Packages/manifest.json +++ b/Dots101/Netcode101/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { - "com.unity.entities.graphics": "1.3.2", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.11.2", - "com.unity.logging": "1.3.2", + "com.unity.entities.graphics": "1.4.16", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.inputsystem": "1.14.2", + "com.unity.logging": "1.3.10", "com.unity.multiplayer.center": "1.0.0", - "com.unity.netcode": "1.3.2", - "com.unity.physics": "1.3.2", - "com.unity.render-pipelines.universal": "17.0.3", - "com.unity.test-framework": "1.4.5", - "com.unity.timeline": "1.8.7", + "com.unity.netcode": "1.9.2", + "com.unity.physics": "1.4.3", + "com.unity.render-pipelines.universal": "17.2.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Dots101/Netcode101/Packages/packages-lock.json b/Dots101/Netcode101/Packages/packages-lock.json index da206592b..70246a86f 100644 --- a/Dots101/Netcode101/Packages/packages-lock.json +++ b/Dots101/Netcode101/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.25", "depth": 1, "source": "registry", "dependencies": { @@ -11,46 +11,47 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.6.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.burst": "1.8.25", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.entities": { - "version": "1.3.2", + "version": "1.4.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.collections": "2.5.1", - "com.unity.mathematics": "1.3.1", + "com.unity.burst": "1.8.25", + "com.unity.collections": "2.6.3", + "com.unity.mathematics": "1.3.2", "com.unity.modules.audio": "1.0.0", - "com.unity.serialization": "3.1.1", + "com.unity.serialization": "3.1.2", "com.unity.profiling.core": "1.0.2", "com.unity.modules.physics": "1.0.0", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "1.21.21", + "com.unity.scriptablebuildpipeline": "1.21.25", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.entities.graphics": { - "version": "1.3.2", + "version": "1.4.16", "depth": 0, "source": "registry", "dependencies": { - "com.unity.entities": "1.3.2", - "com.unity.render-pipelines.core": "14.0.9", + "com.unity.entities": "1.4.3", + "com.unity.render-pipelines.core": "14.0.10", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -58,12 +59,11 @@ "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.38", "depth": 0, "source": "registry", "dependencies": { @@ -72,16 +72,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.25", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.11.2", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { @@ -90,12 +90,12 @@ "url": "https://packages.unity.com" }, "com.unity.logging": { - "version": "1.3.2", + "version": "1.3.10", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.collections": "2.5.1" + "com.unity.burst": "1.8.19", + "com.unity.collections": "2.5.7" }, "url": "https://packages.unity.com" }, @@ -115,34 +115,34 @@ } }, "com.unity.netcode": { - "version": "1.3.2", + "version": "1.9.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.entities": "1.3.2", - "com.unity.transport": "2.2.1", + "com.unity.entities": "1.3.5", + "com.unity.transport": "2.5.3", "com.unity.modules.animation": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.physics": { - "version": "1.3.2", + "version": "1.4.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.entities": "1.3.2", - "com.unity.collections": "2.5.1", + "com.unity.burst": "1.8.25", + "com.unity.entities": "1.4.3", + "com.unity.collections": "2.6.3", "com.unity.mathematics": "1.3.2", "com.unity.modules.imgui": "1.0.0", - "com.unity.test-framework": "1.4.5", + "com.unity.test-framework": "1.4.6", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" @@ -155,7 +155,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.3", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { @@ -170,12 +170,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.0.3", + "version": "17.2.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.shadergraph": "17.0.3", + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.shadergraph": "17.2.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -198,14 +198,17 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.1.4", + "version": "2.4.3", "depth": 2, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.2", + "version": "4.9.3", "depth": 2, "source": "registry", "dependencies": {}, @@ -222,37 +225,36 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.3", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.searcher": "4.9.2" + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.searcher": "4.9.3" } }, "com.unity.test-framework": { - "version": "1.4.5", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.2.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.8.7", + "version": "1.8.9", "depth": 0, "source": "registry", "dependencies": { @@ -264,13 +266,13 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.4.0", + "version": "2.6.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.12", + "com.unity.burst": "1.8.24", "com.unity.collections": "2.2.1", - "com.unity.mathematics": "1.3.1" + "com.unity.mathematics": "1.3.2" }, "url": "https://packages.unity.com" }, @@ -431,7 +433,8 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Dots101/Netcode101/ProjectSettings/EditorBuildSettings.asset b/Dots101/Netcode101/ProjectSettings/EditorBuildSettings.asset index 9b331c713..9a31ab83a 100644 --- a/Dots101/Netcode101/ProjectSettings/EditorBuildSettings.asset +++ b/Dots101/Netcode101/ProjectSettings/EditorBuildSettings.asset @@ -9,7 +9,7 @@ EditorBuildSettings: path: Assets/Scenes/SampleScene.unity guid: 99c9720ab356a0642a771bea13969a05 m_configObjects: - com.unity.input.settings: {fileID: 11400000, guid: 7092c6f50272baf4f8b859eeac4f7111, + com.unity.input.settings: {fileID: 11400000, guid: 662b53235f130c74fb6d0e8e497761a0, type: 2} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 9d74987b1c7d68547a933bc70c7076ac, type: 3} diff --git a/Dots101/Netcode101/ProjectSettings/NetCodeClientAndServerSettings.asset b/Dots101/Netcode101/ProjectSettings/NetCodeClientAndServerSettings.asset index 1ecf928b7..c090ee58e 100644 --- a/Dots101/Netcode101/ProjectSettings/NetCodeClientAndServerSettings.asset +++ b/Dots101/Netcode101/ProjectSettings/NetCodeClientAndServerSettings.asset @@ -16,3 +16,26 @@ MonoBehaviour: ExcludedBakingSystemAssemblies: [] AdditionalScriptingDefines: [] GlobalNetCodeConfig: {fileID: 0} + CurrentImportanceSuggestions: + - MinValue: 1 + MaxValue: 4 + Name: Low Importance + Tooltip: For cosmetic (i.e. visual-only) ghosts like glass bottles, signs, beach-balls, + and cones etc. Typically Static. + - MinValue: 5 + MaxValue: 40 + Name: Medium Importance + Tooltip: For common gameplay-affecting ghosts like trees, doors, explosive barrels, + dropped loot etc. Typically Static. + - MinValue: 50 + MaxValue: 250 + Name: High Importance + Tooltip: For per-player and objective-critical ghosts like Player Character Controllers + and CTF flags etc. Typically for Dynamic i.e. Predicted ghosts. + UsePreSerialization is likely a good fit. + - MinValue: 1000 + MaxValue: 0 + Name: Critical Importance + Tooltip: For gameplay critical singletons like the one keeping the current score, + or the one denoting whether or not the current round has started etc. Choose + UsePreSerialization, and use sparingly. diff --git a/Dots101/Netcode101/ProjectSettings/ProjectSettings.asset b/Dots101/Netcode101/ProjectSettings/ProjectSettings.asset index 39379c4cf..d850863c5 100644 --- a/Dots101/Netcode101/ProjectSettings/ProjectSettings.asset +++ b/Dots101/Netcode101/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 @@ -86,6 +87,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -132,6 +134,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -275,6 +278,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -529,6 +535,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 0200000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -544,6 +553,7 @@ PlayerSettings: - serializedVersion: 2 m_BuildTarget: Android m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: @@ -812,12 +822,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -943,3 +953,5 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} diff --git a/Dots101/Netcode101/ProjectSettings/ProjectVersion.txt b/Dots101/Netcode101/ProjectSettings/ProjectVersion.txt index 2f43e325f..1ddb36df4 100644 --- a/Dots101/Netcode101/ProjectSettings/ProjectVersion.txt +++ b/Dots101/Netcode101/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.30f1 -m_EditorVersionWithRevision: 6000.0.30f1 (62b05ba0686a) +m_EditorVersion: 6000.2.10f1 +m_EditorVersionWithRevision: 6000.2.10f1 (d3d30d158480) diff --git a/Dots101/Netcode101/ProjectSettings/ShaderGraphSettings.asset b/Dots101/Netcode101/ProjectSettings/ShaderGraphSettings.asset index e66042a7c..ce8c24328 100644 --- a/Dots101/Netcode101/ProjectSettings/ShaderGraphSettings.asset +++ b/Dots101/Netcode101/ProjectSettings/ShaderGraphSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0} diff --git a/Dots101/Netcode101/ProjectSettings/URPProjectSettings.asset b/Dots101/Netcode101/ProjectSettings/URPProjectSettings.asset index 08faf0336..64a8674a2 100644 --- a/Dots101/Netcode101/ProjectSettings/URPProjectSettings.asset +++ b/Dots101/Netcode101/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 10 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Character/Wizard.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Character/Wizard.mat index cdff0cb35..042690dbe 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Character/Wizard.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Character/Wizard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Bridge.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Bridge.mat index ee2b1dc78..a0610cb9d 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Bridge.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Bridge.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Ground.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Ground.mat index fef96ac7c..bde3a6c56 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Ground.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Ground.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Log.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Log.mat index e47c684be..10b225ccd 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Log.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Log.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/River.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/River.mat index 6615a6eb4..e4157931e 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/River.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/River.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Tree.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Tree.mat index 3331682d0..8a102b4a8 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Tree.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Environment/Tree.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Cauldron.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Cauldron.mat index be760d3db..d6c7e9544 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Cauldron.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Cauldron.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Energy.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Energy.mat index b30e39ee3..4be678045 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Energy.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Energy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -127,6 +127,7 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7490196, g: 0.23921569, b: 0.1882353, a: 1} diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/MoonlitRoot.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/MoonlitRoot.mat index c62545057..6ac69ae19 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/MoonlitRoot.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/MoonlitRoot.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -127,6 +127,7 @@ Material: - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8290612, g: 0.8918665, b: 0.98742133, a: 1} diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Mushroom.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Mushroom.mat index 553441fd1..8a7239157 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Mushroom.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/Mushroom.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/RedFlower.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/RedFlower.mat index 70e9bc09d..e1e66bf17 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/RedFlower.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Items/RedFlower.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Fire.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Fire.mat index 13742a158..8ef6fb72a 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Fire.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Fire.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Smoke.mat b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Smoke.mat index 3522a1519..d66581828 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Smoke.mat +++ b/Dots101/OtherSamples/DotsUI/Assets/Art/Materials/Particles/Smoke.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Scenes/Main.unity b/Dots101/OtherSamples/DotsUI/Assets/Scenes/Main.unity index 97af37c2b..529f77b2b 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Scenes/Main.unity +++ b/Dots101/OtherSamples/DotsUI/Assets/Scenes/Main.unity @@ -248,7 +248,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 1 m_FrameInfluence: 0.1 @@ -256,6 +255,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -366,17 +366,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 3 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -459,9 +465,13 @@ MonoBehaviour: m_ParentUI: {fileID: 0} sourceAsset: {fileID: 9197481963319205126, guid: 3f08b28d25cd90043a294f905bb0ec49, type: 3} m_SortingOrder: 0 + m_Position: 0 m_WorldSpaceSizeMode: 1 m_WorldSpaceWidth: 1920 m_WorldSpaceHeight: 1080 + m_PivotReferenceSize: 0 + m_Pivot: 0 + m_WorldSpaceCollider: {fileID: 0} --- !u!4 &921170703 Transform: m_ObjectHideFlags: 0 @@ -584,6 +594,8 @@ ParticleSystemRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -605,6 +617,7 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -5404,6 +5417,8 @@ ParticleSystemRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5425,6 +5440,7 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -10192,7 +10208,7 @@ Transform: m_GameObject: {fileID: 1814015589} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 11.58, y: -0.185, z: -1.06} + m_LocalPosition: {x: 11.58, y: -2.185, z: -1.0599997} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10211,17 +10227,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!108 &1814015594 Light: m_ObjectHideFlags: 0 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Scenes/MainSubscene/MainSubscene.unity b/Dots101/OtherSamples/DotsUI/Assets/Scenes/MainSubscene/MainSubscene.unity index c15bd45c8..5c685d62d 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Scenes/MainSubscene/MainSubscene.unity +++ b/Dots101/OtherSamples/DotsUI/Assets/Scenes/MainSubscene/MainSubscene.unity @@ -310,11 +310,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: -0.025 + value: -2.025 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z - value: 1.9247298 + value: 1.9247301 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalRotation.w @@ -1221,11 +1221,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: 0.27 + value: -1.73 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z - value: 5.7786946 + value: 5.778695 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalRotation.w @@ -2338,7 +2338,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: -0.3 + value: -2.3 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -2485,7 +2485,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: -0.165 + value: -2.165 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -2765,7 +2765,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.33 + value: -1.67 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -2896,7 +2896,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.y - value: -0.71 + value: -2.71 objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.z @@ -3733,7 +3733,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.27348495 + value: -1.726515 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -4249,7 +4249,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: 0.059000015 + value: -1.941 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -4466,7 +4466,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: -0.044 + value: -2.0440001 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -4605,7 +4605,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -4814,7 +4814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.y - value: -0.71 + value: -2.71 objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.z @@ -5121,7 +5121,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.32 + value: -1.6800001 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -5646,7 +5646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 2.8400998 + value: 0.8400998 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -5937,7 +5937,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -5998,7 +5998,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: 0.059000015 + value: -1.941 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -6246,6 +6246,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6267,6 +6269,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -6543,7 +6546,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.32739294 + value: -1.6726071 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -7060,7 +7063,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -7744,7 +7747,7 @@ Transform: m_GameObject: {fileID: 1142012738} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -2, z: 0.00000023841858} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -7940,7 +7943,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: -0.26 + value: -2.26 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -9303,7 +9306,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: 0.059000015 + value: -1.941 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -9595,7 +9598,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.y - value: -0.71 + value: -2.71 objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.z @@ -10519,7 +10522,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.201 + value: -1.799 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -11293,7 +11296,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.33 + value: -1.67 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -11749,7 +11752,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.y - value: -0.8 + value: -2.8 objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.z @@ -11830,11 +11833,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: 0.346 + value: -1.654 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z - value: 1.77 + value: 1.7700002 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalRotation.w @@ -12128,7 +12131,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.33 + value: -1.67 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -12801,7 +12804,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.32 + value: -1.6800001 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -13244,7 +13247,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.201 + value: -1.799 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -13383,7 +13386,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -13916,11 +13919,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: -0.06 + value: -2.06 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z - value: 7.4 + value: 7.4000006 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalRotation.w @@ -14437,7 +14440,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -14724,7 +14727,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: 0.059000015 + value: -1.941 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -14818,10 +14821,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 660034197792056323} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 1 - m_Drag: 0 - m_AngularDrag: Infinity + m_LinearDamping: 0 + m_AngularDamping: Infinity m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -14847,7 +14850,7 @@ Transform: m_GameObject: {fileID: 919132148137130213} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 11.58, y: -0.074, z: -1.1} + m_LocalPosition: {x: 11.58, y: -2.074, z: -1.0999998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -15033,6 +15036,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15054,6 +15059,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -15078,6 +15084,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15099,6 +15107,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -15117,7 +15126,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.y - value: -0.582 + value: -2.582 objectReference: {fileID: 0} - target: {fileID: 76853609021779417, guid: e0aafd4ee3ebdf8449185ee6c6afaad2, type: 3} propertyPath: m_LocalPosition.z @@ -15190,7 +15199,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.y - value: 0.33 + value: -1.67 objectReference: {fileID: 0} - target: {fileID: 7974731493120863193, guid: 5bc422faffb299f4aa4d5b649b2cfd61, type: 3} propertyPath: m_LocalPosition.z @@ -15247,7 +15256,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.y - value: -0.084 + value: -2.084 objectReference: {fileID: 0} - target: {fileID: 8483762044993867343, guid: 7fd2847d9f71788429b2c6b845b8ddb8, type: 3} propertyPath: m_LocalPosition.z @@ -15361,7 +15370,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 8579653755683609355, guid: 4b04bfd9deb681d4db527d38dcebdd64, type: 3} propertyPath: m_LocalPosition.z @@ -15420,6 +15429,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15441,6 +15452,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/Components/GameDataAuthoring.cs b/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/Components/GameDataAuthoring.cs index 5cbe3f400..2962fc12c 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/Components/GameDataAuthoring.cs +++ b/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/Components/GameDataAuthoring.cs @@ -10,7 +10,7 @@ public class GameDataAuthoring : MonoBehaviour public QuestData quest; public CollectablesData collectables; - private class Baker : Baker + class Baker : Baker { public override void Bake(GameDataAuthoring authoring) { @@ -19,10 +19,10 @@ public override void Bake(GameDataAuthoring authoring) // to avoid mutating the original scriptable objects, we make copies AddComponent(entity, new GameData { - StartDialogue = ScriptableObject.Instantiate(authoring.startDialogue), - EndDialogue = ScriptableObject.Instantiate(authoring.endDialogue), - Quest = ScriptableObject.Instantiate(authoring.quest), - Collectables = ScriptableObject.Instantiate(authoring.collectables), + StartDialogue = Instantiate(authoring.startDialogue), + EndDialogue = Instantiate(authoring.endDialogue), + Quest = Instantiate(authoring.quest), + Collectables = Instantiate(authoring.collectables), State = GameState.Init, InterfaceState = InterfaceState.Questing, }); diff --git a/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/GameManagerSystem.cs b/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/GameManagerSystem.cs index 61ed52d31..cb7f26cf5 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/GameManagerSystem.cs +++ b/Dots101/OtherSamples/DotsUI/Assets/Scripts/Gameplay/GameManagerSystem.cs @@ -23,7 +23,7 @@ public void OnUpdate(ref SystemState state) { GameInput.Initialize(); - var doc = GameObject.FindFirstObjectByType(); + var doc = Object.FindFirstObjectByType(); VisualElement root = doc.rootVisualElement; game.ValueRW.State = GameState.SplashScreen; @@ -37,7 +37,7 @@ public void OnUpdate(ref SystemState state) InventoryScreen = InventoryScreen.Instantiate(root.Q("inventory__container")), DialogueScreen = DialogueScreen.Instantiate(root.Q("dialogue__container")), HintScreen = HintScreen.Instantiate(root.Q("hud__action-helper")), - Camera = GameObject.FindFirstObjectByType(), + Camera = Object.FindFirstObjectByType(), }; screens.SplashScreen.Value.Show(); diff --git a/Dots101/OtherSamples/DotsUI/Assets/Scripts/UI/DialogueScreen.cs b/Dots101/OtherSamples/DotsUI/Assets/Scripts/UI/DialogueScreen.cs index b5342ea94..5603cd726 100644 --- a/Dots101/OtherSamples/DotsUI/Assets/Scripts/UI/DialogueScreen.cs +++ b/Dots101/OtherSamples/DotsUI/Assets/Scripts/UI/DialogueScreen.cs @@ -6,12 +6,12 @@ namespace Unity.DotsUISample // displays Wizardo's dialogue public class DialogueScreen : UIScreen { - private Label dialogueLabel; - private Button acceptButton; - private Button closeButton; + Label m_DialogueLabel; + Button m_AcceptButton; + Button m_CloseButton; - private DialogueData dialogue; - private int dialogueLineIdx; + DialogueData m_Dialogue; + int m_DialogueLineIdx; public bool isDone { @@ -24,12 +24,12 @@ public static DialogueScreen Instantiate(VisualElement parentElement) var screen = ScriptableObject.CreateInstance(); screen.RootElement = parentElement; - screen.dialogueLabel = screen.RootElement.Q