Skip to content

Commit a7f401d

Browse files
committed
Sync with Time
1 parent 4adbeb6 commit a7f401d

File tree

6 files changed

+338
-21
lines changed

6 files changed

+338
-21
lines changed

Assets/Demoscene/Projects/2018-05-28-Sandwich/Sandwich.playable

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ MonoBehaviour:
1414
m_NextId: 0
1515
m_Tracks:
1616
- {fileID: 114157750213672622}
17+
- {fileID: 114413557561375252}
1718
m_FixedDuration: 0
1819
m_EditorSettings:
1920
m_Framerate: 60
@@ -51,3 +52,106 @@ MonoBehaviour:
5152
m_ApplyAvatarMask: 1
5253
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
5354
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
55+
--- !u!114 &114246562641828562
56+
MonoBehaviour:
57+
m_ObjectHideFlags: 1
58+
m_PrefabParentObject: {fileID: 0}
59+
m_PrefabInternal: {fileID: 0}
60+
m_GameObject: {fileID: 0}
61+
m_Enabled: 1
62+
m_EditorHideFlags: 0
63+
m_Script: {fileID: 11500000, guid: 14d3049c91ef38844a96b56715753f93, type: 3}
64+
m_Name: RaymarchingWolrdSandwichClip
65+
m_EditorClassIdentifier:
66+
template:
67+
param1: 0
68+
param2: 0
69+
vec1: {x: 0, y: 0, z: 0}
70+
--- !u!114 &114413557561375252
71+
MonoBehaviour:
72+
m_ObjectHideFlags: 1
73+
m_PrefabParentObject: {fileID: 0}
74+
m_PrefabInternal: {fileID: 0}
75+
m_GameObject: {fileID: 0}
76+
m_Enabled: 1
77+
m_EditorHideFlags: 0
78+
m_Script: {fileID: 11500000, guid: 91e2f746a277d0947bf948127a0700ad, type: 3}
79+
m_Name: Raymarching Wolrd Sandwich Track
80+
m_EditorClassIdentifier:
81+
m_Locked: 0
82+
m_Muted: 0
83+
m_CustomPlayableFullTypename:
84+
m_AnimClip: {fileID: 0}
85+
m_Parent: {fileID: 11400000}
86+
m_Children: []
87+
m_Clips:
88+
- m_Start: 0
89+
m_ClipIn: 0
90+
m_Asset: {fileID: 114246562641828562}
91+
m_Duration: 8
92+
m_TimeScale: 1
93+
m_ParentTrack: {fileID: 114413557561375252}
94+
m_EaseInDuration: 0
95+
m_EaseOutDuration: 0
96+
m_BlendInDuration: 0
97+
m_BlendOutDuration: 0
98+
m_MixInCurve:
99+
serializedVersion: 2
100+
m_Curve:
101+
- serializedVersion: 3
102+
time: 0
103+
value: 0
104+
inSlope: 0
105+
outSlope: 0
106+
tangentMode: 0
107+
weightedMode: 0
108+
inWeight: 0
109+
outWeight: 0
110+
- serializedVersion: 3
111+
time: 1
112+
value: 1
113+
inSlope: 0
114+
outSlope: 0
115+
tangentMode: 0
116+
weightedMode: 0
117+
inWeight: 0
118+
outWeight: 0
119+
m_PreInfinity: 2
120+
m_PostInfinity: 2
121+
m_RotationOrder: 4
122+
m_MixOutCurve:
123+
serializedVersion: 2
124+
m_Curve:
125+
- serializedVersion: 3
126+
time: 0
127+
value: 1
128+
inSlope: 0
129+
outSlope: 0
130+
tangentMode: 0
131+
weightedMode: 0
132+
inWeight: 0
133+
outWeight: 0
134+
- serializedVersion: 3
135+
time: 1
136+
value: 0
137+
inSlope: 0
138+
outSlope: 0
139+
tangentMode: 0
140+
weightedMode: 0
141+
inWeight: 0
142+
outWeight: 0
143+
m_PreInfinity: 2
144+
m_PostInfinity: 2
145+
m_RotationOrder: 4
146+
m_BlendInCurveMode: 0
147+
m_BlendOutCurveMode: 0
148+
m_ExposedParameterNames: []
149+
m_AnimationCurves: {fileID: 0}
150+
m_Recordable: 0
151+
m_PostExtrapolationMode: 0
152+
m_PreExtrapolationMode: 0
153+
m_PostExtrapolationTime: 0
154+
m_PreExtrapolationTime: 0
155+
m_DisplayName: RaymarchingWolrdSandwichClip
156+
m_Version: 1
157+
m_Version: 1

