OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Obliterate hsBool

Browse Source
This commit is contained in:
Adam Johnson
2012-07-11 01:28:00 -04:00
parent 5f78b33db4
commit a709e17069
1041 changed files with 7889 additions and 8070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.cpp
View File

@ -65,7 +65,7 @@ void plConvexVolume::IClear()
delete [] fWorldPlanes;
}
hsBool plConvexVolume::AddPlane(const hsPlane3 &plane)
bool plConvexVolume::AddPlane(const hsPlane3 &plane)
{
// First check for a redundant plane (since we're convex, a comparison of normals should do)
int i;
@ -124,7 +124,7 @@ void plConvexVolume::SetPlane(const hsPlane3 &plane, const uint32_t index)
fLocalPlanes[index] = plane;
}
hsBool plConvexVolume::IsInside(const hsPoint3 &pos) const
bool plConvexVolume::IsInside(const hsPoint3 &pos) const
{
int i;
for( i = 0; i < fNumPlanes; i++ )
@ -136,7 +136,7 @@ hsBool plConvexVolume::IsInside(const hsPoint3 &pos) const
return true;
}
hsBool plConvexVolume::ResolvePoint(hsPoint3 &pos) const
bool plConvexVolume::ResolvePoint(hsPoint3 &pos) const
{
float minDist = 1.e33f;
int32_t minIndex = -1;
@ -159,7 +159,7 @@ hsBool plConvexVolume::ResolvePoint(hsPoint3 &pos) const
return true;
}
hsBool plConvexVolume::BouncePoint(hsPoint3 &pos, hsVector3 &velocity, float bounce, float friction) const
bool plConvexVolume::BouncePoint(hsPoint3 &pos, hsVector3 &velocity, float bounce, float friction) const
{
float minDist = 1.e33f;
int32_t minIndex = -1;

14
Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h
View File

@ -63,24 +63,24 @@ public:
void Update(const hsMatrix44 &l2w);
hsBool AddPlane(const hsPlane3 &plane);
bool AddPlane(const hsPlane3 &plane);
void SetNumPlanesAndClear(const uint32_t num);
void SetPlane(const hsPlane3 &plane, const uint32_t index);
// If you only care about the test, call this. Otherwise call ResolvePoint.
hsBool IsInside(const hsPoint3 &pos) const;
bool IsInside(const hsPoint3 &pos) const;
// returns true if the point was inside the volume, and thus moved outward.
hsBool ResolvePoint(hsPoint3 &pos) const;
bool ResolvePoint(hsPoint3 &pos) const;
// returns true if the point was inside and pos and velocity updated to bounce off offending plane.
// input bounce==1.f for perfect bounce, bounce==0 to slide.
hsBool BouncePoint(hsPoint3 &pos, hsVector3 &velocity, float bounce, float friction) const;
bool BouncePoint(hsPoint3 &pos, hsVector3 &velocity, float bounce, float friction) const;
inline hsBool TestPlane(const hsPoint3 &pos, const hsPlane3 &plane) const; // Is the point inside the plane?
inline bool TestPlane(const hsPoint3 &pos, const hsPlane3 &plane) const; // Is the point inside the plane?
virtual void Read(hsStream* s, hsResMgr *mgr);
virtual void Write(hsStream* s, hsResMgr *mgr);
//virtual hsBool MsgReceive(plMessage* msg);
//virtual bool MsgReceive(plMessage* msg);
protected:
void IClear();
@ -90,7 +90,7 @@ protected:
uint32_t fNumPlanes;
};
inline hsBool plConvexVolume::TestPlane(const hsPoint3 &pos, const hsPlane3 &plane) const
inline bool plConvexVolume::TestPlane(const hsPoint3 &pos, const hsPlane3 &plane) const
{
float dis = plane.fN.InnerProduct(pos);
dis += plane.fD;

20
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp
View File

@ -75,7 +75,7 @@ void plParticleCollisionEffect::PrepareEffect(const plEffectTargetInfo &target)
}
}
hsBool plParticleCollisionEffect::MsgReceive(plMessage* msg)
bool plParticleCollisionEffect::MsgReceive(plMessage* msg)
{
plRefMsg* refMsg = plRefMsg::ConvertNoRef(msg);
plSceneObject *so;
@ -118,7 +118,7 @@ plParticleCollisionEffectBeat::plParticleCollisionEffectBeat()
{
}
hsBool plParticleCollisionEffectBeat::ApplyEffect(const plEffectTargetInfo &target, int32_t i)
bool plParticleCollisionEffectBeat::ApplyEffect(const plEffectTargetInfo &target, int32_t i)
{
hsAssert(i >= 0, "Use of default argument doesn't make sense for plParticleCollisionEffect");
@ -137,7 +137,7 @@ plParticleCollisionEffectDie::plParticleCollisionEffectDie()
{
}
hsBool plParticleCollisionEffectDie::ApplyEffect(const plEffectTargetInfo &target, int32_t i)
bool plParticleCollisionEffectDie::ApplyEffect(const plEffectTargetInfo &target, int32_t i)
{
hsAssert(i >= 0, "Use of default argument doesn't make sense for plParticleCollisionEffect");
@ -156,7 +156,7 @@ plParticleCollisionEffectBounce::plParticleCollisionEffectBounce()
{
}
hsBool plParticleCollisionEffectBounce::ApplyEffect(const plEffectTargetInfo &target, int32_t i)
bool plParticleCollisionEffectBounce::ApplyEffect(const plEffectTargetInfo &target, int32_t i)
{
hsAssert(i >= 0, "Use of default argument doesn't make sense for plParticleCollisionEffect");
@ -265,7 +265,7 @@ void plParticleFadeVolumeEffect::PrepareEffect(const plEffectTargetInfo &target)
fNorm.fZ = 1.f / (fMax.fZ - fMin.fZ);
}
hsBool plParticleFadeVolumeEffect::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
bool plParticleFadeVolumeEffect::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
{
hsPoint3 *currPos = (hsPoint3 *)(target.fPos + i * target.fPosStride);
@ -484,7 +484,7 @@ void plParticleLocalWind::PrepareEffect(const plEffectTargetInfo& target)
}
hsBool plParticleLocalWind::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
bool plParticleLocalWind::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
{
const hsPoint3& pos = *(hsPoint3 *)(target.fPos + i * target.fPosStride);
hsVector3& vel = *(hsVector3*)(target.fVelocity + i * target.fVelocityStride);
@ -641,7 +641,7 @@ void plParticleUniformWind::PrepareEffect(const plEffectTargetInfo& target)
}
hsBool plParticleUniformWind::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
bool plParticleUniformWind::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
{
hsVector3& vel = *(hsVector3*)(target.fVelocity + i * target.fVelocityStride);
@ -743,7 +743,7 @@ void plParticleFlockEffect::PrepareEffect(const plEffectTargetInfo& target)
// Some of this is the same for every particle and should be cached in PrepareEffect().
// Holding off on that until I like the behavior.
hsBool plParticleFlockEffect::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
bool plParticleFlockEffect::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
{
if (i >= fMaxParticles)
return false; // Don't have the memory to deal with you. Good luck kid...
@ -855,7 +855,7 @@ void plParticleFlockEffect::Write(hsStream *s, hsResMgr *mgr)
s->WriteLEScalar(fMaxParticles);
}
hsBool plParticleFlockEffect::MsgReceive(plMessage *msg)
bool plParticleFlockEffect::MsgReceive(plMessage *msg)
{
plParticleFlockMsg *flockMsg = plParticleFlockMsg::ConvertNoRef(msg);
if (flockMsg)
@ -889,7 +889,7 @@ void plParticleFollowSystemEffect::PrepareEffect(const plEffectTargetInfo& targe
fEvalThisFrame = (fOldW2L != target.fContext.fSystem->GetTarget(0)->GetWorldToLocal());
}
hsBool plParticleFollowSystemEffect::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
bool plParticleFollowSystemEffect::ApplyEffect(const plEffectTargetInfo& target, int32_t i)
{
if (fEvalThisFrame)
{

36
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h
View File

@ -67,7 +67,7 @@ public:
// context (invalidating anything cached).
// Defaults for Prepare and End are no-ops.
virtual void PrepareEffect(const plEffectTargetInfo& target) {}
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i) = 0;
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i) = 0;
virtual void EndEffect(const plEffectTargetInfo& target) {}
};
@ -84,7 +84,7 @@ public:
virtual void Read(hsStream *s, hsResMgr *mgr);
virtual void Write(hsStream *s, hsResMgr *mgr);
virtual hsBool MsgReceive(plMessage *msg);
virtual bool MsgReceive(plMessage *msg);
protected:
plSceneObject *fSceneObj;
@ -102,7 +102,7 @@ public:
CLASSNAME_REGISTER( plParticleCollisionEffectBeat );
GETINTERFACE_ANY( plParticleCollisionEffectBeat, plParticleCollisionEffect );
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
};
// This particle blocker just kills any particles that hit it.
@ -114,7 +114,7 @@ public:
CLASSNAME_REGISTER( plParticleCollisionEffectDie );
GETINTERFACE_ANY( plParticleCollisionEffectDie, plParticleCollisionEffect );
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
};
class plParticleCollisionEffectBounce : public plParticleCollisionEffect
@ -128,7 +128,7 @@ public:
CLASSNAME_REGISTER( plParticleCollisionEffectBounce );
GETINTERFACE_ANY( plParticleCollisionEffectBounce, plParticleCollisionEffect );
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual void Read(hsStream *s, hsResMgr *mgr);
virtual void Write(hsStream *s, hsResMgr *mgr);
@ -157,14 +157,14 @@ public:
GETINTERFACE_ANY( plParticleFadeVolumeEffect, plParticleEffect );
virtual void PrepareEffect(const plEffectTargetInfo& target);
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual void Read(hsStream *s, hsResMgr *mgr);
virtual void Write(hsStream *s, hsResMgr *mgr);
//virtual hsBool MsgReceive(plMessage *msg);
//virtual bool MsgReceive(plMessage *msg);
float fLength;
hsBool fIgnoreZ;
bool fIgnoreZ;
};
class plParticleWindEffect : public plParticleEffect
@ -174,7 +174,7 @@ protected:
float fStrength;
float fConstancy;
float fSwirl;
hsBool fHorizontal;
bool fHorizontal;
hsVector3 fRefDir;
// Some cached properties. These will be the same for all
@ -193,7 +193,7 @@ public:
GETINTERFACE_ANY( plParticleWindEffect, plParticleEffect );
virtual void PrepareEffect(const plEffectTargetInfo& target);
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i) = 0;
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i) = 0;
virtual void Read(hsStream *s, hsResMgr *mgr);
virtual void Write(hsStream *s, hsResMgr *mgr);
@ -207,8 +207,8 @@ public:
void SetSwirl(float s) { fSwirl = s; }
float GetSwirl() const { return fSwirl; }
void SetHorizontal(hsBool on) { fHorizontal = on; }
hsBool GetHorizontal() const { return fHorizontal; }
void SetHorizontal(bool on) { fHorizontal = on; }
bool GetHorizontal() const { return fHorizontal; }
void SetRefDirection(const hsVector3& v);
const hsVector3& GetRefDirection() const { return fRefDir; }
@ -232,7 +232,7 @@ public:
GETINTERFACE_ANY( plParticleLocalWind, plParticleWindEffect );
virtual void PrepareEffect(const plEffectTargetInfo& target);
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
void SetScale(const hsVector3& v) { fScale = v; }
const hsVector3& GetScale() const { return fScale; }
@ -266,7 +266,7 @@ public:
GETINTERFACE_ANY( plParticleUniformWind, plParticleWindEffect );
virtual void PrepareEffect(const plEffectTargetInfo& target);
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
void SetFrequencyRange(float minSecsPerCycle, float maxSecsPerCycle);
void SetFrequencyRate(float secsPerCycle);
@ -315,7 +315,7 @@ public:
GETINTERFACE_ANY( plParticleFlockEffect, plParticleEffect );
virtual void PrepareEffect(const plEffectTargetInfo& target);
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
void SetTargetOffset(const hsPoint3 &offset) { fTargetOffset = offset; }
void SetDissenterTarget(const hsPoint3 &target) { fDissenterTarget = target; }
@ -333,7 +333,7 @@ public:
virtual void Read(hsStream *s, hsResMgr *mgr);
virtual void Write(hsStream *s, hsResMgr *mgr);
virtual hsBool MsgReceive(plMessage *msg);
virtual bool MsgReceive(plMessage *msg);
};
class plParticleFollowSystemEffect : public plParticleEffect
@ -345,12 +345,12 @@ public:
plParticleFollowSystemEffect();
virtual void PrepareEffect(const plEffectTargetInfo& target);
virtual hsBool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual bool ApplyEffect(const plEffectTargetInfo& target, int32_t i);
virtual void EndEffect(const plEffectTargetInfo& target);
protected:
hsMatrix44 fOldW2L;
hsBool fEvalThisFrame;
bool fEvalThisFrame;
};
#endif

