mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

additive angle in rhythm rally

Browse source
This commit is contained in:
minenice55 2024-01-05 20:42:19 -05:00
parent 8422e75b07
commit a51f13194a
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Assets/Scripts/Games/RhythmRally/RhythmRally.cs
View file

@ -90,7 +90,7 @@ namespace HeavenStudio.Games.Loaders
function = delegate { function = delegate {
var e = eventCaller.currentEntity; var e = eventCaller.currentEntity;
// var rotation = new Vector3(0, e["valA"], 0); // var rotation = new Vector3(0, e["valA"], 0);
RhythmRally.instance.ChangeCameraAngle(e.beat, e["valA"], e["valB"], e.length, (Util.EasingFunction.Ease)e["type"]); RhythmRally.instance.ChangeCameraAngle(e.beat, e["valA"], e["valB"], e.length, (Util.EasingFunction.Ease)e["type"], e["additive"]);
}, },
defaultLength = 4, defaultLength = 4,
resizable = true, resizable = true,
@ -98,7 +98,7 @@ namespace HeavenStudio.Games.Loaders
new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Angle", "The rotation of the camera around the center of the table"), new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Angle", "The rotation of the camera around the center of the table"),
new Param("valB", new EntityTypes.Float(0.5f, 4f, 1), "Zoom", "The camera's level of zoom (Lower value = Zoomed in)"), new Param("valB", new EntityTypes.Float(0.5f, 4f, 1), "Zoom", "The camera's level of zoom (Lower value = Zoomed in)"),
new Param("type", Util.EasingFunction.Ease.Linear, "Ease", "The easing function to use"), new Param("type", Util.EasingFunction.Ease.Linear, "Ease", "The easing function to use"),
// new Param("type2", RotateMode.Fast, "Rotation Mode", "The rotation mode to use") new Param("additive", true, "Additive Rotation", "Add to current angle instead of setting target angle")
} }
}, },
// todo: background recolouring // todo: background recolouring
@ -407,7 +407,7 @@ namespace HeavenStudio.Games
foreach (var entity in cameraEntities) foreach (var entity in cameraEntities)
{ {
ChangeCameraAngle(entity.beat, entity["valA"], entity["valB"], entity.length, (Util.EasingFunction.Ease)entity["type"]); ChangeCameraAngle(entity.beat, entity["valA"], entity["valB"], entity.length, (Util.EasingFunction.Ease)entity["type"], entity["additive"]);
} }
UpdateCamera(beat); UpdateCamera(beat);
@ -419,6 +419,7 @@ namespace HeavenStudio.Games
{ {
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(cameraRotateEase); Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(cameraRotateEase);
float rotProg = Conductor.instance.GetPositionFromBeat(cameraRotateBeat, cameraRotateLength, true); float rotProg = Conductor.instance.GetPositionFromBeat(cameraRotateBeat, cameraRotateLength, true);
rotProg = Mathf.Clamp01(rotProg);
float rot = func(cameraRotateLast, cameraRotateNext, rotProg); float rot = func(cameraRotateLast, cameraRotateNext, rotProg);
cameraPivot.rotation = Quaternion.Euler(0, rot, 0); cameraPivot.rotation = Quaternion.Euler(0, rot, 0);
cameraPivot.localScale = Vector3.one * func(cameraScaleLast, cameraScaleNext, rotProg); cameraPivot.localScale = Vector3.one * func(cameraScaleLast, cameraScaleNext, rotProg);
@ -558,15 +559,22 @@ namespace HeavenStudio.Games
inPose = true; inPose = true;
} }
public void ChangeCameraAngle(double beat, float rotation, float camZoom, double length, Util.EasingFunction.Ease ease) public void ChangeCameraAngle(double beat, float rotation, float camZoom, double length, Util.EasingFunction.Ease ease, bool additive = true)
{ {
cameraRotateBeat = beat; cameraRotateBeat = beat;
cameraRotateLength = length; cameraRotateLength = length;
cameraRotateEase = ease; cameraRotateEase = ease;
cameraRotateLast = cameraRotateNext; cameraRotateLast = cameraRotateNext % 360f;
cameraScaleLast = cameraScaleNext; cameraScaleLast = cameraScaleNext;
cameraRotateNext = rotation;
cameraScaleNext = camZoom; cameraScaleNext = camZoom;
if (additive)
{
cameraRotateNext = cameraRotateLast + rotation;
}
else
{
cameraRotateNext = rotation;
}
} }
public void PrepareFastRally(double beat, RallySpeed speedChange, bool muteAudio = false) public void PrepareFastRally(double beat, RallySpeed speedChange, bool muteAudio = false)