summaryrefslogtreecommitdiff
path: root/include/JSystem
diff options
context:
space:
mode:
Diffstat (limited to 'include/JSystem')
-rw-r--r--include/JSystem/J3DU/J3DUClipper.h4
-rw-r--r--include/JSystem/JParticle/JPAEmitter.h6
-rw-r--r--include/JSystem/JParticle/JPAParticle.h1
3 files changed, 8 insertions, 3 deletions
diff --git a/include/JSystem/J3DU/J3DUClipper.h b/include/JSystem/J3DU/J3DUClipper.h
index 8f5a9df3..113ec60e 100644
--- a/include/JSystem/J3DU/J3DUClipper.h
+++ b/include/JSystem/J3DU/J3DUClipper.h
@@ -12,8 +12,8 @@ public:
virtual ~J3DUClipper() {}
void init();
void calcViewFrustum();
- u32 clip(const Mtx, Vec, f32);
- u32 clip(const Mtx, Vec*, Vec*);
+ s32 clip(const Mtx, Vec, f32);
+ s32 clip(const Mtx, Vec*, Vec*);
u32 clipByBox(J3DModel*);
void setFovy(f32 fovy) { mFovY = fovy; }
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index 5b567441..8008f803 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -213,6 +213,11 @@ public:
mGlobalPrmColor.g = g;
mGlobalPrmColor.b = b;
}
+ void setGlobalEnvColor(u8 r, u8 g, u8 b) {
+ mGlobalEnvColor.r = r;
+ mGlobalEnvColor.g = g;
+ mGlobalEnvColor.b = b;
+ }
void setVolumeSweep(f32 i_volSweep) { mVolumeSweep = i_volSweep; }
void setVolumeSize(u16 size) { mVolumeSize = size; }
@@ -284,7 +289,6 @@ public:
void isZDraw() {}
void loadTexture(u8, GXTexMapID) {}
void setEmitterRotation(const JGeometry::TVec3<s16>&) {}
- void setGlobalEnvColor(u8, u8, u8) {}
void setGlobalParticleHeightScale(f32) {}
void setGlobalParticleScale(f32, f32) {}
void setGlobalParticleWidthScale(f32) {}
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index 6dc3e6af..371e264a 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -33,6 +33,7 @@ public:
~JPABaseParticle() {}
JPABaseParticle() : mLink(this), mCurFrame(0.0f) {}
+ void setOffsetPosition(f32 x, f32 y, f32 z) { mGlobalPosition.set(x, y, z); }
public:
/* 0x00 */ JSULink<JPABaseParticle> mLink;