2
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp
View File

@ -285,7 +285,7 @@ void plParticleEmitter::TranslateAllParticles(hsPoint3 &amount)
fParticleCores[i].fPos += amount;
}
hsBool plParticleEmitter::IUpdate(float delta)
bool plParticleEmitter::IUpdate(float delta)
{
if (fMiscFlags & kNeedsUpdate)
{

4
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h
View File

@ -92,7 +92,7 @@ public:
void OverrideLocalToWorld(const hsMatrix44& l2w);
void UnOverrideLocalToWorld() { fMiscFlags &= ~kOverrideLocalToWorld; }
hsBool LocalToWorldOverridden() const { return 0 != (fMiscFlags & kOverrideLocalToWorld); }
bool LocalToWorldOverridden() const { return 0 != (fMiscFlags & kOverrideLocalToWorld); }
void SetTimeToLive(float dt) { fTimeToLive = dt; }
float GetTimeToLive() const { return fTimeToLive; } // 0 time to live is never turn off.
@ -150,7 +150,7 @@ protected:
void IClear();
void ISetupParticleMem();
void ISetSystem(plParticleSystem *sys) { fSystem = sys; }
hsBool IUpdate(float delta);
bool IUpdate(float delta);
void IUpdateParticles(float delta);
void IUpdateBoundsAndNormals(float delta);
void IRemoveParticle(uint32_t index);

4
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp
View File

@ -135,7 +135,7 @@ void plSimpleParticleGenerator::Init(float genLife, float partLifeMin, float par
if (fGenLife < 0) fMiscFlags |= kImmortal;
}
hsBool plSimpleParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced /* = 0 */)
bool plSimpleParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced /* = 0 */)
{
int32_t numNewParticles;
@ -378,7 +378,7 @@ void plOneTimeParticleGenerator::Init(float count, hsPoint3 *pointArray, hsVecto
}
// The numForced param is required by the parent class, but ignored by this particular generator
hsBool plOneTimeParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced /* = 0 */)
bool plOneTimeParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced /* = 0 */)
{
float currSizeVar;
float scale = (fScaleMax + fScaleMin) / 2;

6
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h
View File

@ -56,7 +56,7 @@ class plParticleGenerator : public plCreatable
public:
// returns false if it's done generating particles and is safe to delete.
virtual hsBool AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced = 0) = 0;
virtual bool AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced = 0) = 0;
virtual void UpdateParam(uint32_t paramID, float paramValue) = 0;
@ -82,7 +82,7 @@ public:
CLASSNAME_REGISTER( plSimpleParticleGenerator );
GETINTERFACE_ANY( plSimpleParticleGenerator, plParticleGenerator);
virtual hsBool AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced);
virtual bool AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced);
virtual void UpdateParam(uint32_t paramID, float paramValue);
virtual void Read(hsStream* s, hsResMgr *mgr);
@ -131,7 +131,7 @@ public:
CLASSNAME_REGISTER( plOneTimeParticleGenerator );
GETINTERFACE_ANY( plOneTimeParticleGenerator, plParticleGenerator);
virtual hsBool AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced = 0);
virtual bool AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced = 0);
virtual void UpdateParam(uint32_t paramID, float paramValue) {}
virtual void Read(hsStream* s, hsResMgr *mgr);

