Skip to content

Commit b7de455

Browse files
committed
Create Timeline/RaymarchingWorldSandwich
1 parent fa6d984 commit b7de455

14 files changed

+68
-55
lines changed

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

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-05-28-Sandwich/Sandwich.unity

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,13 @@ ReflectionProbe:
391391
m_TimeSlicingMode: 0
392392
m_Resolution: 32
393393
m_UpdateFrequency: 0
394-
m_BoxSize: {x: 10, y: 10, z: 10}
394+
m_BoxSize: {x: 100, y: 100, z: 100}
395395
m_BoxOffset: {x: 0, y: 0, z: 0}
396396
m_NearClip: 0.3
397397
m_FarClip: 1000
398398
m_ShadowDistance: 100
399399
m_ClearFlags: 1
400-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
400+
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
401401
m_CullingMask:
402402
serializedVersion: 2
403403
m_Bits: 1
@@ -630,6 +630,8 @@ PlayableDirector:
630630
m_SceneBindings:
631631
- key: {fileID: 114157750213672622, guid: c4c3e38fc3ca1f84f8aa6216618d29d7, type: 2}
632632
value: {fileID: 2022267216}
633+
- key: {fileID: 114844554438964780, guid: c4c3e38fc3ca1f84f8aa6216618d29d7, type: 2}
634+
value: {fileID: 509048561}
633635
m_ExposedReferences:
634636
m_References: []
635637
--- !u!4 &2022267219

Assets/Demoscene/Scripts/Playables/RaymarchingWorldSandwich/RaymarchingWorldSandwichBehaviour.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

Assets/Demoscene/Scripts/Playables/RaymarchingWorldSandwich/RaymarchingWorldSandwichClip.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

Assets/Demoscene/Scripts/Playables/RaymarchingWorldSandwich.meta renamed to Assets/Demoscene/Scripts/Timeline/RaymarchingWolrdSandwich.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System;
2+
using UnityEngine;
3+
using UnityEngine.Playables;
4+
using UnityEngine.Timeline;
5+
using Demoscene;
6+
7+
[Serializable]
8+
public class RaymarchingWolrdSandwichBehaviour : PlayableBehaviour
9+
{
10+
public float param1;
11+
public float param2;
12+
public Vector3 vec1;
13+
14+
public override void OnPlayableCreate (Playable playable)
15+
{
16+
17+
}
18+
}

Assets/Demoscene/Scripts/Playables/RaymarchingWorldSandwich/RaymarchingWorldSandwichTrack.cs.meta renamed to Assets/Demoscene/Scripts/Timeline/RaymarchingWolrdSandwich/RaymarchingWolrdSandwichBehaviour.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System;
2+
using UnityEngine;
3+
using UnityEngine.Playables;
4+
using UnityEngine.Timeline;
5+
using Demoscene;
6+
7+
[Serializable]
8+
public class RaymarchingWolrdSandwichClip : PlayableAsset, ITimelineClipAsset
9+
{
10+
public RaymarchingWolrdSandwichBehaviour template = new RaymarchingWolrdSandwichBehaviour ();
11+
12+
public ClipCaps clipCaps
13+
{
14+
get { return ClipCaps.None; }
15+
}
16+
17+
public override Playable CreatePlayable (PlayableGraph graph, GameObject owner)
18+
{
19+
var playable = ScriptPlayable<RaymarchingWolrdSandwichBehaviour>.Create (graph, template);
20+
RaymarchingWolrdSandwichBehaviour clone = playable.GetBehaviour ();
21+
return playable;
22+
}
23+
}

Assets/Demoscene/Scripts/Playables/RaymarchingWorldSandwich/RaymarchingWorldSandwichClip.cs.meta renamed to Assets/Demoscene/Scripts/Timeline/RaymarchingWolrdSandwich/RaymarchingWolrdSandwichClip.cs.meta

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

0 commit comments

Comments
 (0)