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

try different shuttle rotation method

Browse source
This commit is contained in:
minenice55 2023-02-01 00:47:43 -05:00
parent 892787c32d
commit 96c0d56fd6
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Assets/Scripts/Games/AirRally/Shuttlecock.cs
View file

@ -38,14 +38,15 @@ namespace HeavenStudio.Games.Scripts_AirRally
void Update() void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
float startRotation;
Vector3 lastPos = transform.position; float endrotation;
if (!GetComponent<Rigidbody2D>().simulated)
{
float flyPos = cond.GetPositionFromBeat(startBeat, flyBeats);
Vector3 startPos = isReturning ? PlayerTarget.position : OtherTarget.position; Vector3 startPos = isReturning ? PlayerTarget.position : OtherTarget.position;
Vector3 endPos = isReturning ? OtherTarget.position : PlayerTarget.position; Vector3 endPos = isReturning ? OtherTarget.position : PlayerTarget.position;
Vector3 midPos;
if (!GetComponent<Rigidbody2D>().simulated)
{
flyPos = cond.GetPositionFromBeat(startBeat, flyBeats);
transform.position = Vector3.LerpUnclamped(startPos, endPos, flyPos); transform.position = Vector3.LerpUnclamped(startPos, endPos, flyPos);
@ -54,11 +55,23 @@ namespace HeavenStudio.Games.Scripts_AirRally
transform.position += Vector3.up * yWeight * (flyType ? TargetHeightLong : TargetHeight); transform.position += Vector3.up * yWeight * (flyType ? TargetHeightLong : TargetHeight);
} }
Vector3 direction = (transform.position - lastPos).normalized; // calculates next position
float rotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; {
this.transform.eulerAngles = new Vector3(0, 0, rotation - 90f); midPos = Vector3.LerpUnclamped(startPos, endPos, 0.5f);
if (miss && flyPos > 2f) float yMulN = (0.5f) * 2f - 1f;
float yWeightN = -(yMulN*yMulN) + 1f;
midPos += Vector3.up * yWeightN * (flyType ? TargetHeightLong : TargetHeight);
Vector3 direction = (midPos - startPos).normalized;
startRotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
direction = (endPos - midPos).normalized;
endrotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
this.transform.eulerAngles = new Vector3(0, 0, Mathf.LerpAngle(startRotation, endrotation, flyPos) - 90f);
}
if (miss && flyPos > 4f)
{ {
if (cond.GetPositionFromBeat(startBeat, flyBeats + 1f) >= 1f) if (cond.GetPositionFromBeat(startBeat, flyBeats + 1f) >= 1f)
{ {