Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:47:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Multiple events can now be called onto same frame + more Spaceball camera fixes

Browse Source
This commit is contained in:
Starpelly
2021-12-26 00:11:54 -05:00
parent 417986c08c
commit 95ac1306d4
11 changed files with 128 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Assets/Scripts/Games/Spaceball/Spaceball.cs
View File

@ -15,13 +15,16 @@ namespace RhythmHeavenMania.Games.Spaceball
public GameObject Dust;
private float lastCamDistance;
private bool zoomingCamera = false;
private float lastZoomCamBeat;
private float lastZoomCamLength;
private float lastZoomCamDistance;
private float currentZoomCamBeat;
private float currentZoomCamLength;
private float currentZoomCamDistance;
private int currentZoomIndex;
public Sprite[] Balls;
private List<Beatmap.Entity> allCameraEvents = new List<Beatmap.Entity>();
public static Spaceball instance { get; set; }
public override void OnGameSwitch()
@ -32,11 +35,21 @@ namespace RhythmHeavenMania.Games.Spaceball
SpaceballPlayer.instance.EligibleHits.RemoveRange(0, SpaceballPlayer.instance.EligibleHits.Count);
}
public override void OnTimeChange()
{
UpdateCameraZoom();
}
private void Awake()
{
instance = this;
}
private void Start()
{
UpdateCameraZoom();
}
private void Update()
{
var allPlayerActions = EventCaller.GetAllPlayerEntities("spaceball");
@ -50,30 +63,56 @@ namespace RhythmHeavenMania.Games.Spaceball
}
}
if (zoomingCamera)
if (currentZoomIndex < allCameraEvents.Count && currentZoomIndex >= 0)
{
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(lastZoomCamBeat, lastZoomCamLength);
float newPosZ = Mathf.Lerp(lastCamDistance, lastZoomCamDistance, normalizedBeat);
GameManager.instance.GameCamera.transform.localPosition = new Vector3(0, 0, newPosZ);
if (Conductor.instance.songPositionInBeats >= allCameraEvents[currentZoomIndex].beat)
{
UpdateCameraZoom();
currentZoomIndex++;
}
}
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(currentZoomCamBeat, currentZoomCamLength);
if (normalizedBeat > Minigame.EndTime())
{
lastCamDistance = GameManager.instance.GameCamera.transform.localPosition.z;
}
else
{
if (currentZoomCamLength <= 0)
GameManager.instance.GameCamera.transform.localPosition = new Vector3(0, 0, currentZoomCamDistance);
else
{
float newPosZ = Mathf.Lerp(lastCamDistance, currentZoomCamDistance, normalizedBeat);
GameManager.instance.GameCamera.transform.localPosition = new Vector3(0, 0, newPosZ);
}
}
}
public void CameraZoom(float beat, float length, float distance)
private void UpdateCameraZoom()
{
lastZoomCamBeat = beat;
lastZoomCamLength = length;
allCameraEvents = EventCaller.GetAllInGameManagerList("spaceball", new string[] { "cameraZoom" });
float dist = distance;
dist = dist * -1;
if (currentZoomIndex < allCameraEvents.Count && currentZoomIndex >= 0)
{
if (currentZoomIndex - 1 >= 0)
lastCamDistance = allCameraEvents[currentZoomIndex - 1].valA * -1;
else
lastCamDistance = allCameraEvents[0].valA * -1;
if (dist > 0)
lastZoomCamDistance = 0;
else
lastZoomCamDistance = dist;
currentZoomCamBeat = allCameraEvents[currentZoomIndex].beat;
currentZoomCamLength = allCameraEvents[currentZoomIndex].length;
zoomingCamera = true;
lastCamDistance = GameManager.instance.GameCamera.transform.localPosition.z;
float dist = allCameraEvents[currentZoomIndex].valA * -1;
print(dist);
if (dist > 0)
currentZoomCamDistance = 0;
else
currentZoomCamDistance = dist;
}
}
public void Shoot(float beat, bool high, string type)