From 570870969fc61ed67a98e7d3cc4dc9ac2f361835 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 27 Apr 2025 17:30:06 +0200 Subject: [PATCH] JPAFieldBlock OK --- configure.py | 2 +- src/JSystem/JParticle/JPAFieldBlock.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.py b/configure.py index a0676855..301b887a 100644 --- a/configure.py +++ b/configure.py @@ -1216,7 +1216,7 @@ config.libs = [ Object(Matching, "JSystem/JParticle/JPAChildShape.cpp"), Object(Matching, "JSystem/JParticle/JPAExTexShape.cpp"), Object(Matching, "JSystem/JParticle/JPADynamicsBlock.cpp"), - Object(NonMatching, "JSystem/JParticle/JPAFieldBlock.cpp"), + Object(Matching, "JSystem/JParticle/JPAFieldBlock.cpp"), Object(Matching, "JSystem/JParticle/JPAKeyBlock.cpp"), Object(Matching, "JSystem/JParticle/JPATexture.cpp"), Object(Matching, "JSystem/JParticle/JPAResourceLoader.cpp"), diff --git a/src/JSystem/JParticle/JPAFieldBlock.cpp b/src/JSystem/JParticle/JPAFieldBlock.cpp index 4c5253e2..ed15f1ee 100644 --- a/src/JSystem/JParticle/JPAFieldBlock.cpp +++ b/src/JSystem/JParticle/JPAFieldBlock.cpp @@ -137,7 +137,8 @@ void JPAFieldVortex::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) { * calc__14JPAFieldVortexFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */ void JPAFieldVortex::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) { EGG::Vector3f vec; - vec = ptcl->mLocalPosition - field_0x10.dot(ptcl->mLocalPosition) * field_0x10; + vec = field_0x10.dot(ptcl->mLocalPosition) * field_0x10; + vec = ptcl->mLocalPosition - vec; f32 mag = vec.squaredLength(); if (mag > field_0x1c) { mag = block->getMagRndm();