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

Updated CYL_Controlller with Philip

Browse source
This commit is contained in:
max 2020-01-08 16:59:22 +01:00
parent 33d2cc5444
commit 45db9bc4a1
8 changed files with 176 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UnityProject/Assets/Polybrush Data.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d2ffacbc3f26ffe4e94f873800ce870c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UnityProject/Assets/Polybrush Data/Brush Settings.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 724a7fa50d05ebc4d8456c54a1e92bcd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UnityProject/Assets/Scenes/Examples/Max Silly Demos.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 35edaba459ee497418ef7f2da8e4f25f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UnityProject/Assets/Scenes/Examples/Max Silly Demos/3DModels.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 244cf462d93bf8d42a242c3f6d43f66f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@ -8,7 +8,8 @@ namespace cylvester
public class TimelineController : MonoBehaviour
{
[SerializeField] private PlayableDirector playableDirector;
[SerializeField] private StateManager stateManager;
//[SerializeField] private StateManager stateManager;
[SerializeField] private float initTransitionFactor = 1f;
@ -16,9 +17,12 @@ namespace cylvester
private Boundary boundary_;
private float speed_;
private float transitionTargetRealtime_;
private float previousMarkerTime_;
private float nextMarkerTime_;
private float previousMarkerTime_; //marker at which transition ends (if reversed)
private float nextMarkerTime_; //marker at which transition ends (if forward)
private bool transitionDirectionReverse_;
private bool instantTriggerMode;
private string lastStateName = "";
public void Start()
{
@ -36,6 +40,7 @@ namespace cylvester
public void OnStateChanged(IStateReader stateManager)
{
var stateName = stateManager.CurrentState.Title;
lastStateName = stateName;
var numMarkers = qlistMarkers_.Count;
for (var i = 0; i < numMarkers; ++i)
{
@ -43,33 +48,54 @@ namespace cylvester
continue;
playableDirector.time = qlistMarkers_[i].time;
var previousMarkerTime = i > 0 ? (double?) qlistMarkers_[i - 1].time : 0;
var nextMarkerTime = i < numMarkers - 1 ? (double?) qlistMarkers_[i + 1].time : qlistMarkers_[numMarkers - 1].time;
previousMarkerTime_ = (float) previousMarkerTime;
nextMarkerTime_ = (float) nextMarkerTime;
var previousMarkerTime = i > 0 ? (double?)qlistMarkers_[i - 1].time : 0;
var nextMarkerTime = i < numMarkers - 1 ? (double?)qlistMarkers_[i + 1].time : qlistMarkers_[numMarkers - 1].time;
previousMarkerTime_ = (float)previousMarkerTime;
nextMarkerTime_ = (float)nextMarkerTime;
boundary_ = new Boundary(previousMarkerTime, nextMarkerTime);
playableDirector.Play();
Debug.Log("prev=" + (i - 1) + " next=" + (i + 1));
break;
}
}
public double getStartMarkerTime() //Return time of marker where the current running animation started
{
var numMarkers = qlistMarkers_.Count;
for (var i = 0; i < numMarkers; ++i)
{
if (qlistMarkers_[i].id != lastStateName)
continue;
return qlistMarkers_[i].time;
}
return 0;
}
private void Update()
{
if (playableDirector.state == PlayState.Paused)
return;
if (!(Time.fixedUnscaledTime >= transitionTargetRealtime_)) // check if Transition has not finished yet
{
if (!transitionDirectionReverse_) // if transition direction forward, speed becomes positive
{
if (!instantTriggerMode)
{
speed_ = CalculateTransitionSpeed(nextMarkerTime_);
}
}
else // if transition direction backward, speed becomes negative
{
if (!instantTriggerMode)
{
speed_ = CalculateTransitionSpeed(previousMarkerTime_);
}
}
}
var deltaTime = Time.deltaTime;
var expectedTimeIncrement = speed_ * deltaTime;
@ -83,12 +109,11 @@ namespace cylvester
else
{
//sets playhead precisly to marker position at the end of transition.
if (!transitionDirectionReverse_)
if (!transitionDirectionReverse_) //forward
{
playableDirector.time = nextMarkerTime_;
}
else
else //backward
{
playableDirector.time = previousMarkerTime_;
}
@ -104,8 +129,11 @@ namespace cylvester
}
public void UpdateTransitionTargetRealTime(float restTime, bool reverse)
{
instantTriggerMode = false; //update speed continuous
transitionDirectionReverse_ = reverse;
transitionTargetRealtime_ = Time.fixedUnscaledTime + restTime;
}
@ -113,13 +141,40 @@ namespace cylvester
private float CalculateTransitionSpeed(float targetMarkerTime)
{
var transitionSpeed = (targetMarkerTime - playableDirector.time) / (transitionTargetRealtime_ - Time.fixedUnscaledTime);
return (float) transitionSpeed;
return (float)transitionSpeed;
}
public bool animationPaused()
{
return playableDirector.state == PlayState.Paused;
}
public void abortAnimation()
{
if (animationPaused()) //safe check
{
return;
}
if (!transitionDirectionReverse_) //forward
{
transitionDirectionReverse_ = !transitionDirectionReverse_; //invert direction
previousMarkerTime_ = (float)getStartMarkerTime();
}
else //backward
{
transitionDirectionReverse_ = !transitionDirectionReverse_; //invert direction
nextMarkerTime_ = (float)getStartMarkerTime();
}
boundary_ = new Boundary(previousMarkerTime_, nextMarkerTime_); //Update Boundary to stop animation when target reached
}
public void instantTrigger(float speed)
{
speed_ = speed;
instantTriggerMode = true; //keep speed_ constant
transitionDirectionReverse_ = speed < 0;
playableDirector.Play();
}
}
}
/*
if (reverse_ == true)
{
speed_ = speed_* -1;
}
*/

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

@ -196,7 +196,7 @@ MonoBehaviour:
timelineController: {fileID: 65620555}
channel: 3
stateManager: {fileID: 850208555}
instaTransitionSpeed: 1
instaTransitionSpeed: 10
--- !u!114 &65620555
MonoBehaviour:
m_ObjectHideFlags: 0
@ -210,7 +210,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
playableDirector: {fileID: 65620552}
stateManager: {fileID: 850208555}
initTransitionFactor: 8
--- !u!1 &155821760
GameObject:

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

@ -10,8 +10,8 @@ namespace cylvester
{
OneBarLoopButton = 94,
FourBarLoopButton = 86,
NextSelectedScene = 18,
CurrentSelectedScene = 17,
NextSelectedTransition = 18,
CurrentSelectedAnimation = 17,
InstantTrigger = 2,
}
@ -27,16 +27,20 @@ namespace cylvester
private ScheduledAction scheduledAction_;
private int currentTick_;
private int currentSelectedScene_ ;
private int nextSelectedScene_;
private int currentSelectedAnimation_;
private int nextSelectedMarker_;
private void Start()
{
scheduledAction_ = new ScheduledAction(() =>
{
stateManager.SelectedState = currentSelectedScene_;
playableDirector.playableGraph.GetRootPlayable(0).SetSpeed(instaTransitionSpeed);
stateManager.SelectedState = currentSelectedAnimation_;
//playableDirector.playableGraph.GetRootPlayable(0).SetSpeed(instaTransitionSpeed);
timelineController.instantTrigger(instaTransitionSpeed);
});
currentSelectedAnimation_ = 0;
nextSelectedMarker_ = 1;
}
public void OnSyncReceived(MidiSync midiSync, int counter)
@ -51,54 +55,55 @@ namespace cylvester
var command = (CylCommand)mes.Data1;
switch (command)
{
case CylCommand.NextSelectedScene:
{
nextSelectedScene_ = mes.Data2;
case CylCommand.NextSelectedTransition:
nextSelectedMarker_ = mes.Data2; //next marker only used for direction
Debug.Log("command nextSelectedMarker_=" + nextSelectedMarker_);
break;
}
case CylCommand.InstantTrigger:
{
scheduledAction_.Ready();
break;
}
case CylCommand.CurrentSelectedScene:
{
currentSelectedScene_ = mes.Data2;
case CylCommand.CurrentSelectedAnimation:
currentSelectedAnimation_ = mes.Data2;
Debug.Log("command currentSelectedAnimation_=" + currentSelectedAnimation_);
scheduledAction_.Go();
break;
}
case CylCommand.FourBarLoopButton:
{
var restTime = CalculateRestTime(FourBarTrigger - currentTick_ % FourBarTrigger);
if (nextSelectedScene_ > currentSelectedScene_)
{
timelineController.UpdateTransitionTargetRealTime(restTime, false);
stateManager.SelectedState = nextSelectedScene_;
}
else
{
timelineController.UpdateTransitionTargetRealTime(restTime, true);
stateManager.SelectedState = nextSelectedScene_ + 1;
}
break;
}
case CylCommand.FourBarLoopButton:
case CylCommand.OneBarLoopButton:
float restTime=0;
switch(command)
{
var restTime = CalculateRestTime(OneBarTrigger - currentTick_ % OneBarTrigger);
if (nextSelectedScene_ > currentSelectedScene_)
{
timelineController.UpdateTransitionTargetRealTime(restTime, false);
stateManager.SelectedState = nextSelectedScene_;
}
else
{
timelineController.UpdateTransitionTargetRealTime(restTime, true);
stateManager.SelectedState = nextSelectedScene_ + 1;
}
case CylCommand.FourBarLoopButton:
restTime = CalculateRestTime(FourBarTrigger - currentTick_ % FourBarTrigger);
break;
case CylCommand.OneBarLoopButton:
restTime = CalculateRestTime(OneBarTrigger - currentTick_ % OneBarTrigger);
break;
}
Debug.Log("currentSelectedAnimation_=" + currentSelectedAnimation_);
Debug.Log("nextSelectedScene_=" + nextSelectedMarker_);
bool _reverse = nextSelectedMarker_ <= currentSelectedAnimation_; //nextSelectedMarker_ used to calculate direction
if (timelineController.animationPaused())
{
timelineController.UpdateTransitionTargetRealTime(restTime, _reverse);
stateManager.SelectedState = currentSelectedAnimation_ + 1; //marker at which transition starts
}
else //trigger pressed while animation running
{
timelineController.abortAnimation();
}
break;
default:
Debug.Log("Unexpected Command: " + mes.Data1);
throw new Exception("Unexpected CYL command");
}
}

12
UnityProject/Assets/Scripts/StateManagement/StateManager.cs
View file

@ -85,6 +85,14 @@ namespace cylvester
set
{
sceneSelection = value;
if (value > States.Length - 1)
{ //if index out of bounds
sceneSelection = States.Length - 1; //set to last index
}
else if (value < 0)
{
sceneSelection = 0;
}
onStateChanged.Invoke(this);
}
get
@ -104,10 +112,12 @@ namespace cylvester
case Operation.Previous:
if (sceneSelection == 0) return;
sceneSelection--;
sceneSelection = Math.Max(sceneSelection, 0); //constrain minimum
break;
case Operation.Next:
if (sceneSelection >= States.Length - 1) return;
sceneSelection++;
sceneSelection = Math.Min(sceneSelection, States.Length - 1); //constrain maximum
break;
default:
return;
@ -127,10 +137,12 @@ namespace cylvester
case Operation.Previous:
if (sceneSelection == 0) return;
sceneSelection--;
sceneSelection = Math.Max(sceneSelection, 0); //constrain minimum
break;
case Operation.Next:
if (sceneSelection >= States.Length - 1) return;
sceneSelection++;
sceneSelection = Math.Min(sceneSelection, States.Length - 1); //constrain maximum
break;
default:
return;