From 127988d39fcb129780cbd2ab90418aad05d01069 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue, 8 Aug 2023 23:02:51 +0200 Subject: [PATCH] camera tweak --- .../Scripts/Games/MonkeyWatch/MonkeyWatch.cs | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index d0259a376..62905e2bc 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -499,16 +499,7 @@ namespace HeavenStudio.Games { var e = relevantPinkClappingEvents[i]; if (e.beat < lastClappingBeat) continue; - if (e.beat - lastClappingBeat > 0) - { - cameraMovements.Add(new MonkeyCamera() - { - beat = lastClappingBeat, - length = (float)(e.beat - lastClappingBeat), - degreeTo = lastAngleToCheck + (float)((e.beat - lastClappingBeat) / 2) * degreePerMonkey - }); - lastAngleToCheck += (float)((e.beat - lastClappingBeat) / 2) * degreePerMonkey; - } + float angleToAdd; if (e.datamodel == "monkeyWatch/offInterval") { @@ -518,6 +509,17 @@ namespace HeavenStudio.Games { angleToAdd = Mathf.Ceil(e.length) * degreePerMonkey; } + + if (e.beat - lastClappingBeat > 0) + { + cameraMovements.Add(new MonkeyCamera() + { + beat = lastClappingBeat, + length = (float)(e.beat - lastClappingBeat), + degreeTo = lastAngleToCheck + (float)((e.beat - lastClappingBeat) / 2) * degreePerMonkey + (angleToAdd / 2) + }); + lastAngleToCheck += (float)((e.beat - lastClappingBeat) / 2) * degreePerMonkey; + } cameraMovements.Add(new MonkeyCamera() { beat = e.beat,