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

zoom out seperation

Browse source
This commit is contained in:
Rapandrasmus 2023-08-09 21:08:16 +02:00
parent a12fdafe0c
commit 8afff3bd53
1 changed files with 54 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
View file

@ -93,10 +93,24 @@ namespace HeavenStudio.Games.Loaders
function = delegate function = delegate
{ {
var e = eventCaller.currentEntity; var e = eventCaller.currentEntity;
MonkeyWatch.instance.ZoomOut(e.beat, e.length, e["timeMode"], e["hour"], e["minute"]); MonkeyWatch.instance.ZoomOut(e.beat, e["timeMode"], e["hour"], e["minute"]);
}, },
resizable = true, defaultLength = 2f,
defaultLength = 8f, parameters = new List<Param>()
{
new Param("timeMode", MonkeyWatch.TimeMode.RealTime, "Time Mode", "Will the clock set the time to the current time or a certain time?"),
new Param("hour", new EntityTypes.Integer(0, 12, 3), "Hour"),
new Param("minute", new EntityTypes.Integer(0, 59, 0), "Minute")
}
},
new GameAction("zoomIn", "Zoom In")
{
function = delegate
{
var e = eventCaller.currentEntity;
MonkeyWatch.instance.ZoomIn(e.beat, e["timeMode"], e["hour"], e["minute"]);
},
defaultLength = 2f,
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("timeMode", MonkeyWatch.TimeMode.RealTime, "Time Mode", "Will the clock set the time to the current time or a certain time?"), new Param("timeMode", MonkeyWatch.TimeMode.RealTime, "Time Mode", "Will the clock set the time to the current time or a certain time?"),
@ -191,28 +205,32 @@ namespace HeavenStudio.Games
monkeyClockArrow.PlayerClap(big, barely, false); monkeyClockArrow.PlayerClap(big, barely, false);
} }
public void ZoomOut(double beat, float length, int timeMode, int hours, int minutes) public void ZoomOut(double beat, int timeMode, int hours, int minutes)
{ {
length = Mathf.Max(zoomOutBeatLength + zoomInBeatLength, length);
zoomOutStartBeat = beat; zoomOutStartBeat = beat;
zoomOutLength = length; zoomIn = false;
backgroundHandler.SetFade(beat, 0.25f, true, (TimeMode)timeMode, hours, minutes); backgroundHandler.SetFade(beat, 0.25f, true, (TimeMode)timeMode, hours, minutes);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>() CameraUpdate();
{ }
new BeatAction.Action(beat + length - zoomInBeatLength, delegate public void ZoomIn(double beat, int timeMode, int hours, int minutes)
{ {
backgroundHandler.SetFade(beat + length - zoomInBeatLength, 0.25f, false, (TimeMode)timeMode, hours, minutes); zoomOutStartBeat = beat;
}) zoomIn = true;
}); backgroundHandler.SetFade(beat, 0.25f, false, (TimeMode)timeMode, hours, minutes);
CameraUpdate(); CameraUpdate();
} }
public void PersistZoomOut(double beat) public void PersistZoomOut(double beat)
{ {
var allZooms = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "zoomOut" }).FindAll(x => x.beat < beat && x.beat + Mathf.Max(4, x.length) > beat); var allZooms = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "zoomOut" }).FindAll(x => x.beat < beat && x.beat + x.length > beat);
foreach (var zoom in allZooms) foreach (var zoom in allZooms)
{ {
ZoomOut(zoom.beat, zoom.length, zoom["timeMode"], zoom["hour"], zoom["minute"]); ZoomOut(zoom.beat, zoom["timeMode"], zoom["hour"], zoom["minute"]);
}
var allZoomsIn = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "zoomIn" }).FindAll(x => x.beat < beat && x.beat + x.length > beat);
foreach (var zoom in allZoomsIn)
{
ZoomIn(zoom.beat, zoom["timeMode"], zoom["hour"], zoom["minute"]);
} }
} }
@ -584,8 +602,8 @@ namespace HeavenStudio.Games
} }
} }
private double zoomOutStartBeat = double.MinValue; private double zoomOutStartBeat = -2;
private float zoomOutLength = 4; private bool zoomIn = true;
private Util.EasingFunction.Function funcOut; private Util.EasingFunction.Function funcOut;
private Util.EasingFunction.Function funcIn; private Util.EasingFunction.Function funcIn;
@ -615,36 +633,31 @@ namespace HeavenStudio.Games
cameraAnchor.localEulerAngles = new Vector3(0, 0, newAngle); cameraAnchor.localEulerAngles = new Vector3(0, 0, newAngle);
} }
float normalizedZoomBeat = cond.GetPositionFromBeat(zoomOutStartBeat, zoomOutLength); float normalizedZoomBeat = cond.GetPositionFromBeat(zoomOutStartBeat, zoomIn ? zoomInBeatLength : zoomOutBeatLength);
float newX = 0f;
if (normalizedZoomBeat >= 0f && normalizedZoomBeat <= 1f) float newY = 0f;
float newZ = 0f;
if (zoomIn)
{ {
float newX = 0f; newX = funcIn(0, cameraTransform.position.x, Mathf.Clamp01(normalizedZoomBeat));
float newY = 0f; newY = funcIn(0, cameraTransform.position.y, Mathf.Clamp01(normalizedZoomBeat));
float newZ = 0f; newZ = funcIn(fullZoomOut, 0, Mathf.Clamp01(normalizedZoomBeat));
float normalizedZoomFirst = cond.GetPositionFromBeat(zoomOutStartBeat, zoomOutBeatLength);
float normalizedZoomLast = cond.GetPositionFromBeat(zoomOutStartBeat + zoomOutLength - zoomInBeatLength, zoomInBeatLength);
if (normalizedZoomFirst > 1)
{
newX = funcIn(0, cameraTransform.position.x, Mathf.Clamp01(normalizedZoomLast));
newY = funcIn(0, cameraTransform.position.y, Mathf.Clamp01(normalizedZoomLast));
newZ = funcIn(fullZoomOut, 0, Mathf.Clamp01(normalizedZoomLast));
}
else
{
newX = funcOut(cameraTransform.position.x, 0, Mathf.Clamp01(normalizedZoomFirst));
newY = funcOut(cameraTransform.position.y, 0, Mathf.Clamp01(normalizedZoomFirst));
newZ = funcOut(0, fullZoomOut, Mathf.Clamp01(normalizedZoomFirst));
}
cameraMoveable.position = new Vector3(newX, -newY, newZ);
} }
else else
{
newX = funcOut(cameraTransform.position.x, 0, Mathf.Clamp01(normalizedZoomBeat));
newY = funcOut(cameraTransform.position.y, 0, Mathf.Clamp01(normalizedZoomBeat));
newZ = funcOut(0, fullZoomOut, Mathf.Clamp01(normalizedZoomBeat));
}
if (zoomIn && normalizedZoomBeat > 1f)
{ {
cameraMoveable.position = new Vector3(cameraTransform.position.x, cameraTransform.position.y * -1); cameraMoveable.position = new Vector3(cameraTransform.position.x, cameraTransform.position.y * -1);
} }
else
{
cameraMoveable.position = new Vector3(newX, -newY, newZ);
}
} }
#endregion #endregion