PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CFlameWarp

This commit is contained in:
Henrique Gemignani Passos Lima 2023-01-07 23:42:50 +02:00
parent cf0aa43e16
commit 472e1538ab
No known key found for this signature in database
GPG Key ID: E224F951761145F8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MetroidPrime/CFlameWarp.cpp
View File

@ -90,12 +90,12 @@ void CFlameWarp::ModifyParticles(int particleCount, int stripe, int*, CVector3f*
CMaterialList(kMT_ProjectilePassthrough))); CMaterialList(kMT_ProjectilePassthrough)));
if (result.IsValid()) { if (result.IsValid()) {
const float dist = result.GetPlane().PointToPlaneDist(partPos); const float dist = result.GetPlane().GetHeight(partPos);
if (dist <= 0.f) { if (dist <= 0.f) {
partPos -= dist * result.GetPlane().GetNormal(); partPos -= dist * result.GetPlane().GetNormal();
if (CVector3f::Dot(result.GetPlane().GetNormal(), partVel) < 0.f) { if (CVector3f::Dot(result.GetPlane().GetNormal(), partVel) < 0.f) {
const CVector3f prevStepPos = partPos - partVel; const CVector3f prevStepPos = partPos - partVel;
partPos += (-result.GetPlane().PointToPlaneDist(prevStepPos) / partPos += (-result.GetPlane().GetHeight(prevStepPos) /
CVector3f::Dot(partVel, result.GetPlane().GetNormal()) - CVector3f::Dot(partVel, result.GetPlane().GetNormal()) -
1.f) * 1.f) *
partVel; partVel;