Add TimelineTimeControl

Author: gam0022

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

@@ -13,10 +13,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_NextId: 0
   m_Tracks:
-  - {fileID: 114095226489604638}
-  - {fileID: 114108508051644258}
-  - {fileID: 114251598533192302}
   - {fileID: 114560600937763692}
+  - {fileID: 114251598533192302}
+  - {fileID: 114117769261169240}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
@@ -501,48 +500,16 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_GenerateMotionCurves: 1
   m_Events: []
---- !u!114 &114095226489604638
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1467732076, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
-  m_Name: Animation Track
-  m_EditorClassIdentifier: 
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_AnimClip: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children: []
-  m_Clips: []
-  m_Version: 1
-  m_OpenClipPreExtrapolation: 0
-  m_OpenClipPostExtrapolation: 0
-  m_OpenClipOffsetPosition: {x: 0, y: 0, z: 0}
-  m_OpenClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
-  m_OpenClipTimeOffset: 0
-  m_MatchTargetFields: 63
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_ApplyOffsets: 0
-  m_AvatarMask: {fileID: 0}
-  m_ApplyAvatarMask: 1
-  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
---- !u!114 &114108508051644258
+--- !u!114 &114117769261169240
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 91e2f746a277d0947bf948127a0700ad, type: 3}
-  m_Name: Local Time Track
+  m_Script: {fileID: -1095772578, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
+  m_Name: Control Track
   m_EditorClassIdentifier: 
   m_Locked: 0
   m_Muted: 0
@@ -553,10 +520,10 @@ MonoBehaviour:
   m_Clips:
   - m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 114894526773570620}
+    m_Asset: {fileID: 114499531051087166}
     m_Duration: 10
     m_TimeScale: 1
-    m_ParentTrack: {fileID: 114108508051644258}
+    m_ParentTrack: {fileID: 114117769261169240}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: 0
@@ -618,7 +585,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: LocalTimeClip
+    m_DisplayName: TimelineTime
     m_Version: 1
   m_Version: 1
 --- !u!114 &114148755703378248
@@ -674,6 +641,47 @@ MonoBehaviour:
   m_ApplyAvatarMask: 1
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &114252730188695332
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e97b7684a1a63ed42afa5e89e962140f, type: 3}
+  m_Name: Light Control Track
+  m_EditorClassIdentifier: 
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_AnimClip: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips: []
+  m_Version: 1
+--- !u!114 &114499531051087166
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1670381969, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
+  m_Name: ControlPlayableAsset
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: ad17c660b169eba4f9ae6687752313f4
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 6206
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
 --- !u!114 &114560600937763692
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -858,18 +866,3 @@ MonoBehaviour:
   m_ApplyAvatarMask: 1
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
---- !u!114 &114894526773570620
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 14d3049c91ef38844a96b56715753f93, type: 3}
-  m_Name: LocalTimeClip
-  m_EditorClassIdentifier: 
-  template:
-    param1: 0
-    param2: 0
-    vec1: {x: 0, y: 0, z: 0}

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

@@ -71,7 +71,7 @@ inline float DistanceFunction(float3 pos)
 // @endblock
 
 // @block PostEffect
-float _LocalTime;
+float _TimelineTime;
 float4 _LavaEmmisiveLow;
 float4 _LavaEmmisiveHigh;
 sampler2D _Noise;
@@ -100,17 +100,17 @@ float lavaFlow(in vec2 p)
 	for (float i= 1.; i < 4.; i++)
 	{
 		//primary flow speed
-		p += _LocalTime * .6 * _FlowSpeed;
+		p += _TimelineTime * .6 * _FlowSpeed;
 
 		//secondary flow speed (speed of the perceived flow)
-		bp += _LocalTime * 1.9 * _FlowSpeed;
+		bp += _TimelineTime * 1.9 * _FlowSpeed;
 
-		//displacement field (try changing _LocalTime multiplier)
-		vec2 gr = gradn(i*p*.34 + _LocalTime * 1.);
+		//displacement field (try changing _TimelineTime multiplier)
+		vec2 gr = gradn(i*p*.34 + _TimelineTime * 1.);
 
 		//rotation of the displacement field
-		// gr *= rotateMat(_LocalTime * 6.-(0.05 * p.x + 0.03 * p.y) * 40.);
-		gr = mul(rotateMat(_LocalTime * 6.-(0.05 * p.x + 0.03 * p.y) * 40.), gr);
+		// gr *= rotateMat(_TimelineTime * 6.-(0.05 * p.x + 0.03 * p.y) * 40.);
+		gr = mul(rotateMat(_TimelineTime * 6.-(0.05 * p.x + 0.03 * p.y) * 40.), gr);
 
 		//displace the system
 		p += gr*.5;

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

@@ -113,6 +113,46 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &293216295
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 293216297}
+  - component: {fileID: 293216296}
+  m_Layer: 0
+  m_Name: TimelineTime
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &293216296
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 293216295}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b869d8ec361c10e41b4bbf135c235d7c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &293216297
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 293216295}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &326207133
 GameObject:
   m_ObjectHideFlags: 1
@@ -327,9 +367,9 @@ PlayableDirector:
   m_DirectorUpdateMode: 1
   m_InitialTime: 0
   m_SceneBindings:
-  - key: {fileID: 114095226489604638, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 1630964854}
-  - key: {fileID: 114108508051644258, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 1943384523}
   - key: {fileID: 114560600937763692, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
     value: {fileID: 0}
@@ -340,7 +380,10 @@ PlayableDirector:
   - key: {fileID: 114251598533192302, guid: 1d45eba0017a04d18a33df89d883621b, type: 2}
     value: {fileID: 1896176120}
   m_ExposedReferences:
-    m_References: []
+    m_References:
+    - a440923a9b2f2eb4582b870bd88e50e3: {fileID: 1630964853}
+    - ad17c660b169eba4f9ae6687752313f4: {fileID: 293216295}
+    - a4dc877255c424e4f8305baaeabec334: {fileID: 1630964853}
 --- !u!4 &1630964856
 Transform:
   m_ObjectHideFlags: 0

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

@@ -0,0 +1,20 @@
+using UnityEngine;
+using UnityEngine.Timeline;
+
+public class TimelineTimeControl : MonoBehaviour, ITimeControl
+{
+    readonly int timelineTimeId = Shader.PropertyToID("_TimelineTime");
+
+    public void SetTime(double time)
+    {
+        Shader.SetGlobalFloat(timelineTimeId, (float) time);
+    }
+
+    public void OnControlTimeStart()
+    {
+    }
+
+    public void OnControlTimeStop()
+    {
+    }
+}