diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-10-28 04:00:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 13:00:15 +0200 |
| commit | b1d7bc9cc42699a20dd84e8db0d1d768346ebae3 (patch) | |
| tree | 8f3fdfa4ab69da7bb93833f16d51be9bc8801a74 /include/JSystem | |
| parent | f5e80cf9fda54894e97af8629386e2a7c562479a (diff) | |
d_a_alink_effect mostly done (#2227)
* d_a_alink_effect work
* more d_a_alink_effect work
* some d_a_alink data cleanup
* d_a_alink_effect mostly done
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JParticle/JPAEmitter.h | 7 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio/stb.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 807f22d075..c7dc059086 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -132,6 +132,7 @@ public: void setGlobalRotation(const JGeometry::TVec3<s16>& rot) { JPAGetXYZRotateMtx(rot.x, rot.y, rot.z, mGlobalRot); } + void getGlobalTranslation(JGeometry::TVec3<f32>* out) const { out->set(mGlobalTrs); } void setGlobalDynamicsScale(const JGeometry::TVec3<f32>& i_scale) { mGlobalScl.set(i_scale); } void setGlobalAlpha(u8 alpha) { mGlobalPrmClr.a = alpha; } u8 getGlobalAlpha() { return mGlobalPrmClr.a; } @@ -140,6 +141,12 @@ public: void setGlobalEnvColor(u8 r, u8 g, u8 b) { mGlobalEnvClr.r = r; mGlobalEnvClr.g = g; mGlobalEnvClr.b = b; } void setVolumeSize(u16 size) { mVolumeSize = size; } void setLifeTime(s16 lifetime) { mLifeTime = lifetime; } + void setAwayFromCenterSpeed(f32 i_speed) { mAwayFromCenterSpeed = i_speed; } + void setAwayFromAxisSpeed(f32 i_speed) { mAwayFromAxisSpeed = i_speed; } + void setSpread(f32 i_spread) { mSpread = i_spread; } + void setLocalTranslation(const JGeometry::TVec3<f32>& i_trans) { mLocalTrs.set(i_trans); } + void setLocalRotation(const JGeometry::TVec3<s16>& i_rot) { mLocalRot.set(i_rot.x * 0.005493248f, i_rot.y * 0.005493248f, i_rot.z * 0.005493248f); } + void setRateStep(u8 i_step) { mRateStep = i_step; } void setGlobalParticleHeightScale(f32 height) { mGlobalPScl.y = height; diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index ea299a709c..a4ee1a7e76 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -163,6 +163,10 @@ struct TParseData : public data::TParse_TParagraph_data::TData { set(data); } + TParseData() { + set(NULL); + } + void set(const data::TParse_TParagraph_data& data) { data.getData(this); } @@ -183,6 +187,7 @@ struct TParseData : public data::TParse_TParagraph_data::TData { template <int T, class Iterator=JGadget::binary::TValueIterator_raw<u8> > struct TParseData_fixed : public TParseData<T> { TParseData_fixed(const void* pContent) : TParseData<T>(pContent) {} + TParseData_fixed() : TParseData<T>() {} const void* getNext() const { return fileCount; |
