mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 13:24:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JPABaseParticle position members being out of order

Browse Source
This commit is contained in:
LagoLunatic
2024-09-02 22:41:33 -04:00
parent 893f6bc112
commit 804e0aaf9e
8 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JParticle/JPAField.cpp
+4 -4
View File
@@ -134,7 +134,7 @@ void JPAAirField::calc(JPAFieldData* data, JPABaseParticle* ptcl) {
if (data->mSttFlag & 0x01) {
JGeometry::TVec3<f32> vel;
if (data->mSttFlag & 0x02) {
vel.sub(ptcl->mPosition, data->mWork0);
vel.sub(ptcl->mGlobalPosition, data->mWork0);
} else {
vel.sub(ptcl->mLocalPosition, data->mWork0);
}
@@ -169,7 +169,7 @@ void JPAMagnetField::preCalc(JPAFieldData* data) {
/* 8025A788-8025A8AC .text calc__14JPAMagnetFieldFP12JPAFieldDataP15JPABaseParticle */
void JPAMagnetField::calc(JPAFieldData* data, JPABaseParticle* ptcl) {
if (data->mSttFlag & 0x02) {
data->mVel.sub(data->mWork0, ptcl->mPosition);
data->mVel.sub(data->mWork0, ptcl->mGlobalPosition);
} else {
data->mVel.sub(data->mWork0, ptcl->mLocalPosition);
}
@@ -192,7 +192,7 @@ void JPANewtonField::preCalc(JPAFieldData* data) {
/* 8025A954-8025ABB8 .text calc__14JPANewtonFieldFP12JPAFieldDataP15JPABaseParticle */
void JPANewtonField::calc(JPAFieldData* data, JPABaseParticle* ptcl) {
if (data->mSttFlag & 0x02) {
data->mVel.sub(data->mWork0, ptcl->mPosition);
data->mVel.sub(data->mWork0, ptcl->mGlobalPosition);
} else {
data->mVel.sub(data->mWork0, ptcl->mLocalPosition);
}
@@ -413,7 +413,7 @@ void JPAFieldManager::calc(JPABaseParticle* ptcl) {
for (JSULink<JPAFieldData>* link = mList.getFirst(); link != NULL; link = link->getNext()) {
JPAFieldData* data = link->getObject();
if (data->mSttFlag & 0x80) {
if (!data->mpBaseField->isItinRange(data, ptcl->mPosition.squared(data->mPos)))
if (!data->mpBaseField->isItinRange(data, ptcl->mGlobalPosition.squared(data->mPos)))
continue;
}
data->mpBaseField->calc(data, ptcl);