maximilian.schweder/soundvision
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed an error

Browse source
This commit is contained in:
max 2019-12-06 17:56:36 +01:00
parent a757349071
commit 24c7c805bc
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UnityProject/Assets/Scenes/Examples/Qlist/scripts/TimelineController.cs
View file

@ -53,7 +53,7 @@ namespace cylvester
Debug.Log("next State " + prevState.Title); Debug.Log("next State " + prevState.Title);
Debug.Log("prev State " + prevState.Title); Debug.Log("prev State " + prevState.Title);
if (notification.id == nextState.Title || notification.id == prevState.Title) if (notification.id == nextState.Title)
{ {
playableDirector.Pause(); // reaches the next state (marker) in timeline playableDirector.Pause(); // reaches the next state (marker) in timeline
playableDirector.playableGraph.GetRootPlayable(0).SetSpeed(initTransitionFactor); // Max added this instead of .Stop playableDirector.playableGraph.GetRootPlayable(0).SetSpeed(initTransitionFactor); // Max added this instead of .Stop

7
UnityProject/Assets/Scenes/Examples/VisualEffectGraph/VFX Graph Plane.unity
View file

@ -192,13 +192,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 295c71eba0347b04aa841307f8555e7b, type: 3} m_Script: {fileID: 11500000, guid: 295c71eba0347b04aa841307f8555e7b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
oneBarLoopButton: 86
fourBarLoopButton: 94
playableDirector: {fileID: 65620552} playableDirector: {fileID: 65620552}
currentSelectedScene: 0
nextSelectedScene: 0
channel: 3 channel: 3
stateManager: {fileID: 850208555} stateManager: {fileID: 850208555}
instaTransitionSpeed: 10
--- !u!114 &65620555 --- !u!114 &65620555
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1242,7 +1239,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
logAll: 0 logAll: 0
logFiltered: 1 logFiltered: 0
filterStatusByte: 178 filterStatusByte: 178
--- !u!1 &859452785 --- !u!1 &859452785
GameObject: GameObject:

6
UnityProject/Assets/Scripts/PdConnection/CylMidiTransitionController.cs
View file

@ -77,9 +77,9 @@ namespace cylvester
case (byte) CYL_Command.FourBarLoopButton: case (byte) CYL_Command.FourBarLoopButton:
if (nextSelectedScene > currentSelectedScene) if (nextSelectedScene > currentSelectedScene)
{ {
RestTime(fourBarTrigger - currentTick % fourBarTrigger); RestTime(fourBarTrigger - currentTick % fourBarTrigger);
TimelinePlaybackSpeed((int) Timeline_Command.Forwards); TimelinePlaybackSpeed((int) Timeline_Command.Forwards);
stateManager.SelectedState = nextSelectedScene; stateManager.SelectedState = nextSelectedScene;
} }
else else
{ {