12
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp
View File

@ -306,7 +306,7 @@ plParticleEffect *plParticleSystem::GetEffect(uint16_t type) const
return nil;
}
uint32_t plParticleSystem::GetNumValidParticles(hsBool immortalOnly /* = false */) const
uint32_t plParticleSystem::GetNumValidParticles(bool immortalOnly /* = false */) const
{
uint32_t count = 0;
int i, j;
@ -332,14 +332,14 @@ const hsMatrix44 &plParticleSystem::GetLocalToWorld() const
return fTarget->GetCoordinateInterface()->GetLocalToWorld();
}
hsBool plParticleSystem::IEval(double secs, float del, uint32_t dirty)
bool plParticleSystem::IEval(double secs, float del, uint32_t dirty)
{
return false;
}
hsBool plParticleSystem::IShouldUpdate(plPipeline* pipe) const
bool plParticleSystem::IShouldUpdate(plPipeline* pipe) const
{
if (fMiscFlags & kParticleSystemAlwaysUpdate)
@ -365,7 +365,7 @@ hsBool plParticleSystem::IShouldUpdate(plPipeline* pipe) const
}
// Now, are we visible?
hsBool isVisible = pipe->TestVisibleWorld(wBnd);
bool isVisible = pipe->TestVisibleWorld(wBnd);
float delta = fLastTime > 0 ? float(fCurrTime - fLastTime) : hsTimer::GetDelSysSeconds();
if( isVisible )
@ -430,7 +430,7 @@ void plParticleSystem::IHandleRenderMsg(plPipeline* pipe)
if( !di )
return;
hsBool disabled = di->GetProperty(plDrawInterface::kDisable);
bool disabled = di->GetProperty(plDrawInterface::kDisable);
if (!IShouldUpdate(pipe))
{
if (disabled)
@ -473,7 +473,7 @@ void plParticleSystem::IHandleRenderMsg(plPipeline* pipe)
plProfile_CreateTimer("ParticleSys", "RenderSetup", ParticleSys);
hsBool plParticleSystem::MsgReceive(plMessage* msg)
bool plParticleSystem::MsgReceive(plMessage* msg)
{
plGenRefMsg* refMsg;
plParticleUpdateMsg *partMsg;

8
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h
View File

@ -112,8 +112,8 @@ protected:
plParticleSDLMod *fParticleSDLMod;
hsBool IShouldUpdate(plPipeline* pipe) const;
virtual hsBool IEval(double secs, float del, uint32_t dirty); // required by plModifier
bool IShouldUpdate(plPipeline* pipe) const;
virtual bool IEval(double secs, float del, uint32_t dirty); // required by plModifier
void IHandleRenderMsg(plPipeline* pipe);
plDrawInterface* ICheckDrawInterface();
void IAddEffect(plParticleEffect *effect, uint32_t type);
@ -163,7 +163,7 @@ public:
void DisableGenerators();
uint32_t GetNumTiles() const { return fXTiles * fYTiles; }
void SetTileIndex(plParticle &particle, uint32_t index); // Sets the UV coordinates appropriate for the current texture
uint32_t GetNumValidParticles(hsBool immortalOnly = false) const; // Takes a bit longer if we want a count of immortal particles...
uint32_t GetNumValidParticles(bool immortalOnly = false) const; // Takes a bit longer if we want a count of immortal particles...
uint32_t GetMaxTotalParticles() const { return fMaxTotalParticles; }
const hsMatrix44 &GetLocalToWorld() const;
@ -189,7 +189,7 @@ public:
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
void SetAttachedToAvatar(bool attached);