diff --git a/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Android-Demo.unity b/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Android-Demo.unity index 965b66b..6a1e822 100644 --- a/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Android-Demo.unity +++ b/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Android-Demo.unity @@ -1,19 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + 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: 7 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: 48646e618662d7a4da8decdfe3bc6274, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -41,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -53,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 4 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 1 m_TextureWidth: 1024 @@ -66,39 +67,61 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 0 - m_DirectLightInLightProbes: 1 m_FinalGather: 0 m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_RuntimeCPUUsage: 25 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666666 manualCellSize: 0 + cellSize: 0.16666666 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &35690949 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 35690951} - - 114: {fileID: 35690950} + - component: {fileID: 35690951} + - component: {fileID: 35690950} m_Layer: 0 m_Name: QuitOnEscape m_TagString: Untagged @@ -126,20 +149,20 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5675555, y: -0.08848229, z: -2.038508} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &40750486 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 40750487} - - 33: {fileID: 40750489} - - 23: {fileID: 40750488} + - component: {fileID: 40750487} + - component: {fileID: 40750489} + - component: {fileID: 40750488} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -156,10 +179,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.3877868, z: -0, w: 0.9217491} m_LocalPosition: {x: -5.9964952, y: 2.777, z: -5.7669067} m_LocalScale: {x: 2, y: 5.454432, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} --- !u!23 &40750488 MeshRenderer: m_ObjectHideFlags: 0 @@ -169,12 +192,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -182,12 +208,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &40750489 MeshFilter: @@ -201,12 +229,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 73422368} - - 33: {fileID: 73422371} - - 135: {fileID: 73422370} - - 23: {fileID: 73422369} + - component: {fileID: 73422368} + - component: {fileID: 73422371} + - component: {fileID: 73422370} + - component: {fileID: 73422369} m_Layer: 0 m_Name: sun m_TagString: Untagged @@ -223,12 +251,11 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 80.376, z: 0} m_LocalScale: {x: 9.727282, y: 9.727276, z: 9.727276} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2039723749} - - {fileID: 640144953} m_Father: {fileID: 1240259092} m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &73422369 MeshRenderer: m_ObjectHideFlags: 0 @@ -238,12 +265,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 1be7eb640bbc552438766068864f6b66, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -251,12 +281,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!135 &73422370 SphereCollider: @@ -282,11 +314,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 149056952} - - 33: {fileID: 149056954} - - 23: {fileID: 149056953} + - component: {fileID: 149056952} + - component: {fileID: 149056954} + - component: {fileID: 149056953} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -303,10 +335,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.3877868, z: -0, w: 0.9217491} m_LocalPosition: {x: 6.0164957, y: 0.955, z: 6.5148067} m_LocalScale: {x: 2, y: 1.8097968, z: 2} - m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} --- !u!23 &149056953 MeshRenderer: m_ObjectHideFlags: 0 @@ -316,12 +348,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -329,12 +364,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &149056954 MeshFilter: @@ -348,11 +385,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 207243952} - - 33: {fileID: 207243954} - - 23: {fileID: 207243953} + - component: {fileID: 207243952} + - component: {fileID: 207243954} + - component: {fileID: 207243953} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -369,10 +406,10 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.50481904, y: 3.05, z: -8.201789} m_LocalScale: {x: 2, y: 6, z: 2} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &207243953 MeshRenderer: m_ObjectHideFlags: 0 @@ -382,12 +419,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -395,12 +435,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &207243954 MeshFilter: @@ -409,1845 +451,16 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 207243951} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &640144952 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 640144953} - - 198: {fileID: 640144955} - - 199: {fileID: 640144954} - m_Layer: 0 - m_Name: particle system - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &640144953 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 640144952} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 73422368} - m_RootOrder: 1 ---- !u!199 &640144954 -ParticleSystemRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 640144952} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_RenderMode: 0 - m_SortMode: 0 - m_MinParticleSize: 0 - m_MaxParticleSize: 0.5 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 2 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_RenderAlignment: 0 - m_Pivot: {x: 0, y: 0, z: 0} - m_Mesh: {fileID: 0} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} ---- !u!198 &640144955 -ParticleSystem: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 640144952} - serializedVersion: 4 - lengthInSec: 5 - startDelay: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - speed: 1 - looping: 1 - prewarm: 1 - playOnAwake: 1 - moveWithTransform: 0 - autoRandomSeed: 1 - scalingMode: 1 - randomSeed: 1444735993 - InitialModule: - serializedVersion: 2 - enabled: 1 - startLifetime: - scalar: 0.2 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startSpeed: - scalar: 8 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startColor: - serializedVersion: 2 - maxGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} - minMaxState: 0 - startSize: - scalar: 1.98 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startSizeY: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startSizeZ: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startRotationX: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startRotationY: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - startRotation: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - randomizeRotationDirection: 0 - gravityModifier: NaN - maxNumParticles: 1000 - size3D: 0 - rotation3D: 0 - ShapeModule: - serializedVersion: 2 - enabled: 1 - type: 14 - radius: 0.01 - angle: 84.02 - length: 5 - boxX: 1 - boxY: 1 - boxZ: 1 - arc: NaN - placementMode: 0 - m_Mesh: {fileID: 0} - m_MeshRenderer: {fileID: 0} - m_SkinnedMeshRenderer: {fileID: 0} - m_MeshMaterialIndex: 0 - m_MeshNormalOffset: 0 - m_UseMeshMaterialIndex: 0 - m_UseMeshColors: 1 - randomDirection: 0 - EmissionModule: - enabled: 1 - serializedVersion: 2 - m_Type: 0 - rate: - scalar: 10 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - cnt0: 30 - cnt1: 30 - cnt2: 30 - cnt3: 30 - cntmax0: 30 - cntmax1: 30 - cntmax2: 30 - cntmax3: 30 - time0: 0 - time1: 0 - time2: 0 - time3: 0 - m_BurstCount: 0 - SizeModule: - enabled: 1 - curve: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - y: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - z: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - separateAxes: 0 - RotationModule: - enabled: 0 - x: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - y: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - curve: - scalar: 0.7853982 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - separateAxes: 0 - ColorModule: - enabled: 0 - gradient: - serializedVersion: 2 - maxGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} - minMaxState: 1 - UVModule: - enabled: 0 - frameOverTime: - scalar: 0.9999 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - startFrame: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - tilesX: 1 - tilesY: 1 - animationType: 0 - rowIndex: 0 - cycles: 1 - uvChannelMask: -1 - randomRow: 1 - VelocityModule: - enabled: 0 - x: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - y: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - z: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - inWorldSpace: 0 - InheritVelocityModule: - enabled: 0 - m_Mode: 0 - m_Curve: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - ForceModule: - enabled: 0 - x: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - y: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - z: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - inWorldSpace: 0 - randomizePerFrame: 0 - ExternalForcesModule: - enabled: 0 - multiplier: 1 - ClampVelocityModule: - enabled: 0 - x: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - y: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - z: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - magnitude: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - separateAxis: 0 - inWorldSpace: 0 - dampen: 1 - SizeBySpeedModule: - enabled: 0 - curve: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - y: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - z: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 1 - range: {x: 0, y: 1} - separateAxes: 0 - RotationBySpeedModule: - enabled: 0 - x: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - y: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - curve: - scalar: 0.7853982 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - separateAxes: 0 - range: {x: 0, y: 1} - ColorBySpeedModule: - enabled: 0 - gradient: - serializedVersion: 2 - maxGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} - minMaxState: 1 - range: {x: 0, y: 1} - CollisionModule: - enabled: 0 - serializedVersion: 3 - type: 0 - collisionMode: 0 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} - m_Dampen: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - m_Bounce: - scalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - m_EnergyLossOnCollision: - scalar: 0 - maxCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 - minKillSpeed: 0 - maxKillSpeed: 10000 - radiusScale: 1 - collidesWith: - serializedVersion: 2 - m_Bits: 4294967295 - maxCollisionShapes: 256 - quality: 0 - voxelSize: 0.5 - collisionMessages: 0 - collidesWithDynamic: 1 - interiorCollisions: 0 - TriggerModule: - enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} - inside: 1 - outside: 0 - enter: 0 - exit: 0 - radiusScale: 1 - SubModule: - enabled: 0 - subEmitterBirth: {fileID: 0} - subEmitterBirth1: {fileID: 0} - subEmitterCollision: {fileID: 0} - subEmitterCollision1: {fileID: 0} - subEmitterDeath: {fileID: 0} - subEmitterDeath1: {fileID: 0} --- !u!1 &721978562 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 721978563} - - 33: {fileID: 721978565} - - 23: {fileID: 721978564} + - component: {fileID: 721978563} + - component: {fileID: 721978565} + - component: {fileID: 721978564} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -2264,10 +477,10 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.4848179, y: 1.532, z: 8.949689} m_LocalScale: {x: 2, y: 2.9627726, z: 2.000002} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &721978564 MeshRenderer: m_ObjectHideFlags: 0 @@ -2277,12 +490,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2290,12 +506,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &721978565 MeshFilter: @@ -2309,12 +527,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 737355971} - - 33: {fileID: 737355974} - - 135: {fileID: 737355973} - - 23: {fileID: 737355972} + - component: {fileID: 737355971} + - component: {fileID: 737355974} + - component: {fileID: 737355973} + - component: {fileID: 737355972} m_Layer: 0 m_Name: moon m_TagString: Untagged @@ -2331,10 +549,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 70.732, z: 0} m_LocalScale: {x: 7.510821, y: 7.510817, z: 7.510817} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &737355972 MeshRenderer: m_ObjectHideFlags: 0 @@ -2344,12 +562,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 84759e1ab6862004baa1620fcdf97ae1, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2357,12 +578,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!135 &737355973 SphereCollider: @@ -2388,11 +611,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100020, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 863878547} - - 33: {fileID: 863878549} - - 23: {fileID: 863878548} + - component: {fileID: 863878547} + - component: {fileID: 863878549} + - component: {fileID: 863878548} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -2409,10 +632,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.06901227, z: 0} m_LocalScale: {x: 218.14139, y: 3.1542416, z: 218.14139} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &863878548 MeshRenderer: m_ObjectHideFlags: 0 @@ -2423,12 +646,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b129a766c919aa4487b71dce37531d8, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2436,12 +662,14 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &863878549 MeshFilter: @@ -2456,11 +684,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1034111693} - - 33: {fileID: 1034111695} - - 23: {fileID: 1034111694} + - component: {fileID: 1034111693} + - component: {fileID: 1034111695} + - component: {fileID: 1034111694} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -2477,10 +705,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.92598146, z: -0, w: 0.3775691} m_LocalPosition: {x: -6.466659, y: 1.902, z: 6.0167375} m_LocalScale: {x: 2.000001, y: 3.7039647, z: 2.000002} - m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} --- !u!23 &1034111694 MeshRenderer: m_ObjectHideFlags: 0 @@ -2490,12 +718,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2503,12 +734,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1034111695 MeshFilter: @@ -2562,7 +795,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2} propertyPath: autoStartServer - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2} @@ -2619,11 +852,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1206254921} - - 33: {fileID: 1206254923} - - 23: {fileID: 1206254922} + - component: {fileID: 1206254921} + - component: {fileID: 1206254923} + - component: {fileID: 1206254922} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -2640,10 +873,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.58, y: 2.336, z: 0.37395} m_LocalScale: {x: 2, y: 4.5728035, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1206254922 MeshRenderer: m_ObjectHideFlags: 0 @@ -2653,12 +886,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2666,12 +902,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1206254923 MeshFilter: @@ -2685,9 +923,9 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100022, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1240259092} + - component: {fileID: 1240259092} m_Layer: 0 m_Name: environment m_TagString: Untagged @@ -2704,7 +942,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1550958551} - {fileID: 1206254921} @@ -2721,16 +958,17 @@ Transform: - {fileID: 73422368} m_Father: {fileID: 0} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1374387673 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100016, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1374387674} - - 33: {fileID: 1374387676} - - 23: {fileID: 1374387675} + - component: {fileID: 1374387674} + - component: {fileID: 1374387676} + - component: {fileID: 1374387675} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -2747,10 +985,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: -0.24301311, z: 0} m_LocalScale: {x: 4.938097, y: 4.9380946, z: 4.9380946} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1374387675 MeshRenderer: m_ObjectHideFlags: 0 @@ -2761,12 +999,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b129a766c919aa4487b71dce37531d8, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2774,12 +1015,14 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1374387676 MeshFilter: @@ -2794,11 +1037,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100018, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1463622032} - - 33: {fileID: 1463622034} - - 23: {fileID: 1463622033} + - component: {fileID: 1463622032} + - component: {fileID: 1463622034} + - component: {fileID: 1463622033} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -2815,10 +1058,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0070893243, z: 0} m_LocalScale: {x: 1.477957, y: 1.477957, z: 1.477957} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1463622033 MeshRenderer: m_ObjectHideFlags: 0 @@ -2829,12 +1072,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b129a766c919aa4487b71dce37531d8, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2842,12 +1088,14 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1463622034 MeshFilter: @@ -2862,11 +1110,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1550958551} - - 33: {fileID: 1550958553} - - 23: {fileID: 1550958552} + - component: {fileID: 1550958551} + - component: {fileID: 1550958553} + - component: {fileID: 1550958552} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -2883,10 +1131,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8.6, y: 0.595, z: 0.37395} m_LocalScale: {x: 2, y: 1.0907731, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1550958552 MeshRenderer: m_ObjectHideFlags: 0 @@ -2896,12 +1144,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2909,12 +1160,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1550958553 MeshFilter: @@ -2928,11 +1181,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1668082207} - - 33: {fileID: 1668082209} - - 23: {fileID: 1668082208} + - component: {fileID: 1668082207} + - component: {fileID: 1668082209} + - component: {fileID: 1668082208} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -2949,10 +1202,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.92598146, z: -0, w: 0.3775691} m_LocalPosition: {x: 6.486658, y: 0.204, z: -5.268836} m_LocalScale: {x: 2.000001, y: 0.30846643, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} m_Children: [] m_Father: {fileID: 1240259092} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} --- !u!23 &1668082208 MeshRenderer: m_ObjectHideFlags: 0 @@ -2962,12 +1215,15 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -2975,12 +1231,14 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1668082209 MeshFilter: @@ -2994,10 +1252,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 2039723749} - - 108: {fileID: 2039723750} + - component: {fileID: 2039723749} + - component: {fileID: 2039723750} m_Layer: 0 m_Name: pointlight m_TagString: Untagged @@ -3014,10 +1272,10 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_Children: [] m_Father: {fileID: 73422368} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!108 &2039723750 Light: m_ObjectHideFlags: 0 @@ -3025,7 +1283,7 @@ Light: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2039723748} m_Enabled: 1 - serializedVersion: 7 + serializedVersion: 8 m_Type: 1 m_Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} m_Intensity: 1 @@ -3050,5 +1308,7 @@ Light: m_Lightmapping: 1 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 diff --git a/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Demo.unity b/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Demo.unity index 216bf06..f2b5ac3 100644 --- a/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Demo.unity +++ b/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVR-UnityVR-Demo.unity @@ -1,19 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + 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: 7 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: 48646e618662d7a4da8decdfe3bc6274, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -41,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -53,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 4 + serializedVersion: 8 m_Resolution: 1 m_BakeResolution: 1 m_TextureWidth: 1024 @@ -66,40 +67,57 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 0 - m_DirectLightInLightProbes: 1 m_FinalGather: 0 m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFiltering: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_RuntimeCPUUsage: 25 + m_ShadowMaskMode: 2 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666666 manualCellSize: 0 + cellSize: 0.16666666 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &97775140 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 97775141} - - 33: {fileID: 97775144} - - 23: {fileID: 97775142} + - component: {fileID: 97775141} + - component: {fileID: 97775144} + - component: {fileID: 97775142} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -116,10 +134,10 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.50481904, y: 3.05, z: -8.201789} m_LocalScale: {x: 2, y: 6, z: 2} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &97775142 MeshRenderer: m_ObjectHideFlags: 0 @@ -134,7 +152,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -142,12 +162,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &97775144 MeshFilter: @@ -161,11 +182,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100020, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 276435861} - - 33: {fileID: 276435863} - - 23: {fileID: 276435862} + - component: {fileID: 276435861} + - component: {fileID: 276435863} + - component: {fileID: 276435862} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -182,10 +203,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.06901227, z: 0} m_LocalScale: {x: 218.14139, y: 3.1542416, z: 218.14139} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &276435862 MeshRenderer: m_ObjectHideFlags: 0 @@ -201,7 +222,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b129a766c919aa4487b71dce37531d8, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -209,12 +232,13 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &276435863 MeshFilter: @@ -229,10 +253,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 298178201} - - 108: {fileID: 298178200} + - component: {fileID: 298178201} + - component: {fileID: 298178200} m_Layer: 0 m_Name: pointlight m_TagString: Untagged @@ -247,7 +271,7 @@ Light: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 298178199} m_Enabled: 1 - serializedVersion: 7 + serializedVersion: 8 m_Type: 1 m_Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} m_Intensity: 1 @@ -272,6 +296,8 @@ Light: m_Lightmapping: 1 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &298178201 @@ -283,20 +309,20 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_Children: [] m_Father: {fileID: 805800313} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &361992479 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 361992480} - - 33: {fileID: 361992483} - - 23: {fileID: 361992481} + - component: {fileID: 361992480} + - component: {fileID: 361992483} + - component: {fileID: 361992481} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -313,10 +339,10 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.4848179, y: 1.532, z: 8.949689} m_LocalScale: {x: 2, y: 2.9627726, z: 2.000002} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &361992481 MeshRenderer: m_ObjectHideFlags: 0 @@ -331,7 +357,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -339,12 +367,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &361992483 MeshFilter: @@ -358,10 +387,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 432816919} - - 114: {fileID: 432816918} + - component: {fileID: 432816919} + - component: {fileID: 432816918} m_Layer: 0 m_Name: QuitOnEscape m_TagString: Untagged @@ -389,20 +418,20 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5675555, y: -0.08848229, z: -2.038508} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &681714040 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 681714041} - - 33: {fileID: 681714044} - - 23: {fileID: 681714042} + - component: {fileID: 681714041} + - component: {fileID: 681714044} + - component: {fileID: 681714042} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -419,10 +448,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.3877868, z: -0, w: 0.9217491} m_LocalPosition: {x: 6.0164957, y: 0.955, z: 6.5148067} m_LocalScale: {x: 2, y: 1.8097968, z: 2} - m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} --- !u!23 &681714042 MeshRenderer: m_ObjectHideFlags: 0 @@ -437,7 +466,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -445,12 +476,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &681714044 MeshFilter: @@ -509,6 +541,52 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &768058370 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4234171006776236, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1194294178642958, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d5378b36bf661cc41ba14eeed487417e, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &800756649 Prefab: m_ObjectHideFlags: 0 @@ -548,6 +626,10 @@ Prefab: propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 1907447898282924, guid: 8e57e3c8e2a715f4d970247716df86c7, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8e57e3c8e2a715f4d970247716df86c7, type: 2} m_IsPrefabParent: 0 @@ -556,12 +638,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 805800313} - - 33: {fileID: 805800312} - - 135: {fileID: 805800311} - - 23: {fileID: 805800310} + - component: {fileID: 805800313} + - component: {fileID: 805800312} + - component: {fileID: 805800311} + - component: {fileID: 805800310} m_Layer: 0 m_Name: sun m_TagString: Untagged @@ -583,7 +665,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 1be7eb640bbc552438766068864f6b66, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -591,12 +675,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!135 &805800311 SphereCollider: @@ -626,22 +711,22 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 80.376, z: 0} m_LocalScale: {x: 9.727282, y: 9.727276, z: 9.727276} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 298178201} - {fileID: 1706894959} m_Father: {fileID: 1474803928} m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1024092978 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100018, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1024092979} - - 33: {fileID: 1024092981} - - 23: {fileID: 1024092980} + - component: {fileID: 1024092979} + - component: {fileID: 1024092981} + - component: {fileID: 1024092980} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -658,10 +743,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0070893243, z: 0} m_LocalScale: {x: 1.477957, y: 1.477957, z: 1.477957} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1024092980 MeshRenderer: m_ObjectHideFlags: 0 @@ -677,7 +762,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b129a766c919aa4487b71dce37531d8, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -685,12 +772,13 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1024092981 MeshFilter: @@ -705,11 +793,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1053001829} - - 33: {fileID: 1053001832} - - 23: {fileID: 1053001830} + - component: {fileID: 1053001829} + - component: {fileID: 1053001832} + - component: {fileID: 1053001830} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -726,10 +814,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.58, y: 2.336, z: 0.37395} m_LocalScale: {x: 2, y: 4.5728035, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1053001830 MeshRenderer: m_ObjectHideFlags: 0 @@ -744,7 +832,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -752,12 +842,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1053001832 MeshFilter: @@ -771,11 +862,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100016, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1233944574} - - 33: {fileID: 1233944576} - - 23: {fileID: 1233944575} + - component: {fileID: 1233944574} + - component: {fileID: 1233944576} + - component: {fileID: 1233944575} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -792,10 +883,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: -0.24301311, z: 0} m_LocalScale: {x: 4.938097, y: 4.9380946, z: 4.9380946} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1233944575 MeshRenderer: m_ObjectHideFlags: 0 @@ -811,7 +902,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b129a766c919aa4487b71dce37531d8, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -819,12 +912,13 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1233944576 MeshFilter: @@ -839,11 +933,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1375509065} - - 33: {fileID: 1375509068} - - 23: {fileID: 1375509066} + - component: {fileID: 1375509065} + - component: {fileID: 1375509068} + - component: {fileID: 1375509066} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -860,10 +954,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8.6, y: 0.595, z: 0.37395} m_LocalScale: {x: 2, y: 1.0907731, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1375509066 MeshRenderer: m_ObjectHideFlags: 0 @@ -878,7 +972,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -886,12 +982,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1375509068 MeshFilter: @@ -905,9 +1002,9 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100022, guid: b505ecb46d46f8748abdafa5bec5eaaf, type: 3} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1474803928} + - component: {fileID: 1474803928} m_Layer: 0 m_Name: environment m_TagString: Untagged @@ -924,7 +1021,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1375509065} - {fileID: 1053001829} @@ -941,16 +1037,17 @@ Transform: - {fileID: 805800313} m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1579802414 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1579802415} - - 33: {fileID: 1579802418} - - 23: {fileID: 1579802416} + - component: {fileID: 1579802415} + - component: {fileID: 1579802418} + - component: {fileID: 1579802416} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -967,10 +1064,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.92598146, z: -0, w: 0.3775691} m_LocalPosition: {x: -6.466659, y: 1.902, z: 6.0167375} m_LocalScale: {x: 2.000001, y: 3.7039647, z: 2.000002} - m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} --- !u!23 &1579802416 MeshRenderer: m_ObjectHideFlags: 0 @@ -985,7 +1082,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -993,12 +1092,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1579802418 MeshFilter: @@ -1012,11 +1112,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1584297551} - - 33: {fileID: 1584297554} - - 23: {fileID: 1584297552} + - component: {fileID: 1584297551} + - component: {fileID: 1584297554} + - component: {fileID: 1584297552} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -1033,10 +1133,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.92598146, z: -0, w: 0.3775691} m_LocalPosition: {x: 6.486658, y: 0.204, z: -5.268836} m_LocalScale: {x: 2.000001, y: 0.30846643, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: -135.634, z: 0} --- !u!23 &1584297552 MeshRenderer: m_ObjectHideFlags: 0 @@ -1051,7 +1151,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -1059,12 +1161,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1584297554 MeshFilter: @@ -1078,11 +1181,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1589557434} - - 33: {fileID: 1589557437} - - 23: {fileID: 1589557435} + - component: {fileID: 1589557434} + - component: {fileID: 1589557437} + - component: {fileID: 1589557435} m_Layer: 0 m_Name: pillar m_TagString: Untagged @@ -1099,10 +1202,10 @@ Transform: m_LocalRotation: {x: -0, y: -0.3877868, z: -0, w: 0.9217491} m_LocalPosition: {x: -5.9964952, y: 2.777, z: -5.7669067} m_LocalScale: {x: 2, y: 5.454432, z: 2.000001} - m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -45.634003, z: 0} --- !u!23 &1589557435 MeshRenderer: m_ObjectHideFlags: 0 @@ -1117,7 +1220,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 926489ece7dc4c440977be56882d0bd0, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -1125,12 +1230,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1589557437 MeshFilter: @@ -1144,11 +1250,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1706894959} - - 198: {fileID: 1706894961} - - 199: {fileID: 1706894960} + - component: {fileID: 1706894959} + - component: {fileID: 1706894961} + - component: {fileID: 1706894960} m_Layer: 0 m_Name: particle system m_TagString: Untagged @@ -1165,12 +1271,13 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 805800313} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!199 &1706894960 ParticleSystemRenderer: + serializedVersion: 3 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -1184,7 +1291,9 @@ ParticleSystemRenderer: m_Materials: - {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -1192,12 +1301,13 @@ ParticleSystemRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 m_SortMode: 0 @@ -1210,6 +1320,8 @@ ParticleSystemRenderer: m_NormalDirection: 1 m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_VertexStreams: 0001030405 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -1220,65 +1332,53 @@ ParticleSystem: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1706894958} - serializedVersion: 4 + serializedVersion: 5 lengthInSec: 5 + simulationSpeed: 1 + looping: 1 + prewarm: 1 + playOnAwake: 1 + autoRandomSeed: 1 startDelay: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 minCurve: serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 - speed: 1 - looping: 1 - prewarm: 1 - playOnAwake: 1 - moveWithTransform: 0 - autoRandomSeed: 1 + moveWithTransform: 1 + moveWithCustomTransform: {fileID: 0} scalingMode: 1 randomSeed: 1444735993 InitialModule: - serializedVersion: 2 + serializedVersion: 3 enabled: 1 startLifetime: + serializedVersion: 2 + minMaxState: 0 scalar: 0.2 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1289,12 +1389,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1302,18 +1404,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startSpeed: + serializedVersion: 2 + minMaxState: 0 scalar: 8 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1324,12 +1430,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1337,34 +1445,21 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startColor: serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 ctime1: 65535 ctime2: 0 @@ -1381,33 +1476,19 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 ctime1: 65535 ctime2: 0 @@ -1424,22 +1505,25 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} - minMaxState: 0 startSize: + serializedVersion: 2 + minMaxState: 0 scalar: 1.98 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1450,12 +1534,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1463,18 +1549,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startSizeY: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1485,12 +1575,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1498,18 +1590,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startSizeZ: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1520,12 +1616,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1533,18 +1631,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startRotationX: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1555,12 +1657,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1568,18 +1672,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startRotationY: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1590,12 +1698,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1603,18 +1713,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 startRotation: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1625,12 +1739,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1638,47 +1754,181 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 randomizeRotationDirection: 0 - gravityModifier: NaN maxNumParticles: 1000 size3D: 0 rotation3D: 0 + gravityModifier: + serializedVersion: 2 + minMaxState: 0 + scalar: NaN + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 ShapeModule: - serializedVersion: 2 + serializedVersion: 4 enabled: 1 type: 14 - radius: 0.01 angle: 84.02 length: 5 boxX: 1 boxY: 1 boxZ: 1 - arc: NaN + radius: + value: 0.01 + mode: 0 + spread: 0 + speed: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + arc: + value: NaN + mode: 0 + spread: 0 + speed: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 placementMode: 0 m_Mesh: {fileID: 0} m_MeshRenderer: {fileID: 0} m_SkinnedMeshRenderer: {fileID: 0} m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 + m_MeshScale: 1 m_UseMeshMaterialIndex: 0 m_UseMeshColors: 1 - randomDirection: 0 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 EmissionModule: enabled: 1 - serializedVersion: 2 - m_Type: 0 - rate: + serializedVersion: 4 + rateOverTime: + serializedVersion: 2 + minMaxState: 0 scalar: 10 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1689,12 +1939,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1702,33 +1954,67 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + rateOverDistance: + serializedVersion: 2 minMaxState: 0 - cnt0: 30 - cnt1: 30 - cnt2: 30 - cnt3: 30 - cntmax0: 30 - cntmax1: 30 - cntmax2: 30 - cntmax3: 30 - time0: 0 - time1: 0 - time2: 0 - time3: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 m_BurstCount: 0 + m_Bursts: [] SizeModule: enabled: 1 curve: + serializedVersion: 2 + minMaxState: 1 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -1739,12 +2025,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1752,18 +2040,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 y: + serializedVersion: 2 + minMaxState: 1 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -1774,12 +2066,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1787,18 +2081,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 z: + serializedVersion: 2 + minMaxState: 1 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -1809,12 +2107,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1822,21 +2122,25 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 separateAxes: 0 RotationModule: enabled: 0 x: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1847,12 +2151,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1860,18 +2166,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 y: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1882,12 +2192,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1895,18 +2207,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 curve: + serializedVersion: 2 + minMaxState: 0 scalar: 0.7853982 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1917,12 +2233,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1930,37 +2248,24 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 separateAxes: 0 ColorModule: enabled: 0 gradient: serializedVersion: 2 + minMaxState: 1 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 ctime1: 65535 ctime2: 0 @@ -1977,33 +2282,19 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 ctime1: 65535 ctime2: 0 @@ -2020,24 +2311,27 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} - minMaxState: 1 UVModule: enabled: 0 frameOverTime: + serializedVersion: 2 + minMaxState: 1 scalar: 0.9999 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -2048,12 +2342,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2061,18 +2357,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 startFrame: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2083,12 +2383,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2096,27 +2398,33 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 tilesX: 1 tilesY: 1 animationType: 0 rowIndex: 0 cycles: 1 uvChannelMask: -1 + flipU: 0 + flipV: 0 randomRow: 1 VelocityModule: enabled: 0 x: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2127,12 +2435,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2140,18 +2450,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 y: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2162,12 +2476,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2175,18 +2491,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 z: - scalar: 0 + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2197,12 +2517,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2210,22 +2532,26 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 inWorldSpace: 0 InheritVelocityModule: enabled: 0 m_Mode: 0 m_Curve: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2236,12 +2562,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2249,20 +2577,24 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 ForceModule: enabled: 0 x: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2273,12 +2605,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2286,18 +2620,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 y: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2308,12 +2646,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2321,18 +2661,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 z: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2343,12 +2687,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2356,7 +2702,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: @@ -2365,16 +2710,21 @@ ParticleSystem: ClampVelocityModule: enabled: 0 x: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2385,12 +2735,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2398,18 +2750,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 y: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2420,12 +2776,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2433,18 +2791,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 z: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2455,12 +2817,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2468,18 +2832,22 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 magnitude: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2490,12 +2858,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2503,23 +2873,27 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 separateAxis: 0 inWorldSpace: 0 dampen: 1 - SizeBySpeedModule: + NoiseModule: enabled: 0 - curve: + strength: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -2530,31 +2904,37 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 - value: 1 + - serializedVersion: 2 + time: 0 + value: 0 inSlope: 0 - outSlope: 0 + outSlope: 0.5 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 - y: + strengthY: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -2565,31 +2945,37 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 - value: 1 + - serializedVersion: 2 + time: 0 + value: 0 inSlope: 0 - outSlope: 0 + outSlope: 0.5 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 - z: + strengthZ: + serializedVersion: 2 + minMaxState: 0 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -2600,107 +2986,213 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 - value: 1 + - serializedVersion: 2 + time: 0 + value: 0 inSlope: 0 - outSlope: 0 + outSlope: 0.5 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 1 - range: {x: 0, y: 1} separateAxes: 0 - RotationBySpeedModule: - enabled: 0 - x: + frequency: 0.5 + damping: 1 + octaves: 1 + octaveMultiplier: 0.5 + octaveScale: 2 + quality: 2 + scrollSpeed: + serializedVersion: 2 + minMaxState: 0 scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 outSlope: 0 tangentMode: 0 - - time: 1 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minCurve: + remap: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 0 + maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 outSlope: 0 tangentMode: 0 - - time: 1 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 - y: - scalar: 0 + remapY: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 outSlope: 0 tangentMode: 0 - - time: 1 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minCurve: + remapZ: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 0 + maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 outSlope: 0 tangentMode: 0 - - time: 1 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 + remapEnabled: 0 + SizeBySpeedModule: + enabled: 0 curve: - scalar: 0.7853982 + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 - value: 1 + - serializedVersion: 2 + time: 0 + value: 0 inSlope: 0 - outSlope: 0 + outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 - inSlope: 0 + inSlope: 1 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 @@ -2709,12 +3201,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2722,127 +3216,24 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 - separateAxes: 0 - range: {x: 0, y: 1} - ColorBySpeedModule: - enabled: 0 - gradient: + y: serializedVersion: 2 - maxGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minGradient: - key0: - serializedVersion: 2 - rgba: 4294967295 - key1: - serializedVersion: 2 - rgba: 4294967295 - key2: - serializedVersion: 2 - rgba: 0 - key3: - serializedVersion: 2 - rgba: 0 - key4: - serializedVersion: 2 - rgba: 0 - key5: - serializedVersion: 2 - rgba: 0 - key6: - serializedVersion: 2 - rgba: 0 - key7: - serializedVersion: 2 - rgba: 0 - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} minMaxState: 1 - range: {x: 0, y: 1} - CollisionModule: - enabled: 0 - serializedVersion: 3 - type: 0 - collisionMode: 0 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} - m_Dampen: - scalar: 0 + scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 - outSlope: 0 + outSlope: 1 tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 @@ -2851,33 +3242,39 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 - value: 0 + - serializedVersion: 2 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 0 + - serializedVersion: 2 + time: 1 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 - m_Bounce: + z: + serializedVersion: 2 + minMaxState: 1 scalar: 1 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 - value: 1 + - serializedVersion: 2 + time: 0 + value: 0 inSlope: 0 - outSlope: 0 + outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 - inSlope: 0 + inSlope: 1 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 @@ -2886,12 +3283,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -2899,18 +3298,26 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + range: {x: 0, y: 1} + separateAxes: 0 + RotationBySpeedModule: + enabled: 0 + x: + serializedVersion: 2 minMaxState: 0 - m_EnergyLossOnCollision: scalar: 0 + minScalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2921,12 +3328,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -2934,21 +3343,304 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - minMaxState: 0 - minKillSpeed: 0 - maxKillSpeed: 10000 - radiusScale: 1 - collidesWith: + y: serializedVersion: 2 - m_Bits: 4294967295 - maxCollisionShapes: 256 - quality: 0 - voxelSize: 0.5 - collisionMessages: 0 - collidesWithDynamic: 1 - interiorCollisions: 0 - TriggerModule: - enabled: 0 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curve: + serializedVersion: 2 + minMaxState: 0 + scalar: 0.7853982 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + separateAxes: 0 + range: {x: 0, y: 1} + ColorBySpeedModule: + enabled: 0 + gradient: + serializedVersion: 2 + minMaxState: 1 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + range: {x: 0, y: 1} + CollisionModule: + enabled: 0 + serializedVersion: 3 + type: 0 + collisionMode: 0 + plane0: {fileID: 0} + plane1: {fileID: 0} + plane2: {fileID: 0} + plane3: {fileID: 0} + plane4: {fileID: 0} + plane5: {fileID: 0} + m_Dampen: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Bounce: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_EnergyLossOnCollision: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minKillSpeed: 0 + maxKillSpeed: 10000 + radiusScale: 1 + collidesWith: + serializedVersion: 2 + m_Bits: 4294967295 + maxCollisionShapes: 256 + quality: 0 + voxelSize: 0.5 + collisionMessages: 0 + collidesWithDynamic: 1 + interiorCollisions: 0 + TriggerModule: + enabled: 0 collisionShape0: {fileID: 0} collisionShape1: {fileID: 0} collisionShape2: {fileID: 0} @@ -2961,24 +3653,792 @@ ParticleSystem: exit: 0 radiusScale: 1 SubModule: + serializedVersion: 2 + enabled: 0 + subEmitters: + - emitter: {fileID: 0} + type: 0 + properties: 0 + LightsModule: enabled: 0 - subEmitterBirth: {fileID: 0} - subEmitterBirth1: {fileID: 0} - subEmitterCollision: {fileID: 0} - subEmitterCollision1: {fileID: 0} - subEmitterDeath: {fileID: 0} - subEmitterDeath1: {fileID: 0} + ratio: 0 + light: {fileID: 0} + randomDistribution: 1 + color: 1 + range: 1 + intensity: 1 + rangeCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + intensityCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxLights: 20 + TrailModule: + enabled: 0 + ratio: 1 + lifetime: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minVertexDistance: 0.2 + textureMode: 0 + worldSpace: 0 + dieWithParticles: 1 + sizeAffectsWidth: 1 + sizeAffectsLifetime: 0 + inheritParticleColor: 1 + colorOverLifetime: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + widthOverTrail: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorOverTrail: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + CustomDataModule: + enabled: 0 + mode0: 0 + vectorComponentCount0: 4 + color0: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + vector0_0: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vector0_1: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vector0_2: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vector0_3: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + mode1: 0 + vectorComponentCount1: 4 + color1: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + vector1_0: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vector1_1: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vector1_2: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vector1_3: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0.5 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0.5 + inSlope: 0.5 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1814809801 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1814809805} - - 33: {fileID: 1814809804} - - 135: {fileID: 1814809803} - - 23: {fileID: 1814809802} + - component: {fileID: 1814809805} + - component: {fileID: 1814809804} + - component: {fileID: 1814809803} + - component: {fileID: 1814809802} m_Layer: 0 m_Name: moon m_TagString: Untagged @@ -3000,7 +4460,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 84759e1ab6862004baa1620fcdf97ae1, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -3008,12 +4470,13 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!135 &1814809803 SphereCollider: @@ -3043,7 +4506,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 70.732, z: 0} m_LocalScale: {x: 7.510821, y: 7.510817, z: 7.510817} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1474803928} m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/OSVR-Unity/Assets/OSVRUnity/src/ClientKit.cs b/OSVR-Unity/Assets/OSVRUnity/src/ClientKit.cs index e00d121..7190835 100644 --- a/OSVR-Unity/Assets/OSVRUnity/src/ClientKit.cs +++ b/OSVR-Unity/Assets/OSVRUnity/src/ClientKit.cs @@ -132,12 +132,12 @@ private void EnsureStarted() if (!_osvrServerError) { _osvrServerError = true; - Debug.LogError("[OSVR-Unity] OSVR Server not detected. Start OSVR Server and restart the application."); + Debug.LogError("[OSVR-Unity] ClientKit:: OSVR Server not detected. Start OSVR Server and restart the application."); } } else if (_osvrServerError) { - Debug.Log("[OSVR-Unity] OSVR Server connection established. You can ignore previous errors about the server not being detected."); + Debug.Log("[OSVR-Unity] ClientKit:: OSVR Server connection established. You can ignore previous errors about the server not being detected."); _osvrServerError = false; } @@ -161,17 +161,18 @@ void Awake() Destroy(this.gameObject); } } + EnsureStarted(); } void Start() { - Debug.Log("[OSVR-Unity] In Start()"); + Debug.Log("[OSVR-Unity] In ClientKit::Start()"); EnsureStarted(); } void OnEnable() { - Debug.Log("[OSVR-Unity] In OnEnable()"); + Debug.Log("[OSVR-Unity] In ClientKit::OnEnable()"); EnsureStarted(); } @@ -181,10 +182,11 @@ void Update() _contextObject.update(); } - void LateUpdate() + //is there any merit to using lateupdate? + /* void LateUpdate() { _contextObject.update(); - } + }*/ void Stop() { @@ -194,7 +196,7 @@ void Stop() { if (null != _contextObject) { - Debug.Log("[OSVR-Unity] Shutting down OSVR."); + Debug.Log("[OSVR-Unity] ClientKit::Shutting down OSVR."); _contextObject.Dispose(); _contextObject = null; #if UNITY_STANDALONE_WIN || UNITY_ANDROID diff --git a/OSVR-Unity/Assets/OSVRUnity/src/DisplayController.cs b/OSVR-Unity/Assets/OSVRUnity/src/DisplayController.cs index 94567b7..9a6ff52 100644 --- a/OSVR-Unity/Assets/OSVRUnity/src/DisplayController.cs +++ b/OSVR-Unity/Assets/OSVRUnity/src/DisplayController.cs @@ -189,7 +189,7 @@ void SetupDisplay() //create RenderBuffers in RenderManager if(UseRenderManager && RenderManager != null) { - RenderManager.ConstructBuffers(); + RenderManager.CreateBuffers(); } SetRenderParams(); } diff --git a/OSVR-Unity/Assets/OSVRUnity/src/OsvrRenderManager.cs b/OSVR-Unity/Assets/OSVRUnity/src/OsvrRenderManager.cs index 8bf3a3b..13acd64 100644 --- a/OSVR-Unity/Assets/OSVRUnity/src/OsvrRenderManager.cs +++ b/OSVR-Unity/Assets/OSVRUnity/src/OsvrRenderManager.cs @@ -59,9 +59,15 @@ private struct OSVR_ViewportDescription public double height; //< Last pixel on the right of the viewport in pixels } - public const int RENDER_EVENT = 0; - public const int SHUTDOWN_EVENT = 1; + public const int CREATE_RENDERMANAGER_EVENT = 0; + public const int CREATE_RENDERBUFFERS_EVENT = 1; public const int UPDATE_RENDERINFO_EVENT = 2; + public const int RENDER_EVENT = 3; + public const int RESET_YAW_EVENT = 4; + public const int SET_ROOM_ROTATION_EVENT = 5; + public const int CLEAR_ROOM_ROTATION_EVENT = 6; + public const int SHUTDOWN_RENDERMANAGER_EVENT = 7; + private const string PluginName = "osvrUnityRenderingPlugin"; [UnmanagedFunctionPointer(CallingConvention.Winapi)] @@ -73,13 +79,18 @@ private struct OSVR_ViewportDescription //Create and Register RenderBuffers [DllImport(PluginName)] private static extern Byte - ConstructRenderBuffers(); + CreateRenderBuffers(); //Create a RenderManager object in the plugin, passing in a ClientContext [DllImport(PluginName)] private static extern Byte CreateRenderManagerFromUnity(OSVR.ClientKit.SafeClientContextHandle /*OSVR_ClientContext*/ ctx); + //Pass a ClientContext to the Unity rendering plugin + [DllImport(PluginName)] + private static extern Byte + SetOsvrClientContextFromUnity(OSVR.ClientKit.SafeClientContextHandle /*OSVR_ClientContext*/ ctx); + [DllImport(PluginName)] private static extern OSVR.ClientKit.Pose3 GetEyePose(int eye); @@ -109,7 +120,7 @@ private static extern void // If so, change the return type here to Byte [DllImport(PluginName)] private static extern int - SetColorBufferFromUnity(System.IntPtr texturePtr, int eye); + SetColorBufferFromUnity(System.IntPtr texturePtr, int eye, int buffer); [DllImport(PluginName)] private static extern void @@ -195,11 +206,16 @@ public int InitRenderManager() return CreateRenderManager(ClientKit.instance.context); } + public int SetOsvrClientContext() + { + return SetOsvrClientContextFromUnity(ClientKit.instance.context.ContextHandle); + } + //Create and Register RenderBuffers in RenderManager //Called after RM is created and after Unity RenderTexture's are created and assigned via SetEyeColorBuffer - public int ConstructBuffers() + public int CreateBuffers() { - return ConstructRenderBuffers(); + return CreateRenderBuffers(); } public void SetNearClippingPlaneDistance(float near) @@ -222,7 +238,7 @@ public void SetRoomRotationUsingHead() { #if UNITY_5_2 || UNITY_5_3 || UNITY_5_4 || UNITY_5_5 || UNITY_5_6 || UNITY_2017 ClientKit.instance.context.SetRoomRotationUsingHead(); - GL.IssuePluginEvent(GetRenderEventFunc(), 3); + GL.IssuePluginEvent(GetRenderEventFunc(), SET_ROOM_ROTATION_EVENT); #endif } @@ -231,7 +247,7 @@ public void ClearRoomToWorldTransform() { #if UNITY_5_2 || UNITY_5_3 || UNITY_5_4 || UNITY_5_5 || UNITY_5_6 || UNITY_2017 ClientKit.instance.context.ClearRoomToWorldTransform(); - GL.IssuePluginEvent(GetRenderEventFunc(), 4); + GL.IssuePluginEvent(GetRenderEventFunc(), CLEAR_ROOM_ROTATION_EVENT); #endif } @@ -311,9 +327,9 @@ public int CreateRenderManager(OSVR.ClientKit.ClientContext clientContext) } //Pass pointer to eye-camera RenderTexture to the Unity Rendering Plugin - public void SetEyeColorBuffer(IntPtr colorBuffer, int eye) + public void SetEyeColorBuffer(IntPtr colorBuffer, int eye, int buffer) { - SetColorBufferFromUnity(colorBuffer, eye); + SetColorBufferFromUnity(colorBuffer, eye, buffer); } //Get a pointer to the plugin's rendering function diff --git a/OSVR-Unity/Assets/OSVRUnity/src/OsvrUnityNativeVR.cs b/OSVR-Unity/Assets/OSVRUnity/src/OsvrUnityNativeVR.cs index 7f1ac0c..e5e3a42 100644 --- a/OSVR-Unity/Assets/OSVRUnity/src/OsvrUnityNativeVR.cs +++ b/OSVR-Unity/Assets/OSVRUnity/src/OsvrUnityNativeVR.cs @@ -28,6 +28,7 @@ */ using OSVR.Unity; using System.Collections; +using System.Collections.Generic; using UnityEngine; using UnityEngine.VR; using System; @@ -39,6 +40,13 @@ namespace Unity [RequireComponent(typeof(Camera))] public class OsvrUnityNativeVR : MonoBehaviour { + private const int NUM_RENDERBUFFERS = 2; + private const int LEFT_EYE = 0; + private const int RIGHT_EYE = 1; + private const int LEFT_EYE_BUFFER_2 = 2; + private const int RIGHT_EYE_BUFFER_2 = 3; + private const int FIRST_BUFFER = 0; + private const int SECOND_BUFFER = 1; public enum StereoRigSetup { @@ -46,16 +54,19 @@ public enum StereoRigSetup TwoCameras }; public StereoRigSetup stereoRigSetup = StereoRigSetup.OneCameraBothEyes; - public Camera _camera0; //the main camera in a one-camera setup, or the left eye in a two-camera setup - public Camera _camera1; //null in a one-camera setup, or the right eye in a two-camera setup + public Camera _camera0; //the main camera in a one-camera setup, or the left eye in a two-camera setup + public Camera _camera1; //null in a one-camera setup, or the right eye in a two-camera setup - private Transform _camera0CachedTransform; - private Transform _camera1CachedTransform; + private Transform _camera0CachedTransform; + private Transform _camera1CachedTransform; - [HideInInspector] - public RenderTexture StereoTargetRenderTexture0; - [HideInInspector] - public RenderTexture StereoTargetRenderTexture1; + private RenderTexture StereoTargetRenderTextureLeft; + private RenderTexture StereoTargetRenderTextureRight; + private RenderTexture StereoTargetRenderTextureLeft_buffer2; + private RenderTexture StereoTargetRenderTextureRight_buffer2; + + private IEnumerator _endOfFrameCoroutine; + private WaitForEndOfFrame _waitForEndOfFrame; private ClientKit _clientKit; private OSVR.ClientKit.DisplayConfig _displayConfig; @@ -69,7 +80,6 @@ public enum StereoRigSetup private OsvrRenderManager _renderManager; private bool _renderManagerConfigFound = false; - public OSVR.ClientKit.DisplayConfig DisplayConfig { get { return _displayConfig; } @@ -89,28 +99,63 @@ public uint TotalDisplayHeight set { _totalSurfaceHeight = value; } } - + private int frameCount = 0; + void Awake() { _camera0 = GetComponent(); _camera0CachedTransform = this.transform; if (stereoRigSetup == StereoRigSetup.TwoCameras) { - Camera[] cameras = transform.parent.GetComponentsInChildren(); - foreach(Camera c in cameras) + Camera[] cameras = transform.parent.GetComponentsInChildren(); + foreach (Camera c in cameras) { - if(c != _camera0) + if (c != _camera0) { _camera1 = c; //set the right eye camera to the main camera's sibling. _camera1CachedTransform = _camera1.transform; } } - if(cameras.Length < 2) + if (cameras.Length < 2) { Debug.LogError("[OSVR-Unity] Two-camera VR setup cannot find 2nd camera. Add a 2nd camera as a sibling of the main camera."); } } + _waitForEndOfFrame = new WaitForEndOfFrame(); + _endOfFrameCoroutine = EndOfFrame(); + + } + void OnEnable() + { + + } + + void OnDisable() + { + StopCoroutine(_endOfFrameCoroutine); + + } + // This couroutine is called every frame. + IEnumerator EndOfFrame() + { + while (true) + { + yield return _waitForEndOfFrame; + if (_displayConfigInitialized && RenderManager != null && _renderManagerConfigFound) + { + GL.IssuePluginEvent(RenderManager.GetRenderEventFunction(), OsvrRenderManager.RENDER_EVENT); + SwapRenderTextures(); + + } + } + } + + void OnPostRender() + { + GL.Flush(); + } + void Start() { _clientKit = ClientKit.instance; @@ -118,6 +163,7 @@ void Start() { Debug.LogError("[OSVR-Unity] OsvrUnityNativeVR requires a ClientKit object in the scene."); } + CreateRenderManager(); } @@ -125,14 +171,17 @@ void Start() void SetVRAppSettings() { //Disable autovr camera tracking since the camera's transform is set by RenderManager poses. -#if UNITY_2017 - if(_clientKit.context.CheckStatus()) - { - VRDevice.DisableAutoVRCameraTracking(_camera0, true); - } +#if UNITY_2017_2_OR_NEWER + UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(_camera0, true); + UnityEngine.XR.XRSettings.showDeviceView = false; +#elif UNITY_2017_1 + UnityEngine.VR.VRDevice.DisableAutoVRCameraTracking(_camera0, true); + UnityEngine.VR.VRSettings.showDeviceView = false; +#else + UnityEngine.VR.VRSettings.showDeviceView = false; #endif - VRSettings.showDeviceView = false; + //Application.targetFrameRate = 90; Application.targetFrameRate = -1; @@ -145,10 +194,13 @@ void SetVRAppSettings() // Setup RenderManager for DirectMode or non-DirectMode rendering. // Checks to make sure Unity version and Graphics API are supported, // and that a RenderManager config file is being used. - void InitRenderManager() + void CreateRenderManager() { + Debug.Log("[OSVR-Unity] OsvrUnityNativeVR::CreateRenderManager"); + //check if we are configured to use RenderManager or not string renderManagerPath = _clientKit.context.getStringParameter("/renderManagerConfig"); + Debug.LogError("[OSVR-Unity] RenderManager Path = " + renderManagerPath); _renderManagerConfigFound = !(renderManagerPath == null || renderManagerPath.Equals("")); if (_renderManagerConfigFound) { @@ -171,14 +223,30 @@ void InitRenderManager() } else { +#if UNITY_ANDROID + Debug.Log("[OSVR-Unity] Passing client context to OSVR-Unity-Rendering plugin."); + RenderManager.SetOsvrClientContext(); + + Debug.Log("[OSVR-Unity] Sending event to create RenderManager in OSVR-Unity-Rendering plugin."); + //we have to create RenderManager on the rendering thread on Android, but not on Windows + //which means we have to use GL.IssuePluginEvent rather than calling a function in the plugin directly by name + GL.IssuePluginEvent(RenderManager.GetRenderEventFunction(), OsvrRenderManager.CREATE_RENDERMANAGER_EVENT); +#else // attempt to create a RenderManager in the plugin int result = _renderManager.InitRenderManager(); if (result != 0) { Debug.LogError("[OSVR-Unity] Failed to create RenderManager."); _renderManagerConfigFound = false; - VRSettings.enabled = false; //disable VR mode + +#if UNITY_2017_2_0_OR_NEWER + UnityEngine.XR.XRSettings.enabled = false; //disable VR mode +#else + UnityEngine.VR.VRSettings.enabled = false; //disable VR mode +#endif } +#endif + } } else @@ -189,8 +257,10 @@ void InitRenderManager() // Get a DisplayConfig object from the server via ClientKit. // Setup stereo rendering with DisplayConfig data. - void Init() + void InitDisplayConfig() { + Debug.Log("[OSVR-Unity] OsvrUnityNativeVR::InitDisplayConfig"); + //get the DisplayConfig object from ClientKit if (_clientKit == null || _clientKit.context == null) { @@ -199,34 +269,58 @@ void Init() Debug.LogError("[OSVR-Unity] ClientContext is null. Can't setup display."); _osvrClientKitError = true; } - return; + return; } - SetVRAppSettings(); _displayConfig = _clientKit.context.GetDisplayConfig(); if (_displayConfig == null) { - return; + return; } + _displayConfigInitialized = true; - InitRenderManager(); - if (!_renderManagerConfigFound || RenderManager == null) - { - return; - } - SetupStereoCamerarig(); - SetResolution(); - CreateRenderTextures(); + } + private bool rmInit = false; + void InitRenderManager() + { + Debug.Log("[OSVR-Unity] OsvrUnityNativeVR::InitRenderManager"); + +#if !UNITY_ANDROID + //@todo figure out why the function below crashes with Android multithreading + SetupStereoCamerarig(); +#endif + //create RenderBuffers in RenderManager - if (_renderManagerConfigFound && RenderManager != null) - { - RenderManager.ConstructBuffers(); - } + if (_renderManagerConfigFound && RenderManager != null && !rmInit) + { + SetVRAppSettings(); + SetResolution(); + CreateRenderTextures(); +#if UNITY_ANDROID + //we have to create renderbufffers on the rendering thread on Android, but not on Windows + GL.IssuePluginEvent(RenderManager.GetRenderEventFunction(), OsvrRenderManager.CREATE_RENDERBUFFERS_EVENT); +#else + RenderManager.CreateBuffers(); +#endif SetRenderParams(); + StartCoroutine(_endOfFrameCoroutine); + rmInit = true; } + else + { + Debug.LogError("[OSVR-Unity] RenderManager Not Initialized."); + if(!_renderManagerConfigFound) + { + Debug.LogError("[OSVR-Unity] RenderManager Config Not Found."); + } + + CreateRenderManager(); + + } + } /* * We currently are only able to set the projection matrix of each eye with a two camera setup, via camera.projectionMatrix. * For configurations where the projection matrix for each eye is identical, we use the one-camera setup. @@ -261,7 +355,7 @@ private void SetupStereoCamerarig() _camera1 = rightEyeCamera; _camera1CachedTransform = _camera1.transform; } - } + } } @@ -304,7 +398,6 @@ private void SetResolution() TotalDisplayWidth += (uint)surfaceDisplayDimensions.Width; //add up the width of each eye TotalDisplayHeight = (uint)surfaceDisplayDimensions.Height; //store the height -- this shouldn't change } - //Set the resolution. Don't force fullscreen if we have multiple display inputs //We only need to do this if we aren't using RenderManager, because it adjusts the window size for us //@todo figure out why this causes problems with direct mode, perhaps overfill factor? @@ -319,20 +412,43 @@ private void CreateRenderTextures() { if (stereoRigSetup == StereoRigSetup.OneCameraBothEyes) { - //create a RenderTexture for this eye's camera to render into RenderTexture renderTexture = new RenderTexture((int)TotalDisplayWidth, (int)TotalDisplayHeight, 24, RenderTextureFormat.Default); if (QualitySettings.antiAliasing > 0) { renderTexture.antiAliasing = QualitySettings.antiAliasing; } - StereoTargetRenderTexture0 = renderTexture; - _camera0.targetTexture = StereoTargetRenderTexture0; - RenderTexture.active = StereoTargetRenderTexture0; + StereoTargetRenderTextureLeft = renderTexture; + StereoTargetRenderTextureLeft.Create(); + _camera0.targetTexture = StereoTargetRenderTextureLeft; + // RenderTexture.active = StereoTargetRenderTexture0; //Set the native texture pointer so we can access this texture from the plugin - RenderManager.SetEyeColorBuffer(renderTexture.GetNativeTexturePtr(), 0); - RenderManager.SetEyeColorBuffer(renderTexture.GetNativeTexturePtr(), 1); + RenderManager.SetEyeColorBuffer(renderTexture.GetNativeTexturePtr(), 0, 0); + RenderManager.SetEyeColorBuffer(renderTexture.GetNativeTexturePtr(), 1, 0); + + if (NUM_RENDERBUFFERS == 2) + { + //create a RenderTexture for this eye's camera to render into + RenderTexture rt2 = new RenderTexture((int)TotalDisplayWidth, (int)TotalDisplayHeight, 24, RenderTextureFormat.Default); + if (QualitySettings.antiAliasing > 0) + { + rt2.antiAliasing = QualitySettings.antiAliasing; + } + StereoTargetRenderTextureLeft_buffer2 = rt2; + StereoTargetRenderTextureLeft_buffer2.Create(); + // RenderTexture.active = StereoTargetRenderTexture0_buffer2; + + RenderManager.SetEyeColorBuffer(rt2.GetNativeTexturePtr(), 0, 1); + RenderManager.SetEyeColorBuffer(rt2.GetNativeTexturePtr(), 1, 1); + //make the first target active + + RenderTexture.active = StereoTargetRenderTextureLeft; + + + } + + } else //two-camera setup { @@ -345,9 +461,11 @@ private void CreateRenderTextures() { renderTexture0.antiAliasing = QualitySettings.antiAliasing; } - StereoTargetRenderTexture0 = renderTexture0; - _camera0.targetTexture = StereoTargetRenderTexture0; + StereoTargetRenderTextureLeft = renderTexture0; + StereoTargetRenderTextureLeft.Create(); + _camera0.targetTexture = StereoTargetRenderTextureLeft; + //right eye OSVR.ClientKit.Viewport rightEyeViewport = RenderManager.GetEyeViewport(1); @@ -358,17 +476,104 @@ private void CreateRenderTextures() { renderTexture1.antiAliasing = QualitySettings.antiAliasing; } - StereoTargetRenderTexture1 = renderTexture1; - _camera1.targetTexture = StereoTargetRenderTexture1; + StereoTargetRenderTextureRight = renderTexture1; + StereoTargetRenderTextureRight.Create(); + _camera1.targetTexture = StereoTargetRenderTextureRight; //set rendermanager color buffers //Set the native texture pointer so we can access this texture from the plugin - RenderManager.SetEyeColorBuffer(renderTexture0.GetNativeTexturePtr(), 0); - RenderManager.SetEyeColorBuffer(renderTexture1.GetNativeTexturePtr(), 1); + //set rendermanager color buffers + //Set the native texture pointer so we can access this texture from the plugin + RenderManager.SetEyeColorBuffer(renderTexture0.GetNativeTexturePtr(), 0, 0); + RenderManager.SetEyeColorBuffer(renderTexture1.GetNativeTexturePtr(), 1, 0); + + if(NUM_RENDERBUFFERS == 2) + { + //create a RenderTexture for this eye's camera to render into + RenderTexture renderTexture0_b2 = new RenderTexture(leftEyeViewport.Width, leftEyeViewport.Height, 24, RenderTextureFormat.Default); + if (QualitySettings.antiAliasing > 0) + { + renderTexture0_b2.antiAliasing = QualitySettings.antiAliasing; + } + StereoTargetRenderTextureLeft_buffer2 = renderTexture0_b2; + StereoTargetRenderTextureLeft_buffer2.Create(); + + + + //create a RenderTexture for this eye's camera to render into + RenderTexture renderTexture1_b2 = new RenderTexture(leftEyeViewport.Width, rightEyeViewport.Height, 24, RenderTextureFormat.Default); + if (QualitySettings.antiAliasing > 0) + { + renderTexture1_b2.antiAliasing = QualitySettings.antiAliasing; + } + StereoTargetRenderTextureRight_buffer2 = renderTexture1_b2; + StereoTargetRenderTextureRight_buffer2.Create(); + + //set rendermanager color buffers + //Set the native texture pointer so we can access this texture from the plugin + RenderManager.SetEyeColorBuffer(renderTexture0_b2.GetNativeTexturePtr(), 0, 1); + //set rendermanager color buffers + //Set the native texture pointer so we can access this texture from the plugin + RenderManager.SetEyeColorBuffer(renderTexture1_b2.GetNativeTexturePtr(), 1, 1); + + RenderTexture.active = StereoTargetRenderTextureLeft; + + } + + } } + void SwapRenderTextures() + { + int frame = frameCount % 2; + if (stereoRigSetup == StereoRigSetup.OneCameraBothEyes) + { + RenderTexture buff; + if (frame == 0) + { + buff = StereoTargetRenderTextureLeft; + // RenderTexture.active = StereoTargetRenderTexture0; + _camera0.targetTexture = StereoTargetRenderTextureLeft; + + + } + else + { + buff = StereoTargetRenderTextureLeft_buffer2; + // RenderTexture.active = StereoTargetRenderTexture0_buffer2; + _camera0.targetTexture = StereoTargetRenderTextureLeft_buffer2; + + } + } + else + { + RenderTexture buff0; + RenderTexture buff1; + if (frame == 0) + { + buff0 = StereoTargetRenderTextureLeft; + _camera0.targetTexture = StereoTargetRenderTextureLeft; + + buff1 = StereoTargetRenderTextureRight; + _camera1.targetTexture = StereoTargetRenderTextureRight; + + + } + else + { + buff0 = StereoTargetRenderTextureLeft_buffer2; + _camera0.targetTexture = StereoTargetRenderTextureLeft_buffer2; + + buff1 = StereoTargetRenderTextureRight_buffer2; + _camera1.targetTexture = StereoTargetRenderTextureRight_buffer2; + + } + } + + frameCount++; + } void LateUpdate() { @@ -376,9 +581,13 @@ void LateUpdate() // keep trying until we have initialized if (!_displayConfigInitialized) { - Init(); + InitDisplayConfig(); + } + else if(_displayConfigInitialized && !rmInit) + { + InitRenderManager(); } - else if (_displayConfigInitialized && RenderManager != null && _renderManagerConfigFound) + if (_displayConfigInitialized && rmInit && RenderManager != null && _renderManagerConfigFound) { GL.IssuePluginEvent(RenderManager.GetRenderEventFunction(), OsvrRenderManager.UPDATE_RENDERINFO_EVENT); if (stereoRigSetup == StereoRigSetup.OneCameraBothEyes) @@ -390,7 +599,8 @@ void LateUpdate() { UpdateEyePoses(); } - GL.IssuePluginEvent(RenderManager.GetRenderEventFunction(), OsvrRenderManager.RENDER_EVENT); + // GL.IssuePluginEvent(RenderManager.GetRenderEventFunction(), OsvrRenderManager.RENDER_EVENT); + // SwapRenderTextures(); } } @@ -447,65 +657,68 @@ private void SetProjectionMatrix() // Updates the position and rotation of the eye // Optionally, update the viewer associated with this eye + private Vector3 pos0; + private Vector3 pos1; + private Vector3 pos2; + private Quaternion rot0; + private Quaternion rot1; + private Quaternion slerpedRot0; + private OSVR.ClientKit.Pose3 eyePose0; + private OSVR.ClientKit.Pose3 eyePose1; public void UpdateEyePoses() { - OSVR.ClientKit.Pose3 eyePose0 = RenderManager.GetRenderManagerEyePose((byte)0); - OSVR.ClientKit.Pose3 eyePose1 = RenderManager.GetRenderManagerEyePose((byte)1); - + eyePose0 = RenderManager.GetRenderManagerEyePose((byte)0); + eyePose1 = RenderManager.GetRenderManagerEyePose((byte)1); // Convert from OSVR space into Unity space. - Vector3 pos0 = OSVR.Unity.Math.ConvertPosition(eyePose0.translation); - Quaternion rot0 = OSVR.Unity.Math.ConvertOrientation(eyePose0.rotation); + pos0 = OSVR.Unity.Math.ConvertPosition(eyePose0.translation); + rot0 = OSVR.Unity.Math.ConvertOrientation(eyePose0.rotation); - Vector3 pos1 = OSVR.Unity.Math.ConvertPosition(eyePose1.translation); - Quaternion rot1 = OSVR.Unity.Math.ConvertOrientation(eyePose1.rotation); + pos1 = OSVR.Unity.Math.ConvertPosition(eyePose1.translation); + rot1 = OSVR.Unity.Math.ConvertOrientation(eyePose1.rotation); - if(stereoRigSetup == StereoRigSetup.OneCameraBothEyes) + if (stereoRigSetup == StereoRigSetup.OneCameraBothEyes && _camera0CachedTransform != null) { - Quaternion slerpedRot = Quaternion.Slerp(rot0, rot1, 0.5f); - Vector3 pos = new Vector3((pos0.x + pos1.x) * 0.5f, (pos0.y + pos1.y) * 0.5f, (pos0.z + pos1.z) * 0.5f); + slerpedRot0 = Quaternion.Slerp(rot0, rot1, 0.5f); + pos2 = new Vector3((pos0.x + pos1.x) * 0.5f, (pos0.y + pos1.y) * 0.5f, (pos0.z + pos1.z) * 0.5f); // Invert the transformation - _camera0CachedTransform.localRotation = Quaternion.Inverse(slerpedRot); - Vector3 invPos = -pos; - _camera0CachedTransform.localPosition = Quaternion.Inverse(slerpedRot) * invPos; + _camera0CachedTransform.localRotation = Quaternion.Inverse(slerpedRot0); + _camera0CachedTransform.localPosition = Quaternion.Inverse(slerpedRot0) * -pos2; } - else //two-camera setup + else if (_camera0CachedTransform != null && _camera1CachedTransform != null)//two-camera setup { //this script is attached to the left eye, with a right-eye sibling gameobject _camera0CachedTransform.localRotation = Quaternion.Inverse(rot0); - Vector3 invPos = -pos0; - _camera0CachedTransform.localPosition = Quaternion.Inverse(rot0) * invPos; + _camera0CachedTransform.localPosition = Quaternion.Inverse(rot0) * -pos0; _camera1CachedTransform.localRotation = Quaternion.Inverse(rot1); - invPos = -pos1; - _camera1CachedTransform.localPosition = Quaternion.Inverse(rot1) * invPos; + _camera1CachedTransform.localPosition = Quaternion.Inverse(rot1) * -pos1; } - + } // Updates the position and rotation of the head // Optionally, update the viewer associated with this head public void UpdateHeadPose() { - OSVR.ClientKit.Pose3 eyePose0 = RenderManager.GetRenderManagerEyePose((byte)0); - OSVR.ClientKit.Pose3 eyePose1 = RenderManager.GetRenderManagerEyePose((byte)1); - + eyePose0 = RenderManager.GetRenderManagerEyePose((byte)0); + eyePose1 = RenderManager.GetRenderManagerEyePose((byte)1); // Convert from OSVR space into Unity space. - Vector3 pos0 = OSVR.Unity.Math.ConvertPosition(eyePose0.translation); - Quaternion rot0 = OSVR.Unity.Math.ConvertOrientation(eyePose0.rotation); + pos0 = OSVR.Unity.Math.ConvertPosition(eyePose0.translation); + rot0 = OSVR.Unity.Math.ConvertOrientation(eyePose0.rotation); - Vector3 pos1 = OSVR.Unity.Math.ConvertPosition(eyePose1.translation); - Quaternion rot1 = OSVR.Unity.Math.ConvertOrientation(eyePose1.rotation); + pos1 = OSVR.Unity.Math.ConvertPosition(eyePose1.translation); + rot1 = OSVR.Unity.Math.ConvertOrientation(eyePose1.rotation); - Quaternion slerpedRot = Quaternion.Slerp(rot0, rot1, 0.5f); - Vector3 pos = new Vector3((pos0.x + pos1.x) * 0.5f, (pos0.y + pos1.y) * 0.5f, (pos0.z + pos1.z) * 0.5f); + slerpedRot0 = Quaternion.Slerp(rot0, rot1, 0.5f); + pos2 = new Vector3((pos0.x + pos1.x) * 0.5f, (pos0.y + pos1.y) * 0.5f, (pos0.z + pos1.z) * 0.5f); // Invert the transformation - _camera0CachedTransform.localRotation = Quaternion.Inverse(slerpedRot); - Vector3 invPos = -pos; - _camera0CachedTransform.localPosition = Quaternion.Inverse(slerpedRot) * invPos; + _camera0CachedTransform.localRotation = Quaternion.Inverse(slerpedRot0); + _camera0CachedTransform.localPosition = Quaternion.Inverse(slerpedRot0) * -pos2; + } public bool CheckDisplayStartup() @@ -513,48 +726,6 @@ public bool CheckDisplayStartup() return DisplayConfig != null && _displayConfigInitialized && DisplayConfig.CheckDisplayStartup(); } - public void ExitRenderManager() - { - if (_renderManagerConfigFound && RenderManager != null) - { - RenderManager.ExitRenderManager(); - } - } - - void OnApplicationQuit() - { - ExitRenderManager(); - } - - /* - private void OnGUI() - { - if (Event.current.type.Equals(EventType.Repaint)) - { - - //Retrieves the number of dropped frames reported by the VR SDK. - int droppedFrames; - if (VRStats.TryGetDroppedFrameCount(out droppedFrames)) - { - GUI.Label(new Rect(0, 0, 200, 200), "Dropped frames: " + droppedFrames); - } - - //Retrieves the number of times the current frame has been drawn to the device as reported by the VR SDK. - int framePresentCount; - if (VRStats.TryGetFramePresentCount(out framePresentCount)) - { - GUI.Label(new Rect(0, 200, 200, 200), "Frame Present Count: " + framePresentCount); - } - - //Retrieves the time spent by the GPU last frame, in seconds, as reported by the VR SDK. - float gpuTimeSpentLastFrame; - if (VRStats.TryGetGPUTimeLastFrame(out gpuTimeSpentLastFrame)) - { - GUI.Label(new Rect(0, 400, 200, 200), "GPU Time spent last frame: " + gpuTimeSpentLastFrame); - } - } - } - */ } } } \ No newline at end of file diff --git a/OSVR-Unity/Assets/OSVRUnity/src/VRSurface.cs b/OSVR-Unity/Assets/OSVRUnity/src/VRSurface.cs index 76f1f38..e9d5b58 100644 --- a/OSVR-Unity/Assets/OSVRUnity/src/VRSurface.cs +++ b/OSVR-Unity/Assets/OSVRUnity/src/VRSurface.cs @@ -139,7 +139,7 @@ public void SetRenderTexture(RenderTexture rt) RenderTexture.active = RenderToTexture; //Set the native texture pointer so we can access this texture from the plugin - Eye.Viewer.DisplayController.RenderManager.SetEyeColorBuffer(RenderToTexture.GetNativeTexturePtr(), (int)Eye.EyeIndex); + Eye.Viewer.DisplayController.RenderManager.SetEyeColorBuffer(RenderToTexture.GetNativeTexturePtr(), (int)Eye.EyeIndex, 0); } public RenderTexture GetRenderTexture() { diff --git a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrPluginKit.so b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrPluginKit.so index 9276a02..fd9a189 100644 Binary files a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrPluginKit.so and b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrPluginKit.so differ diff --git a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrRenderManager.so b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrRenderManager.so index d3868d6..6e4aa91 100644 Binary files a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrRenderManager.so and b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrRenderManager.so differ diff --git a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUnityRenderingPlugin.so b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUnityRenderingPlugin.so index 121eefc..b4d86d1 100644 Binary files a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUnityRenderingPlugin.so and b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUnityRenderingPlugin.so differ diff --git a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/osvrUnityAndroidPlugin.jar b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/osvrUnityAndroidPlugin.jar index 53ba2ba..d1510ac 100644 Binary files a/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/osvrUnityAndroidPlugin.jar and b/OSVR-Unity/Assets/Plugins/Android/libs/armeabi-v7a/osvrUnityAndroidPlugin.jar differ