Assets/Demoscene/Projects/2018-05-28-Sandwich/Sandwich.unity

Lines changed: 175 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,91 @@ Transform:
361361
m_Father: {fileID: 0}
362362
m_RootOrder: 2
363363
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
364+
--- !u!1 &1244454536
365+
GameObject:
366+
m_ObjectHideFlags: 0
367+
m_PrefabParentObject: {fileID: 0}
368+
m_PrefabInternal: {fileID: 0}
369+
serializedVersion: 5
370+
m_Component:
371+
- component: {fileID: 1244454540}
372+
- component: {fileID: 1244454539}
373+
- component: {fileID: 1244454538}
374+
- component: {fileID: 1244454537}
375+
m_Layer: 0
376+
m_Name: Cube
377+
m_TagString: Untagged
378+
m_Icon: {fileID: 0}
379+
m_NavMeshLayer: 0
380+
m_StaticEditorFlags: 0
381+
m_IsActive: 0
382+
--- !u!65 &1244454537
383+
BoxCollider:
384+
m_ObjectHideFlags: 0
385+
m_PrefabParentObject: {fileID: 0}
386+
m_PrefabInternal: {fileID: 0}
387+
m_GameObject: {fileID: 1244454536}
388+
m_Material: {fileID: 0}
389+
m_IsTrigger: 0
390+
m_Enabled: 1
391+
serializedVersion: 2
392+
m_Size: {x: 1, y: 1, z: 1}
393+
m_Center: {x: 0, y: 0, z: 0}
394+
--- !u!23 &1244454538
395+
MeshRenderer:
396+
m_ObjectHideFlags: 0
397+
m_PrefabParentObject: {fileID: 0}
398+
m_PrefabInternal: {fileID: 0}
399+
m_GameObject: {fileID: 1244454536}
400+
m_Enabled: 1
401+
m_CastShadows: 1
402+
m_ReceiveShadows: 1
403+
m_DynamicOccludee: 1
404+
m_MotionVectors: 1
405+
m_LightProbeUsage: 1
406+
m_ReflectionProbeUsage: 1
407+
m_RenderingLayerMask: 4294967295
408+
m_Materials:
409+
- {fileID: 2100000, guid: 538d33a3ef49a4323a79342c0c9d8966, type: 2}
410+
m_StaticBatchInfo:
411+
firstSubMesh: 0
412+
subMeshCount: 0
413+
m_StaticBatchRoot: {fileID: 0}
414+
m_ProbeAnchor: {fileID: 0}
415+
m_LightProbeVolumeOverride: {fileID: 0}
416+
m_ScaleInLightmap: 1
417+
m_PreserveUVs: 0
418+
m_IgnoreNormalsForChartDetection: 0
419+
m_ImportantGI: 0
420+
m_StitchLightmapSeams: 0
421+
m_SelectedEditorRenderState: 3
422+
m_MinimumChartSize: 4
423+
m_AutoUVMaxDistance: 0.5
424+
m_AutoUVMaxAngle: 89
425+
m_LightmapParameters: {fileID: 0}
426+
m_SortingLayerID: 0
427+
m_SortingLayer: 0
428+
m_SortingOrder: 0
429+
--- !u!33 &1244454539
430+
MeshFilter:
431+
m_ObjectHideFlags: 0
432+
m_PrefabParentObject: {fileID: 0}
433+
m_PrefabInternal: {fileID: 0}
434+
m_GameObject: {fileID: 1244454536}
435+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
436+
--- !u!4 &1244454540
437+
Transform:
438+
m_ObjectHideFlags: 0
439+
m_PrefabParentObject: {fileID: 0}
440+
m_PrefabInternal: {fileID: 0}
441+
m_GameObject: {fileID: 1244454536}
442+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
443+
m_LocalPosition: {x: 2.62, y: 0, z: 0}
444+
m_LocalScale: {x: 1, y: 1, z: 1}
445+
m_Children: []
446+
m_Father: {fileID: 0}
447+
m_RootOrder: 6
448+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
364449
--- !u!1 &1537248312
365450
GameObject:
366451
m_ObjectHideFlags: 0
@@ -389,7 +474,7 @@ ReflectionProbe:
389474
m_Mode: 1
390475
m_RefreshMode: 1
391476
m_TimeSlicingMode: 0
392-
m_Resolution: 32
477+
m_Resolution: 16
393478
m_UpdateFrequency: 0
394479
m_BoxSize: {x: 100, y: 100, z: 100}
395480
m_BoxOffset: {x: 0, y: 0, z: 0}
@@ -579,6 +664,92 @@ MonoBehaviour:
579664
m_BeforeTransparentBundles: []
580665
m_BeforeStackBundles: []
581666
m_AfterStackBundles: []
667+
--- !u!1 &1930367664
668+
GameObject:
669+
m_ObjectHideFlags: 0
670+
m_PrefabParentObject: {fileID: 0}
671+
m_PrefabInternal: {fileID: 0}
672+
serializedVersion: 5
673+
m_Component:
674+
- component: {fileID: 1930367668}
675+
- component: {fileID: 1930367667}
676+
- component: {fileID: 1930367666}
677+
- component: {fileID: 1930367665}
678+
m_Layer: 0
679+
m_Name: Cylinder
680+
m_TagString: Untagged
681+
m_Icon: {fileID: 0}
682+
m_NavMeshLayer: 0
683+
m_StaticEditorFlags: 0
684+
m_IsActive: 0
685+
--- !u!136 &1930367665
686+
CapsuleCollider:
687+
m_ObjectHideFlags: 0
688+
m_PrefabParentObject: {fileID: 0}
689+
m_PrefabInternal: {fileID: 0}
690+
m_GameObject: {fileID: 1930367664}
691+
m_Material: {fileID: 0}
692+
m_IsTrigger: 0
693+
m_Enabled: 1
694+
m_Radius: 0.5000001
695+
m_Height: 2
696+
m_Direction: 1
697+
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
698+
--- !u!23 &1930367666
699+
MeshRenderer:
700+
m_ObjectHideFlags: 0
701+
m_PrefabParentObject: {fileID: 0}
702+
m_PrefabInternal: {fileID: 0}
703+
m_GameObject: {fileID: 1930367664}
704+
m_Enabled: 1
705+
m_CastShadows: 1
706+
m_ReceiveShadows: 1
707+
m_DynamicOccludee: 1
708+
m_MotionVectors: 1
709+
m_LightProbeUsage: 1
710+
m_ReflectionProbeUsage: 1
711+
m_RenderingLayerMask: 4294967295
712+
m_Materials:
713+
- {fileID: 2100000, guid: 538d33a3ef49a4323a79342c0c9d8966, type: 2}
714+
m_StaticBatchInfo:
715+
firstSubMesh: 0
716+
subMeshCount: 0
717+
m_StaticBatchRoot: {fileID: 0}
718+
m_ProbeAnchor: {fileID: 0}
719+
m_LightProbeVolumeOverride: {fileID: 0}
720+
m_ScaleInLightmap: 1
721+
m_PreserveUVs: 0
722+
m_IgnoreNormalsForChartDetection: 0
723+
m_ImportantGI: 0
724+
m_StitchLightmapSeams: 0
725+
m_SelectedEditorRenderState: 3
726+
m_MinimumChartSize: 4
727+
m_AutoUVMaxDistance: 0.5
728+
m_AutoUVMaxAngle: 89
729+
m_LightmapParameters: {fileID: 0}
730+
m_SortingLayerID: 0
731+
m_SortingLayer: 0
732+
m_SortingOrder: 0
733+
--- !u!33 &1930367667
734+
MeshFilter:
735+
m_ObjectHideFlags: 0
736+
m_PrefabParentObject: {fileID: 0}
737+
m_PrefabInternal: {fileID: 0}
738+
m_GameObject: {fileID: 1930367664}
739+
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
740+
--- !u!4 &1930367668
741+
Transform:
742+
m_ObjectHideFlags: 0
743+
m_PrefabParentObject: {fileID: 0}
744+
m_PrefabInternal: {fileID: 0}
745+
m_GameObject: {fileID: 1930367664}
746+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
747+
m_LocalPosition: {x: -2.18, y: 0, z: 0}
748+
m_LocalScale: {x: 1, y: 1, z: 1}
749+
m_Children: []
750+
m_Father: {fileID: 0}
751+
m_RootOrder: 5
752+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
582753
--- !u!1 &2022267216
583754
GameObject:
584755
m_ObjectHideFlags: 0
@@ -624,14 +795,16 @@ PlayableDirector:
624795
serializedVersion: 3
625796
m_PlayableAsset: {fileID: 11400000, guid: c4c3e38fc3ca1f84f8aa6216618d29d7, type: 2}
626797
m_InitialState: 1
627-
m_WrapMode: 2
798+
m_WrapMode: 1
628799
m_DirectorUpdateMode: 1
629800
m_InitialTime: 0
630801
m_SceneBindings:
631802
- key: {fileID: 114157750213672622, guid: c4c3e38fc3ca1f84f8aa6216618d29d7, type: 2}
632803
value: {fileID: 2022267216}
633804
- key: {fileID: 114844554438964780, guid: c4c3e38fc3ca1f84f8aa6216618d29d7, type: 2}
634805
value: {fileID: 509048561}
806+
- key: {fileID: 114413557561375252, guid: c4c3e38fc3ca1f84f8aa6216618d29d7, type: 2}
807+
value: {fileID: 509048563}
635808
m_ExposedReferences:
636809
m_References: []
637810
--- !u!4 &2022267219

