mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 21:30:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

match 3 JPA TUs

Browse Source
This commit is contained in:
LagoLunatic
2023-11-07 17:54:55 -05:00
parent ba0374420c
commit 14d71dae68
5 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+3 -3
View File
@@ -560,11 +560,11 @@ config.libs = [
"JParticle",
[
Object(NonMatching, "JSystem/JParticle/JPABaseShape.cpp"),
Object(NonMatching, "JSystem/JParticle/JPAExtraShape.cpp"),
Object(Matching, "JSystem/JParticle/JPAExtraShape.cpp"),
Object(Matching, "JSystem/JParticle/JPASweepShape.cpp"),
Object(Matching, "JSystem/JParticle/JPAExTexShape.cpp"),
Object(NonMatching, "JSystem/JParticle/JPADynamicsBlock.cpp"),
Object(NonMatching, "JSystem/JParticle/JPAFieldBlock.cpp"),
Object(Matching, "JSystem/JParticle/JPADynamicsBlock.cpp"),
Object(Matching, "JSystem/JParticle/JPAFieldBlock.cpp"),
Object(Matching, "JSystem/JParticle/JPAKeyBlock.cpp"),
Object(Matching, "JSystem/JParticle/JPATexture.cpp"),
Object(NonMatching, "JSystem/JParticle/JPAResourceManager.cpp"),
include/JSystem/JGeometry.h
+2 -6
View File
@@ -25,9 +25,7 @@ struct TVec3<s16> {
s16 x, y, z;
TVec3& operator=(const TVec3& b) {
x = b.x;
y = b.y;
z = b.z;
set(b.x, b.y, b.z);
return *this;
}
@@ -142,9 +140,7 @@ struct TVec3<f32> {
// }
inline TVec3<f32>& operator=(const TVec3<f32>& b) {
x = b.x;
y = b.y;
z = b.z;
set(b.x, b.y, b.z);
return *this;
}
include/JSystem/JParticle/JPADynamicsBlock.h
+6 -6
View File
@@ -44,6 +44,12 @@ public:
virtual void getEmitterRot(JGeometry::TVec3<s16>&) = 0;
virtual void getEmitterTrs(JGeometry::TVec3<f32>&) = 0;
virtual void getEmitterDir(JGeometry::TVec3<f32>&) = 0;
virtual f32 getInitVelOmni() = 0;
virtual f32 getInitVelAxis() = 0;
virtual f32 getInitVelRndm() = 0;
virtual f32 getInitVelDir() = 0;
virtual f32 getSpread() = 0;
virtual f32 getInitVelRatio() = 0;
virtual u32 getVolumeType() = 0;
virtual u32 getVolumeSize() = 0;
virtual f32 getVolumeSweep() = 0;
@@ -56,12 +62,6 @@ public:
virtual u32 getStartFrame() = 0;
virtual u32 getLifeTime() = 0;
virtual f32 getLifeTimeRndm() = 0;
virtual f32 getInitVelOmni() = 0;
virtual f32 getInitVelAxis() = 0;
virtual f32 getInitVelRndm() = 0;
virtual f32 getInitVelDir() = 0;
virtual f32 getSpread() = 0;
virtual f32 getInitVelRatio() = 0;
virtual f32 getAccel() = 0;
virtual f32 getAccelRndm() = 0;
virtual f32 getAirResist() = 0;
include/JSystem/JParticle/JPAFieldBlock.h
+3 -3
View File
@@ -24,10 +24,10 @@ class JPAFieldBlock {
public:
virtual ~JPAFieldBlock() {}
virtual u32 getType() = 0;
virtual u32 getVelType() = 0;
virtual u32 getSttFlag() = 0;
virtual u32 getCycle() = 0;
virtual u32 getID() = 0;
virtual u32 getVelType() = 0;
virtual u32 getCycle() = 0;
virtual u32 getSttFlag() = 0;
virtual void getPos(JGeometry::TVec3<float>&) = 0;
virtual void getDir(JGeometry::TVec3<float>&) = 0;
virtual f32 getMag() = 0;
src/JSystem/JParticle/JPAExtraShape.cpp
+3 -7
View File
@@ -10,13 +10,9 @@
JPAExtraShapeArc::JPAExtraShapeArc(const u8* data) {
mpData = reinterpret_cast<const JPAExtraShapeData*>(data+0x0C);
if (mpData->mAlphaInTiming != 0.0f) {
mAlphaIncreaseRate = (mpData->mAlphaBaseValue - mpData->mAlphaInValue) / mpData->mAlphaInTiming;
}
mAlphaIncreaseRate = mpData->mAlphaInTiming != 0.0f ? (mpData->mAlphaBaseValue - mpData->mAlphaInValue) / mpData->mAlphaInTiming : 1.0f;
if (mpData->mAlphaOutTiming != 1.0f) {
mAlphaDecreaseRate = (mpData->mAlphaOutValue - mpData->mAlphaBaseValue) / (1.0f - mpData->mAlphaOutTiming);
}
mAlphaDecreaseRate = mpData->mAlphaOutTiming != 1.0f ? (mpData->mAlphaOutValue - mpData->mAlphaBaseValue) / (1.0f - mpData->mAlphaOutTiming) : 1.0f;
if (mpData->mScaleInTiming != 0.0f) {
mIncreaseRateX = (1.0f - mpData->mScaleInValueX) / mpData->mScaleInTiming;
@@ -26,7 +22,7 @@ JPAExtraShapeArc::JPAExtraShapeArc(const u8* data) {
mIncreaseRateX = 1.0f;
}
if (mpData->mScaleOutTiming != 0.0f) {
if (mpData->mScaleOutTiming != 1.0f) {
mDecreaseRateX = (mpData->mScaleOutValueX - 1.0f) / (1.0f - mpData->mScaleOutTiming);
mDecreaseRateY = (mpData->mScaleOutValueY - 1.0f) / (1.0f - mpData->mScaleOutTiming);
} else {