mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-03 12:10:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

TVec3 cleanup, JPAField work

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-04-14 09:26:20 -07:00
parent 4ce4072fef
commit d8a0182f72
2 changed files with 92 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JParticle/JPAField.cpp
+1 -7
View File
@@ -296,16 +296,10 @@ void JPAFieldManager::preCalc() {
/* 8025BA10-8025BAD8 .text calc__15JPAFieldManagerFP15JPABaseParticle */
void JPAFieldManager::calc(JPABaseParticle* ptcl) {
/* Nonmatching */
for (JSULink<JPAFieldData>* link = mList.getFirst(); link != NULL; link = link->getNext()) {
JPAFieldData* data = link->getObject();
if (data->mSttFlag & 0x80) {
// This isn't quite right, probably a TVec3 inline?
f32 z = ptcl->mPosition.z - data->mPos.z; z *= z;
f32 x = ptcl->mPosition.x - data->mPos.x; x *= x;
f32 y = ptcl->mPosition.y - data->mPos.y; y *= y;
f32 dist = z + y + x;
if (!data->mpBaseField->isItinRange(data, dist))
if (!data->mpBaseField->isItinRange(data, ptcl->mPosition.squared(data->mPos)))
continue;
}
data->mpBaseField->calc(data, ptcl);