summaryrefslogtreecommitdiff
path: root/src/JSystem/JParticle/JPAExtraShape.cpp
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-04-27 11:14:54 +0200
committerrobojumper <robojumper@gmail.com>2025-04-27 11:14:54 +0200
commita962cdd14ac4520d72151c1b83b3e98d608e06be (patch)
tree3af28a1b00a8fddde18bc312e89b578d2e421349 /src/JSystem/JParticle/JPAExtraShape.cpp
parent70125c1eacee19e03b8fd9b4dcf277c019ab4f3f (diff)
JPAEmitterManager OK
Diffstat (limited to 'src/JSystem/JParticle/JPAExtraShape.cpp')
-rw-r--r--src/JSystem/JParticle/JPAExtraShape.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/JSystem/JParticle/JPAExtraShape.cpp b/src/JSystem/JParticle/JPAExtraShape.cpp
index 5271261a..0c0e8bf5 100644
--- a/src/JSystem/JParticle/JPAExtraShape.cpp
+++ b/src/JSystem/JParticle/JPAExtraShape.cpp
@@ -4,10 +4,9 @@
//
#include "JSystem/JParticle/JPAExtraShape.h"
-#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
-#include "rvl/OS.h"
+#include "nw4r/math/math_triangular.h"
/* 8027A918-8027A990 275258 0078+00 0/0 1/1 0/0 .text
* JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle */
@@ -116,7 +115,7 @@ void JPACalcAlphaFlickAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
alpha = esp->getAlphaBaseValue();
}
s32 theta = ptcl->mAlphaWaveRandom * ptcl->mAge * 16384.0f * (1.0f - esp->getAlphaFreq());
- f32 wave = JMASSin(theta);
+ f32 wave = nw4r::math::SinIdx(theta);
alpha *= (1.0f + esp->getAlphaAmp() * (wave - 1.0f) * 0.5f) * 255.0f;
OSf32tou8(&alpha, &ptcl->mPrmColorAlphaAnm);
}