mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 10:52:46 +00:00
Obliterate hsBool
This commit is contained in:
@ -167,7 +167,7 @@ plLOSDispatch::~plLOSDispatch()
|
||||
plgDispatch::Dispatch()->UnRegisterForExactType(plLOSRequestMsg::Index(), GetKey());
|
||||
}
|
||||
|
||||
hsBool plLOSDispatch::MsgReceive(plMessage* msg)
|
||||
bool plLOSDispatch::MsgReceive(plMessage* msg)
|
||||
{
|
||||
|
||||
plLOSRequestMsg* requestMsg = plLOSRequestMsg::ConvertNoRef(msg);
|
||||
|
||||
@ -59,7 +59,7 @@ public:
|
||||
CLASSNAME_REGISTER(plLOSDispatch);
|
||||
GETINTERFACE_ANY(plLOSDispatch, hsKeyedObject);
|
||||
|
||||
virtual hsBool MsgReceive(plMessage* msg);
|
||||
virtual bool MsgReceive(plMessage* msg);
|
||||
|
||||
protected:
|
||||
plMessage* ICreateHitMsg(plLOSRequestMsg* requestMsg, hsMatrix44& l2w);
|
||||
|
||||
@ -311,7 +311,7 @@ void plPXPhysical::ISetHullToWorldWTriangles()
|
||||
}
|
||||
|
||||
|
||||
hsBool plPXPhysical::IsObjectInsideHull(const hsPoint3& pos)
|
||||
bool plPXPhysical::IsObjectInsideHull(const hsPoint3& pos)
|
||||
{
|
||||
if (fSaveTriangles)
|
||||
{
|
||||
@ -327,7 +327,7 @@ hsBool plPXPhysical::IsObjectInsideHull(const hsPoint3& pos)
|
||||
return false;
|
||||
}
|
||||
|
||||
hsBool plPXPhysical::Should_I_Trigger(hsBool enter, hsPoint3& pos)
|
||||
bool plPXPhysical::Should_I_Trigger(bool enter, hsPoint3& pos)
|
||||
{
|
||||
// see if we are inside the detector hull, if so, then don't trigger
|
||||
bool trigger = false;
|
||||
@ -356,9 +356,9 @@ hsBool plPXPhysical::Should_I_Trigger(hsBool enter, hsPoint3& pos)
|
||||
}
|
||||
|
||||
|
||||
hsBool plPXPhysical::Init(PhysRecipe& recipe)
|
||||
bool plPXPhysical::Init(PhysRecipe& recipe)
|
||||
{
|
||||
hsBool startAsleep = false;
|
||||
bool startAsleep = false;
|
||||
fBoundsType = recipe.bounds;
|
||||
fGroup = recipe.group;
|
||||
fReportsOn = recipe.reportsOn;
|
||||
@ -577,7 +577,7 @@ hsBool plPXPhysical::Init(PhysRecipe& recipe)
|
||||
/////////////////////////////////////////////////////////////////
|
||||
|
||||
// MSGRECEIVE
|
||||
hsBool plPXPhysical::MsgReceive( plMessage* msg )
|
||||
bool plPXPhysical::MsgReceive( plMessage* msg )
|
||||
{
|
||||
if(plGenRefMsg *refM = plGenRefMsg::ConvertNoRef(msg))
|
||||
{
|
||||
@ -610,7 +610,7 @@ hsBool plPXPhysical::MsgReceive( plMessage* msg )
|
||||
// there's two things we hold references to: subworlds
|
||||
// and the simulation manager.
|
||||
// right now, we're only worrying about the subworlds
|
||||
hsBool plPXPhysical::HandleRefMsg(plGenRefMsg* refMsg)
|
||||
bool plPXPhysical::HandleRefMsg(plGenRefMsg* refMsg)
|
||||
{
|
||||
uint8_t refCtxt = refMsg->GetContext();
|
||||
plKey refKey = refMsg->GetRef()->GetKey();
|
||||
@ -655,7 +655,7 @@ hsBool plPXPhysical::HandleRefMsg(plGenRefMsg* refMsg)
|
||||
return true;
|
||||
}
|
||||
|
||||
void plPXPhysical::IEnable(hsBool enable)
|
||||
void plPXPhysical::IEnable(bool enable)
|
||||
{
|
||||
fProps.SetBit(plSimulationInterface::kDisable, !enable);
|
||||
if (!enable)
|
||||
@ -680,7 +680,7 @@ void plPXPhysical::IEnable(hsBool enable)
|
||||
}
|
||||
}
|
||||
|
||||
plPhysical& plPXPhysical::SetProperty(int prop, hsBool status)
|
||||
plPhysical& plPXPhysical::SetProperty(int prop, bool status)
|
||||
{
|
||||
if (GetProperty(prop) == status)
|
||||
{
|
||||
@ -713,7 +713,7 @@ plPhysical& plPXPhysical::SetProperty(int prop, hsBool status)
|
||||
{
|
||||
// if the body is already unpinned and you unpin it again,
|
||||
// you'll wipe out its velocity. hence the check.
|
||||
hsBool current = fActor->readBodyFlag(NX_BF_FROZEN);
|
||||
bool current = fActor->readBodyFlag(NX_BF_FROZEN);
|
||||
if (status != current)
|
||||
{
|
||||
if (status)
|
||||
@ -764,14 +764,14 @@ bool CompareMatrices(const hsMatrix44 &matA, const hsMatrix44 &matB, float toler
|
||||
|
||||
// Called after the simulation has run....sends new positions to the various scene objects
|
||||
// *** want to do this in response to an update message....
|
||||
void plPXPhysical::SendNewLocation(hsBool synchTransform, hsBool isSynchUpdate)
|
||||
void plPXPhysical::SendNewLocation(bool synchTransform, bool isSynchUpdate)
|
||||
{
|
||||
// we only send if:
|
||||
// - the body is active or forceUpdate is on
|
||||
// - the mass is non-zero
|
||||
// - the physical is not passive
|
||||
hsBool bodyActive = !fActor->isSleeping();
|
||||
hsBool dynamic = fActor->isDynamic();
|
||||
bool bodyActive = !fActor->isSleeping();
|
||||
bool dynamic = fActor->isDynamic();
|
||||
|
||||
if ((bodyActive || isSynchUpdate) && dynamic)// && fInitialTransform)
|
||||
{
|
||||
@ -920,7 +920,7 @@ void plPXPhysical::ISetRotationSim(const hsQuat& rot)
|
||||
}
|
||||
|
||||
// This form is assumed by convention to be global.
|
||||
void plPXPhysical::SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l, hsBool force)
|
||||
void plPXPhysical::SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l, bool force)
|
||||
{
|
||||
// hsAssert(real_finite(l2w.fMap[0][3]) && real_finite(l2w.fMap[1][3]) && real_finite(l2w.fMap[2][3]), "Bad transform incoming");
|
||||
|
||||
@ -947,9 +947,9 @@ void plPXPhysical::GetTransform(hsMatrix44& l2w, hsMatrix44& w2l)
|
||||
l2w.GetInverse(&w2l);
|
||||
}
|
||||
|
||||
hsBool plPXPhysical::GetLinearVelocitySim(hsVector3& vel) const
|
||||
bool plPXPhysical::GetLinearVelocitySim(hsVector3& vel) const
|
||||
{
|
||||
hsBool result = false;
|
||||
bool result = false;
|
||||
|
||||
if (fActor->isDynamic())
|
||||
{
|
||||
@ -973,9 +973,9 @@ void plPXPhysical::ClearLinearVelocity()
|
||||
SetLinearVelocitySim(hsVector3(0, 0, 0));
|
||||
}
|
||||
|
||||
hsBool plPXPhysical::GetAngularVelocitySim(hsVector3& vel) const
|
||||
bool plPXPhysical::GetAngularVelocitySim(hsVector3& vel) const
|
||||
{
|
||||
hsBool result = false;
|
||||
bool result = false;
|
||||
if (fActor->isDynamic())
|
||||
{
|
||||
vel = plPXConvert::Vector(fActor->getAngularVelocity());
|
||||
@ -1195,7 +1195,7 @@ void plPXPhysical::Write(hsStream* stream, hsResMgr* mgr)
|
||||
// TESTING SDL
|
||||
// Send phys sendState msg to object's plPhysicalSDLModifier
|
||||
//
|
||||
hsBool plPXPhysical::DirtySynchState(const char* SDLStateName, uint32_t synchFlags )
|
||||
bool plPXPhysical::DirtySynchState(const char* SDLStateName, uint32_t synchFlags )
|
||||
{
|
||||
if (GetObjectKey())
|
||||
{
|
||||
@ -1252,7 +1252,7 @@ void plPXPhysical::SetSyncState(hsPoint3* pos, hsQuat* rot, hsVector3* linV, hsV
|
||||
SendNewLocation(false, true);
|
||||
}
|
||||
|
||||
void plPXPhysical::ExcludeRegionHack(hsBool cleared)
|
||||
void plPXPhysical::ExcludeRegionHack(bool cleared)
|
||||
{
|
||||
NxShape* shape = fActor->getShapes()[0];
|
||||
shape->setFlag(NX_TRIGGER_ON_ENTER, !cleared);
|
||||
@ -1265,13 +1265,13 @@ void plPXPhysical::ExcludeRegionHack(hsBool cleared)
|
||||
plPXPhysicalControllerCore::RebuildCache();
|
||||
|
||||
}
|
||||
hsBool plPXPhysical::OverlapWithCapsule(NxCapsule& cap)
|
||||
bool plPXPhysical::OverlapWithCapsule(NxCapsule& cap)
|
||||
{
|
||||
NxShape* shape = fActor->getShapes()[0];
|
||||
return shape->checkOverlapCapsule(cap);
|
||||
}
|
||||
|
||||
hsBool plPXPhysical::IsDynamic() const
|
||||
bool plPXPhysical::IsDynamic() const
|
||||
{
|
||||
return fGroup == plSimDefs::kGroupDynamic &&
|
||||
!GetProperty(plSimulationInterface::kPhysAnim);
|
||||
@ -1332,7 +1332,7 @@ plDrawableSpans* plPXPhysical::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>&
|
||||
hsMatrix44 l2w, unused;
|
||||
GetTransform(l2w, unused);
|
||||
|
||||
hsBool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
bool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
|
||||
NxShape* shape = fActor->getShapes()[0];
|
||||
|
||||
|
||||
@ -120,18 +120,18 @@ public:
|
||||
GETINTERFACE_ANY(plPXPhysical, plPhysical);
|
||||
|
||||
// Export time and internal use only
|
||||
hsBool Init(PhysRecipe& recipe);
|
||||
bool Init(PhysRecipe& recipe);
|
||||
|
||||
virtual void Read(hsStream* s, hsResMgr* mgr);
|
||||
virtual void Write(hsStream* s, hsResMgr* mgr);
|
||||
|
||||
virtual hsBool MsgReceive(plMessage* msg);
|
||||
virtual bool MsgReceive(plMessage* msg);
|
||||
|
||||
//
|
||||
// From plPhysical
|
||||
//
|
||||
virtual plPhysical& SetProperty(int prop, hsBool b);
|
||||
virtual hsBool GetProperty(int prop) const { return fProps.IsBitSet(prop) != 0; }
|
||||
virtual plPhysical& SetProperty(int prop, bool b);
|
||||
virtual bool GetProperty(int prop) const { return fProps.IsBitSet(prop) != 0; }
|
||||
|
||||
virtual void SetObjectKey(plKey key) { fObjectKey = key; }
|
||||
virtual plKey GetObjectKey() const { return fObjectKey; }
|
||||
@ -139,14 +139,14 @@ public:
|
||||
virtual void SetSceneNode(plKey node);
|
||||
virtual plKey GetSceneNode() const;
|
||||
|
||||
virtual hsBool GetLinearVelocitySim(hsVector3& vel) const;
|
||||
virtual bool GetLinearVelocitySim(hsVector3& vel) const;
|
||||
virtual void SetLinearVelocitySim(const hsVector3& vel);
|
||||
virtual void ClearLinearVelocity();
|
||||
|
||||
virtual hsBool GetAngularVelocitySim(hsVector3& vel) const;
|
||||
virtual bool GetAngularVelocitySim(hsVector3& vel) const;
|
||||
virtual void SetAngularVelocitySim(const hsVector3& vel);
|
||||
|
||||
virtual void SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l, hsBool force=false);
|
||||
virtual void SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l, bool force=false);
|
||||
virtual void GetTransform(hsMatrix44& l2w, hsMatrix44& w2l);
|
||||
|
||||
virtual int GetGroup() const { return fGroup; }
|
||||
@ -154,12 +154,12 @@ public:
|
||||
virtual void AddLOSDB(uint16_t flag) { hsSetBits(fLOSDBs, flag); }
|
||||
virtual void RemoveLOSDB(uint16_t flag) { hsClearBits(fLOSDBs, flag); }
|
||||
virtual uint16_t GetAllLOSDBs() { return fLOSDBs; }
|
||||
virtual hsBool IsInLOSDB(uint16_t flag) { return hsCheckBits(fLOSDBs, flag); }
|
||||
virtual bool IsInLOSDB(uint16_t flag) { return hsCheckBits(fLOSDBs, flag); }
|
||||
|
||||
virtual hsBool DoDetectorHullWorkaround() { return fSaveTriangles ? true : false; }
|
||||
virtual hsBool Should_I_Trigger(hsBool enter, hsPoint3& pos);
|
||||
virtual hsBool IsObjectInsideHull(const hsPoint3& pos);
|
||||
virtual void SetInsideConvexHull(hsBool inside) { fInsideConvexHull = inside; }
|
||||
virtual bool DoDetectorHullWorkaround() { return fSaveTriangles ? true : false; }
|
||||
virtual bool Should_I_Trigger(bool enter, hsPoint3& pos);
|
||||
virtual bool IsObjectInsideHull(const hsPoint3& pos);
|
||||
virtual void SetInsideConvexHull(bool inside) { fInsideConvexHull = inside; }
|
||||
|
||||
virtual plKey GetWorldKey() const { return fWorldKey; }
|
||||
|
||||
@ -167,7 +167,7 @@ public:
|
||||
|
||||
virtual void GetPositionSim(hsPoint3& pos) const { IGetPositionSim(pos); }
|
||||
|
||||
virtual void SendNewLocation(hsBool synchTransform = false, hsBool isSynchUpdate = false);
|
||||
virtual void SendNewLocation(bool synchTransform = false, bool isSynchUpdate = false);
|
||||
|
||||
virtual void SetHitForce(const hsVector3& force, const hsPoint3& pos) { fWeWereHit=true; fHitForce = force; fHitPos = pos; }
|
||||
virtual void ApplyHitForce();
|
||||
@ -176,20 +176,20 @@ public:
|
||||
virtual void GetSyncState(hsPoint3& pos, hsQuat& rot, hsVector3& linV, hsVector3& angV);
|
||||
virtual void SetSyncState(hsPoint3* pos, hsQuat* rot, hsVector3* linV, hsVector3* angV);
|
||||
|
||||
virtual void ExcludeRegionHack(hsBool cleared);
|
||||
virtual void ExcludeRegionHack(bool cleared);
|
||||
|
||||
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
|
||||
|
||||
hsBool DoReportOn(plSimDefs::Group group) const { return hsCheckBits(fReportsOn, 1<<group); }
|
||||
bool DoReportOn(plSimDefs::Group group) const { return hsCheckBits(fReportsOn, 1<<group); }
|
||||
|
||||
// Returns true if this object is *really* dynamic. We can have physicals
|
||||
// that are in the dynamic group but are actually animated or something.
|
||||
// This weeds those out.
|
||||
hsBool IsDynamic() const;
|
||||
bool IsDynamic() const;
|
||||
|
||||
//Hack to check if there is an overlap with the capsule
|
||||
//this partially for exclude regions vs avatar capsule
|
||||
virtual hsBool OverlapWithCapsule(NxCapsule& cap);
|
||||
virtual bool OverlapWithCapsule(NxCapsule& cap);
|
||||
|
||||
virtual float GetMass() {return fMass;}
|
||||
protected:
|
||||
@ -199,7 +199,7 @@ protected:
|
||||
void ISetRotationSim(const hsQuat& rot);
|
||||
|
||||
/** Handle messages about our references. */
|
||||
hsBool HandleRefMsg(plGenRefMsg * refM);
|
||||
bool HandleRefMsg(plGenRefMsg * refM);
|
||||
|
||||
/////////////////////////////////////////////////////////////
|
||||
//
|
||||
@ -215,7 +215,7 @@ protected:
|
||||
bounceOff and vice-versa
|
||||
*/
|
||||
// Set overlapText to get a string naming all the overlapping physicals (that you must delete)
|
||||
hsBool CheckValidPosition(char** overlapText=nil);
|
||||
bool CheckValidPosition(char** overlapText=nil);
|
||||
|
||||
/////////////////////////////////////////////////////////////
|
||||
//
|
||||
@ -224,7 +224,7 @@ protected:
|
||||
/////////////////////////////////////////////////////////////
|
||||
|
||||
/** Remember that we need to do a synch soon. */
|
||||
hsBool DirtySynchState(const char* SDLStateName, uint32_t synchFlags );
|
||||
bool DirtySynchState(const char* SDLStateName, uint32_t synchFlags );
|
||||
|
||||
double GetLastSyncTime() { return fLastSyncTime; }
|
||||
|
||||
@ -234,7 +234,7 @@ protected:
|
||||
void ISetTransformGlobal(const hsMatrix44& l2w);
|
||||
|
||||
// Enable/disable collisions and dynamic movement
|
||||
void IEnable(hsBool enable);
|
||||
void IEnable(bool enable);
|
||||
|
||||
void IMakeHull(NxConvexMesh* convexMesh, hsMatrix44 l2w);
|
||||
|
||||
@ -255,9 +255,9 @@ protected:
|
||||
hsPlane3* fWorldHull;
|
||||
uint32_t fHullNumberPlanes;
|
||||
hsPoint3* fSaveTriangles;
|
||||
hsBool fInsideConvexHull;
|
||||
bool fInsideConvexHull;
|
||||
void ISetHullToWorldWTriangles();
|
||||
inline hsBool ITestPlane(const hsPoint3 &pos, const hsPlane3 &plane)
|
||||
inline bool ITestPlane(const hsPoint3 &pos, const hsPlane3 &plane)
|
||||
{
|
||||
float dis = plane.fN.InnerProduct(pos);
|
||||
dis += plane.fD;
|
||||
@ -280,7 +280,7 @@ protected:
|
||||
|
||||
plPhysicalSndGroup* fSndGroup;
|
||||
|
||||
hsBool fWeWereHit;
|
||||
bool fWeWereHit;
|
||||
hsVector3 fHitForce;
|
||||
hsPoint3 fHitPos;
|
||||
|
||||
|
||||
@ -76,7 +76,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#include "plPipeline/plDebugText.h"
|
||||
hsBool plPXPhysicalController::fDebugDisplay = false;
|
||||
bool plPXPhysicalController::fDebugDisplay = false;
|
||||
#endif // PLASMA_EXTERNAL_RELEASE
|
||||
|
||||
static ControllerManager gControllerMgr;
|
||||
@ -1223,7 +1223,7 @@ plDrawableSpans* plPXPhysicalController::CreateProxy(hsGMaterial* mat, hsTArray<
|
||||
{
|
||||
plDrawableSpans* myDraw = addTo;
|
||||
|
||||
hsBool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
bool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
float radius = fRadius;
|
||||
myDraw = plDrawableGenerator::GenerateSphericalDrawable(fLocalPosition, radius,
|
||||
mat, fLastGlobalLoc, blended,
|
||||
@ -1233,7 +1233,7 @@ plDrawableSpans* plPXPhysicalController::CreateProxy(hsGMaterial* mat, hsTArray<
|
||||
plSceneObject* so = plSceneObject::ConvertNoRef(fOwner->ObjectIsLoaded());
|
||||
if (so)
|
||||
{
|
||||
hsBool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
bool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
|
||||
myDraw = plDrawableGenerator::GenerateConicalDrawable(fRadius*10, fHeight*10,
|
||||
mat, so->GetLocalToWorld(), blended,
|
||||
|
||||
@ -61,7 +61,7 @@ class plDbgCollisionInfo
|
||||
public:
|
||||
plSceneObject *fSO;
|
||||
hsVector3 fNormal;
|
||||
hsBool fOverlap;
|
||||
bool fOverlap;
|
||||
};
|
||||
#endif // PLASMA_EXTERNAL_RELEASE
|
||||
|
||||
@ -134,7 +134,7 @@ public:
|
||||
virtual void SetSeek(bool seek){fSeeking=seek;}
|
||||
virtual void GetWorldSpaceCapsule(NxCapsule& cap);
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
static hsBool fDebugDisplay;
|
||||
static bool fDebugDisplay;
|
||||
#endif // PLASMA_EXTERNAL_RELEASE
|
||||
|
||||
protected:
|
||||
|
||||
@ -77,7 +77,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
hsBool plPXPhysicalControllerCore::fDebugDisplay = false;
|
||||
bool plPXPhysicalControllerCore::fDebugDisplay = false;
|
||||
#endif // PLASMA_EXTERNAL_RELEASE
|
||||
int plPXPhysicalControllerCore::fPXControllersMax = 0;
|
||||
|
||||
@ -1003,7 +1003,7 @@ void plPXPhysicalControllerCore::LeaveAge()
|
||||
if(fWorldKey) this->SetSubworld(nil);
|
||||
this->fMovementInterface->LeaveAge();
|
||||
}
|
||||
int plPXPhysicalControllerCore::SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, hsBool vsDynamics, hsBool vsStatics,
|
||||
int plPXPhysicalControllerCore::SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, bool vsDynamics, bool vsStatics,
|
||||
uint32_t& vsSimGroups, std::multiset< plControllerSweepRecord >& WhatWasHitOut)
|
||||
{
|
||||
NxCapsule tempCap;
|
||||
@ -1054,7 +1054,7 @@ int plPXPhysicalControllerCore::SweepControllerPath(const hsPoint3& startPos, co
|
||||
|
||||
return HitsReturned;
|
||||
}
|
||||
void plPXPhysicalControllerCore::BehaveLikeAnimatedPhysical(hsBool actLikeAnAnimatedPhys)
|
||||
void plPXPhysicalControllerCore::BehaveLikeAnimatedPhysical(bool actLikeAnAnimatedPhys)
|
||||
{
|
||||
hsAssert(fKinematicActor, "Changing behavior, but plPXPhysicalControllerCore has no Kinematic actor associated with it");
|
||||
if(fBehavingLikeAnimatedPhys!=actLikeAnAnimatedPhys)
|
||||
@ -1085,7 +1085,7 @@ void plPXPhysicalControllerCore::BehaveLikeAnimatedPhysical(hsBool actLikeAnAnim
|
||||
}
|
||||
}
|
||||
|
||||
hsBool plPXPhysicalControllerCore::BehavingLikeAnAnimatedPhysical()
|
||||
bool plPXPhysicalControllerCore::BehavingLikeAnAnimatedPhysical()
|
||||
{
|
||||
hsAssert(fKinematicActor, "plPXPhysicalControllerCore is missing a kinematic actor");
|
||||
return fBehavingLikeAnimatedPhys;
|
||||
@ -1139,7 +1139,7 @@ const hsVector3& plPXPhysicalControllerCore::GetLinearVelocity()
|
||||
plDrawableSpans* plPXPhysicalControllerCore::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
|
||||
{
|
||||
plDrawableSpans* myDraw = addTo;
|
||||
hsBool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
bool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
float radius = fRadius;
|
||||
myDraw = plDrawableGenerator::GenerateSphericalDrawable(fLocalPosition, radius,
|
||||
mat, fLastGlobalLoc, blended,
|
||||
@ -1149,7 +1149,7 @@ plDrawableSpans* plPXPhysicalControllerCore::CreateProxy(hsGMaterial* mat, hsTAr
|
||||
plSceneObject* so = plSceneObject::ConvertNoRef(fOwner->ObjectIsLoaded());
|
||||
if (so)
|
||||
{
|
||||
hsBool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
bool blended = ((mat->GetLayer(0)->GetBlendFlags() & hsGMatState::kBlendMask));
|
||||
|
||||
myDraw = plDrawableGenerator::GenerateConicalDrawable(fRadius*10, fHeight*10,
|
||||
mat, so->GetLocalToWorld(), blended,
|
||||
|
||||
@ -61,7 +61,7 @@ class plDbgCollisionInfo
|
||||
public:
|
||||
plSceneObject *fSO;
|
||||
hsVector3 fNormal;
|
||||
hsBool fOverlap;
|
||||
bool fOverlap;
|
||||
};
|
||||
#endif // PLASMA_EXTERNAL_RELEASE
|
||||
class plPXPhysicalControllerCore: public plPhysicalControllerCore
|
||||
@ -118,13 +118,13 @@ public:
|
||||
static void UpdatePostSimStep(float delSecs);
|
||||
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
static hsBool fDebugDisplay;
|
||||
static bool fDebugDisplay;
|
||||
#endif // PLASMA_EXTERNAL_RELEASE
|
||||
static void SetMaxNumberOfControllers(int max) { fPXControllersMax = max; }
|
||||
static int fPXControllersMax;
|
||||
virtual int SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, hsBool vsDynamics, hsBool vsStatics, uint32_t& vsSimGroups, std::multiset< plControllerSweepRecord >& WhatWasHitOut);
|
||||
virtual void BehaveLikeAnimatedPhysical(hsBool actLikeAnAnimatedPhys);
|
||||
virtual hsBool BehavingLikeAnAnimatedPhysical();
|
||||
virtual int SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, bool vsDynamics, bool vsStatics, uint32_t& vsSimGroups, std::multiset< plControllerSweepRecord >& WhatWasHitOut);
|
||||
virtual void BehaveLikeAnimatedPhysical(bool actLikeAnAnimatedPhys);
|
||||
virtual bool BehavingLikeAnAnimatedPhysical();
|
||||
virtual const hsVector3& GetLinearVelocity();
|
||||
|
||||
virtual void SetLinearVelocity(const hsVector3& linearVel);
|
||||
@ -156,5 +156,5 @@ protected:
|
||||
// The global position and rotation of the avatar last time we set it (so we
|
||||
// can detect if someone else moves him)
|
||||
plPhysicalProxy* fProxyGen;
|
||||
hsBool fBehavingLikeAnimatedPhys;
|
||||
bool fBehavingLikeAnimatedPhys;
|
||||
};
|
||||
|
||||
@ -72,7 +72,7 @@ class SensorReport : public NxUserTriggerReport
|
||||
{
|
||||
// Get our trigger physical. This should definitely have a plPXPhysical
|
||||
plPXPhysical* triggerPhys = (plPXPhysical*)triggerShape.getActor().userData;
|
||||
hsBool doReport = false;
|
||||
bool doReport = false;
|
||||
|
||||
// Get the triggerer. This may be an avatar, which doesn't have a
|
||||
// plPXPhysical, so we have to extract the necessary info.
|
||||
@ -507,7 +507,7 @@ void plSimulationMgr::ReleaseScene(plKey world)
|
||||
}
|
||||
}
|
||||
|
||||
void plSimulationMgr::ISendCollisionMsg(plKey receiver, plKey hitter, hsBool entering)
|
||||
void plSimulationMgr::ISendCollisionMsg(plKey receiver, plKey hitter, bool entering)
|
||||
{
|
||||
DetectorLogYellow("Collision: %s is inside %s. Sending an %s msg", hitter ? hitter->GetName().c_str() : "(nil)",
|
||||
receiver->GetName().c_str(), entering ? "'enter'" : "'exit'");
|
||||
@ -774,7 +774,7 @@ void plSimulationMgr::ISendUpdates()
|
||||
}
|
||||
}
|
||||
|
||||
hsBool plSimulationMgr::MsgReceive(plMessage *msg)
|
||||
bool plSimulationMgr::MsgReceive(plMessage *msg)
|
||||
{
|
||||
// Suspend/resume the simulation based on whether or not we're in an age...
|
||||
if (plAgeLoadedMsg* aMsg = plAgeLoadedMsg::ConvertNoRef(msg))
|
||||
|
||||
@ -75,7 +75,7 @@ public:
|
||||
// Advance the simulation by the given number of seconds
|
||||
void Advance(float delSecs);
|
||||
|
||||
hsBool MsgReceive(plMessage* msg);
|
||||
bool MsgReceive(plMessage* msg);
|
||||
|
||||
// The simulation won't run at all if it is suspended
|
||||
void Suspend() { fSuspended = true; }
|
||||
@ -122,7 +122,7 @@ protected:
|
||||
void IProcessSynchs();
|
||||
|
||||
// PHYSX FIXME send a collision message - should only be used with UpdateDetectorsInScene
|
||||
void ISendCollisionMsg(plKey receiver, plKey hitter, hsBool entering);
|
||||
void ISendCollisionMsg(plKey receiver, plKey hitter, bool entering);
|
||||
|
||||
NxPhysicsSDK* fSDK;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user