Assets/Demoscene/Projects/2018-05-28-Sandwich/Sandwich_Profiles/Main Camera Profile.asset

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ MonoBehaviour:
1616
- {fileID: 114282051354915294}
1717
- {fileID: 114593535073444008}
1818
- {fileID: 114599070391363622}
19+
- {fileID: 114586041114570370}
1920
--- !u!114 &114282051354915294
2021
MonoBehaviour:
2122
m_ObjectHideFlags: 3
@@ -64,6 +65,33 @@ MonoBehaviour:
6465
quality:
6566
overrideState: 0
6667
value: 2
68+
--- !u!114 &114586041114570370
69+
MonoBehaviour:
70+
m_ObjectHideFlags: 3
71+
m_PrefabParentObject: {fileID: 0}
72+
m_PrefabInternal: {fileID: 0}
73+
m_GameObject: {fileID: 0}
74+
m_Enabled: 1
75+
m_EditorHideFlags: 0
76+
m_Script: {fileID: 11500000, guid: 556797029e73b2347956b6579e77e05b, type: 3}
77+
m_Name: DepthOfField
78+
m_EditorClassIdentifier:
79+
active: 1
80+
enabled:
81+
overrideState: 1
82+
value: 1
83+
focusDistance:
84+
overrideState: 1
85+
value: 7.67
86+
aperture:
87+
overrideState: 1
88+
value: 0.4
89+
focalLength:
90+
overrideState: 1
91+
value: 26
92+
kernelSize:
93+
overrideState: 1
94+
value: 3
6795
--- !u!114 &114593535073444008
6896
MonoBehaviour:
6997
m_ObjectHideFlags: 3

0 commit comments

Comments
 (0)