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

fix trajectory jank

Browse source
This commit is contained in:
minenice55 2023-12-30 23:03:01 -05:00
parent 28726add37
commit 9b3346e106
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Assets/Scripts/Games/MeatGrinder/Meat.cs
View file

@ -71,23 +71,30 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder
hitAlongMissRatio /= Vector3.Dot((startPos - missPosition.position), (startPos - missPosition.position)); hitAlongMissRatio /= Vector3.Dot((startPos - missPosition.position), (startPos - missPosition.position));
Vector3 hitOnMissPos = startPos + ((missPosition.position - startPos) * hitAlongMissRatio); Vector3 hitOnMissPos = startPos + ((missPosition.position - startPos) * hitAlongMissRatio);
float totalProg = (float)((currentTime - startTime) / (missTime - startTime)); float prog;
if (currentTime >= hitTime) if (currentTime >= hitTime)
{ {
float prog = (float)((currentTime - hitTime) / (missTime - hitTime)); prog = (float)((currentTime - hitTime) / (missTime - hitTime));
transform.position = Vector3.Lerp(hitOnMissPos, missPosition.position, prog); transform.position = Vector3.Lerp(hitOnMissPos, missPosition.position, prog);
prog = (prog * (1 - hitAlongMissRatio)) + hitAlongMissRatio;
} }
else else
{ {
float prog = (float)((currentTime - startTime) / (hitTime - startTime)); prog = (float)((currentTime - startTime) / (hitTime - startTime));
transform.position = Vector3.Lerp(startPos, hitOnMissPos, prog); transform.position = Vector3.Lerp(startPos, hitOnMissPos, prog);
prog *= hitAlongMissRatio;
} }
float yMul = (totalProg * 2f) - 1f; float yMul = prog * 2f - 1f;
float yWeight = -(yMul * yMul) + 1f; float yWeight = -(yMul * yMul) + 1f;
transform.position += (meatType == MeatType.LightMeat ? meatFlyHeightAlt : meatFlyHeight) * yWeight * Vector3.up; transform.position += (meatType == MeatType.LightMeat ? meatFlyHeightAlt : meatFlyHeight) * yWeight * Vector3.up;
// point towards the next position // point towards the next position
transform.right = transform.position - lastPos; if (cond.isPlaying)
{
transform.right = transform.position - lastPos;
}
} }
} }