diff options
| author | TakaRikka <takarikka@outlook.com> | 2022-06-01 04:23:39 -0700 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2022-06-01 04:23:39 -0700 |
| commit | 32cea78625839c5285a5f22eec6e7bbeef005c3c (patch) | |
| tree | 6171308ac96c3cbb1917c43167ac09dc86135df1 /include/JSystem/JParticle | |
| parent | 3f22fa448376893fffd83815ecd4cdccb197f1a4 (diff) | |
format
Diffstat (limited to 'include/JSystem/JParticle')
| -rw-r--r-- | include/JSystem/JParticle/JPADynamicsBlock.h | 8 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAParticle.h | 19 |
2 files changed, 13 insertions, 14 deletions
diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h index 8b3e441c19..9519972e5f 100644 --- a/include/JSystem/JParticle/JPADynamicsBlock.h +++ b/include/JSystem/JParticle/JPADynamicsBlock.h @@ -43,10 +43,10 @@ struct JPADynamicsBlockData { typedef void (*JPADynamicsCalcVolumeFunc)(JPAEmitterWorkData*); enum { - JPADynFlag_FixedDensity = 0x01, - JPADynFlag_FixedInterval = 0x02, - JPADynFlag_InheritScale = 0x04, - JPADynFlag_FollowEmtr = 0x08, + JPADynFlag_FixedDensity = 0x01, + JPADynFlag_FixedInterval = 0x02, + JPADynFlag_InheritScale = 0x04, + JPADynFlag_FollowEmtr = 0x08, JPADynFlag_FollowEmtrChld = 0x10, }; diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 2c50176b8a..0c009f21b4 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -34,12 +34,13 @@ public: JPARandom() { mSeed = 0; } void set_seed(u32 seed) { mSeed = seed; } - u32 get_rndm_u() { - return mSeed = mSeed * 0x19660du + 0x3c6ef35fu; - } + u32 get_rndm_u() { return mSeed = mSeed * 0x19660du + 0x3c6ef35fu; } f32 get_rndm_f() { - union { u32 u; f32 f; } a; + union { + u32 u; + f32 f; + } a; a.u = ((get_rndm_u() >> 9) | 0x3f800000); return a.f - 1.0f; } @@ -54,9 +55,7 @@ public: return f - 1.0f; } - s16 get_rndm_ss() { - return ((s16)get_rndm_u()) >> 16; - } + s16 get_rndm_ss() { return ((s16)get_rndm_u()) >> 16; } public: u32 mSeed; @@ -203,9 +202,9 @@ public: }; enum { - JPAEmtrStts_StopEmit = 0x01, - JPAEmtrStts_StopCalc = 0x02, - JPAEmtrStts_FirstEmit = 0x10, + JPAEmtrStts_StopEmit = 0x01, + JPAEmtrStts_StopCalc = 0x02, + JPAEmtrStts_FirstEmit = 0x10, JPAEmtrStts_RateStepEmit = 0x20, }; |
