Skip to content

Commit 5b3d19c

Browse files
gam0022gam0022
committed
Seek LocalTime by Timeline
1 parent 9fcf4dc commit 5b3d19c

File tree

7 files changed

+260
-14
lines changed

7 files changed

+260
-14
lines changed

‎.idea/.idea.unity-demoscene/.idea/contentModel.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Demoscene/Projects/2018-05-28-Sandwich/uRaymarchingShaders/Sandwich.shader

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Properties
1616
_ShadowExtraBias("Shadow Extra Bias", Range(0.0, 1.0)) = 0.01
1717

1818
// @block Properties
19-
// _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
20-
_LocalTime("Local Time", Float) = 0
2119
[HDR] _SlideEmission("Slide Emission", Color) = (2.0, 2.0, 5.0, 1.0)
2220
// @endblock
2321
}
@@ -76,7 +74,7 @@ inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
7674

7775
float byTime = abs(sin(PI * 1.0 / 4 * _LocalTime));
7876
float intensity = byPosY * byTime;
79-
77+
8078
o.emission = _SlideEmission * intensity;
8179
}
8280
// @endblock
@@ -129,4 +127,4 @@ Fallback "Diffuse"
129127

130128
CustomEditor "uShaderTemplate.MaterialEditor"
131129

132-
}
130+
}

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.mat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Material:
2727
- _FlowIntensity: 0.32
2828
- _FlowSpeed: 0.5
2929
- _FlowThreshold: 1.244
30+
- _LocalTime: 0
3031
- _Loop: 50
3132
- _MinDistance: 0.01
3233
- _ShadowExtraBias: 0.802

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.playable

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_GameObject: {fileID: 0}
9+
m_Enabled: 1
10+
m_EditorHideFlags: 0
11+
m_Script: {fileID: 337831424, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
12+
m_Name: Lava
13+
m_EditorClassIdentifier:
14+
m_NextId: 0
15+
m_Tracks:
16+
- {fileID: 114095226489604638}
17+
- {fileID: 114108508051644258}
18+
m_FixedDuration: 0
19+
m_EditorSettings:
20+
m_Framerate: 60
21+
m_DurationMode: 0
22+
m_Version: 0
23+
--- !u!114 &114095226489604638
24+
MonoBehaviour:
25+
m_ObjectHideFlags: 1
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInternal: {fileID: 0}
28+
m_GameObject: {fileID: 0}
29+
m_Enabled: 1
30+
m_EditorHideFlags: 0
31+
m_Script: {fileID: 1467732076, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
32+
m_Name: Animation Track
33+
m_EditorClassIdentifier:
34+
m_Locked: 0
35+
m_Muted: 0
36+
m_CustomPlayableFullTypename:
37+
m_AnimClip: {fileID: 0}
38+
m_Parent: {fileID: 11400000}
39+
m_Children: []
40+
m_Clips: []
41+
m_Version: 1
42+
m_OpenClipPreExtrapolation: 0
43+
m_OpenClipPostExtrapolation: 0
44+
m_OpenClipOffsetPosition: {x: 0, y: 0, z: 0}
45+
m_OpenClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
46+
m_OpenClipTimeOffset: 0
47+
m_MatchTargetFields: 63
48+
m_Position: {x: 0, y: 0, z: 0}
49+
m_EulerAngles: {x: 0, y: 0, z: 0}
50+
m_ApplyOffsets: 0
51+
m_AvatarMask: {fileID: 0}
52+
m_ApplyAvatarMask: 1
53+
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
54+
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
55+
--- !u!114 &114108508051644258
56+
MonoBehaviour:
57+
m_ObjectHideFlags: 1
58+
m_CorrespondingSourceObject: {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: 91e2f746a277d0947bf948127a0700ad, type: 3}
64+
m_Name: Local Time Track
65+
m_EditorClassIdentifier:
66+
m_Locked: 0
67+
m_Muted: 0
68+
m_CustomPlayableFullTypename:
69+
m_AnimClip: {fileID: 0}
70+
m_Parent: {fileID: 11400000}
71+
m_Children: []
72+
m_Clips:
73+
- m_Start: 0
74+
m_ClipIn: 0
75+
m_Asset: {fileID: 114894526773570620}
76+
m_Duration: 10
77+
m_TimeScale: 1
78+
m_ParentTrack: {fileID: 114108508051644258}
79+
m_EaseInDuration: 0
80+
m_EaseOutDuration: 0
81+
m_BlendInDuration: 0
82+
m_BlendOutDuration: 0
83+
m_MixInCurve:
84+
serializedVersion: 2
85+
m_Curve:
86+
- serializedVersion: 3
87+
time: 0
88+
value: 0
89+
inSlope: 0
90+
outSlope: 0
91+
tangentMode: 0
92+
weightedMode: 0
93+
inWeight: 0
94+
outWeight: 0
95+
- serializedVersion: 3
96+
time: 1
97+
value: 1
98+
inSlope: 0
99+
outSlope: 0
100+
tangentMode: 0
101+
weightedMode: 0
102+
inWeight: 0
103+
outWeight: 0
104+
m_PreInfinity: 2
105+
m_PostInfinity: 2
106+
m_RotationOrder: 4
107+
m_MixOutCurve:
108+
serializedVersion: 2
109+
m_Curve:
110+
- serializedVersion: 3
111+
time: 0
112+
value: 1
113+
inSlope: 0
114+
outSlope: 0
115+
tangentMode: 0
116+
weightedMode: 0
117+
inWeight: 0
118+
outWeight: 0
119+
- serializedVersion: 3
120+
time: 1
121+
value: 0
122+
inSlope: 0
123+
outSlope: 0
124+
tangentMode: 0
125+
weightedMode: 0
126+
inWeight: 0
127+
outWeight: 0
128+
m_PreInfinity: 2
129+
m_PostInfinity: 2
130+
m_RotationOrder: 4
131+
m_BlendInCurveMode: 0
132+
m_BlendOutCurveMode: 0
133+
m_ExposedParameterNames: []
134+
m_AnimationCurves: {fileID: 0}
135+
m_Recordable: 0
136+
m_PostExtrapolationMode: 0
137+
m_PreExtrapolationMode: 0
138+
m_PostExtrapolationTime: 0
139+
m_PreExtrapolationTime: 0
140+
m_DisplayName: LocalTimeClip
141+
m_Version: 1
142+
m_Version: 1
143+
--- !u!114 &114894526773570620
144+
MonoBehaviour:
145+
m_ObjectHideFlags: 1
146+
m_CorrespondingSourceObject: {fileID: 0}
147+
m_PrefabInternal: {fileID: 0}
148+
m_GameObject: {fileID: 0}
149+
m_Enabled: 1
150+
m_EditorHideFlags: 0
151+
m_Script: {fileID: 11500000, guid: 14d3049c91ef38844a96b56715753f93, type: 3}
152+
m_Name: LocalTimeClip
153+
m_EditorClassIdentifier:
154+
template:
155+
param1: 0
156+
param2: 0
157+
vec1: {x: 0, y: 0, z: 0}

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.playable.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.shader

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ inline float DistanceFunction(float3 pos)
7171
// @endblock
7272

7373
// @block PostEffect
74+
float _LocalTime;
7475
float4 _LavaEmmisiveLow;
7576
float4 _LavaEmmisiveHigh;
7677
sampler2D _Noise;
@@ -99,17 +100,17 @@ float lavaFlow(in vec2 p)
99100
for (float i= 1.; i < 3.; i++)
100101
{
101102
//primary flow speed
102-
p += _Time.y * .6 * _FlowSpeed;
103+
p += _LocalTime * .6 * _FlowSpeed;
103104

104105
//secondary flow speed (speed of the perceived flow)
105-
bp += _Time.y * 1.9 * _FlowSpeed;
106+
bp += _LocalTime * 1.9 * _FlowSpeed;
106107

107-
//displacement field (try changing _Time.y multiplier)
108-
vec2 gr = gradn(i*p*.34 + _Time.y * 1.);
108+
//displacement field (try changing _LocalTime multiplier)
109+
vec2 gr = gradn(i*p*.34 + _LocalTime * 1.);
109110

110111
//rotation of the displacement field
111-
// gr *= rotateMat(_Time.y * 6.-(0.05 * p.x + 0.03 * p.y) * 40.);
112-
gr = mul(rotateMat(_Time.y * 6.-(0.05 * p.x + 0.03 * p.y) * 40.), gr);
112+
// gr *= rotateMat(_LocalTime * 6.-(0.05 * p.x + 0.03 * p.y) * 40.);
113+
gr = mul(rotateMat(_LocalTime * 6.-(0.05 * p.x + 0.03 * p.y) * 40.), gr);
113114

114115
//displace the system
115116
p += gr*.5;

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.unity

Lines changed: 84 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,76 @@ Transform:
177177
m_LocalScale: {x: 1, y: 1, z: 1}
178178
m_Children: []
179179
m_Father: {fileID: 0}
180-
m_RootOrder: 1
180+
m_RootOrder: 2
181181
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
182+
--- !u!1 &1630964853
183+
GameObject:
184+
m_ObjectHideFlags: 0
185+
m_CorrespondingSourceObject: {fileID: 0}
186+
m_PrefabInternal: {fileID: 0}
187+
serializedVersion: 6
188+
m_Component:
189+
- component: {fileID: 1630964856}
190+
- component: {fileID: 1630964855}
191+
- component: {fileID: 1630964854}
192+
m_Layer: 0
193+
m_Name: Director
194+
m_TagString: Untagged
195+
m_Icon: {fileID: 0}
196+
m_NavMeshLayer: 0
197+
m_StaticEditorFlags: 0
198+
m_IsActive: 1
199+
--- !u!95 &1630964854
200+
Animator:
201+
serializedVersion: 3
202+
m_ObjectHideFlags: 0
203+
m_CorrespondingSourceObject: {fileID: 0}
204+
m_PrefabInternal: {fileID: 0}
205+
m_GameObject: {fileID: 1630964853}
206+
m_Enabled: 1
207+
m_Avatar: {fileID: 0}
208+
m_Controller: {fileID: 0}
209+
m_CullingMode: 0
210+
m_UpdateMode: 0
211+
m_ApplyRootMotion: 1
212+
m_LinearVelocityBlending: 0
213+
m_WarningMessage:
214+
m_HasTransformHierarchy: 1
215+
m_AllowConstantClipSamplingOptimization: 1
216+
m_KeepAnimatorControllerStateOnDisable: 0
217+
--- !u!320 &1630964855
218+
PlayableDirector:
219+
m_ObjectHideFlags: 0
220+
m_CorrespondingSourceObject: {fileID: 0}
221+
m_PrefabInternal: {fileID: 0}
222+
m_GameObject: {fileID: 1630964853}
223+
m_Enabled: 1
224+
serializedVersion: 3
225+
m_PlayableAsset: {fileID: 11400000, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
226+
m_InitialState: 1
227+
m_WrapMode: 2
228+
m_DirectorUpdateMode: 1
229+
m_InitialTime: 0
230+
m_SceneBindings:
231+
- key: {fileID: 114095226489604638, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
232+
value: {fileID: 1630964854}
233+
- key: {fileID: 114108508051644258, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
234+
value: {fileID: 1943384523}
235+
m_ExposedReferences:
236+
m_References: []
237+
--- !u!4 &1630964856
238+
Transform:
239+
m_ObjectHideFlags: 0
240+
m_CorrespondingSourceObject: {fileID: 0}
241+
m_PrefabInternal: {fileID: 0}
242+
m_GameObject: {fileID: 1630964853}
243+
m_LocalRotation: {x: -0, y: -0, z: 0.000000003259629, w: 1}
244+
m_LocalPosition: {x: 1.1510966, y: -0.18039036, z: -0.1286056}
245+
m_LocalScale: {x: 1, y: 1, z: 1}
246+
m_Children: []
247+
m_Father: {fileID: 0}
248+
m_RootOrder: 0
249+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
182250
--- !u!1 &1896176113
183251
GameObject:
184252
m_ObjectHideFlags: 0
@@ -338,7 +406,7 @@ Transform:
338406
m_LocalScale: {x: 1, y: 1, z: 1}
339407
m_Children: []
340408
m_Father: {fileID: 0}
341-
m_RootOrder: 0
409+
m_RootOrder: 1
342410
m_LocalEulerAnglesHint: {x: 33.67, y: 0, z: -8}
343411
--- !u!1 &1943384519
344412
GameObject:
@@ -350,6 +418,7 @@ GameObject:
350418
- component: {fileID: 1943384522}
351419
- component: {fileID: 1943384521}
352420
- component: {fileID: 1943384520}
421+
- component: {fileID: 1943384523}
353422
m_Layer: 0
354423
m_Name: Lava
355424
m_TagString: Untagged
@@ -410,5 +479,17 @@ Transform:
410479
m_LocalScale: {x: 1, y: 1, z: 1}
411480
m_Children: []
412481
m_Father: {fileID: 0}
413-
m_RootOrder: 2
482+
m_RootOrder: 3
414483
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
484+
--- !u!114 &1943384523
485+
MonoBehaviour:
486+
m_ObjectHideFlags: 0
487+
m_CorrespondingSourceObject: {fileID: 0}
488+
m_PrefabInternal: {fileID: 0}
489+
m_GameObject: {fileID: 1943384519}
490+
m_Enabled: 1
491+
m_EditorHideFlags: 0
492+
m_Script: {fileID: 11500000, guid: b0b647505e89aa24da8865ec9a806443, type: 3}
493+
m_Name:
494+
m_EditorClassIdentifier:
495+
material: {fileID: 2100000, guid: 284054621dbab4ebaa11a42ec830b649, type: 2}

0 commit comments

Comments
 (0)