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

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp
View File

@ -215,7 +215,7 @@ void plLightInfo::GetAffected(const plSpaceTree* space, hsBitVector& list, hsBoo
}
}
const hsTArray<Int16>& plLightInfo::GetAffected(plSpaceTree* space, const hsTArray<Int16>& visList, hsTArray<Int16>& litList, hsBool charac)
const hsTArray<int16_t>& plLightInfo::GetAffected(plSpaceTree* space, const hsTArray<int16_t>& visList, hsTArray<int16_t>& litList, hsBool charac)
{
Refresh();
@ -712,7 +712,7 @@ void plLimitedDirLightInfo::IMakeIsect()
// Creates a new box drawable for showing the light's
// influence.
plDrawableSpans* plLimitedDirLightInfo::CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plLimitedDirLightInfo::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
hsPoint3 corner;
corner.Set(-fWidth*0.5f, -fHeight*0.5f, -fDepth);
@ -864,7 +864,7 @@ void plOmniLightInfo::Write(hsStream* s, hsResMgr* mgr)
// Creates a new sphere drawable for showing the omnilight's
// sphere (haha) of influence.
plDrawableSpans* plOmniLightInfo::CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plOmniLightInfo::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
float rad = GetRadius();
if( rad == 0 )
@ -1000,7 +1000,7 @@ hsVector3 plSpotLightInfo::GetWorldDirection() const
// Generates a new drawable for showing the spotlight's
// sphere of influence.
plDrawableSpans* plSpotLightInfo::CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plSpotLightInfo::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
float rad = GetRadius();
float x, y;

14
Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h
View File

@ -104,7 +104,7 @@ protected:
kVolEmpty = 0x2,
kVolZero = 0x4
};
UInt8 fVolFlags;
uint8_t fVolFlags;
hsBitVector fVisSet;
hsBitVector fVisNot;
@ -188,7 +188,7 @@ public:
hsBool AffectsBound(const hsBounds3Ext& bnd) { return IGetIsect() ? IGetIsect()->Test(bnd) != kVolumeCulled : true; }
void GetAffectedForced(const plSpaceTree* space, hsBitVector& list, hsBool charac);
void GetAffected(const plSpaceTree* space, hsBitVector& list, hsBool charac);
const hsTArray<Int16>& GetAffected(plSpaceTree* space, const hsTArray<Int16>& visList, hsTArray<Int16>& litList, hsBool charac);
const hsTArray<int16_t>& GetAffected(plSpaceTree* space, const hsTArray<int16_t>& visList, hsTArray<int16_t>& litList, hsBool charac);
hsBool InVisSet(const hsBitVector& visSet) const { return fVisSet.Overlap(visSet); }
hsBool InVisNot(const hsBitVector& visNot) const { return fVisNot.Overlap(visNot); }
@ -210,7 +210,7 @@ public:
virtual const hsMatrix44& GetLightToWorld() const;
virtual const hsMatrix44& GetWorldToLight() const;
virtual Int32 GetNumProperties() const { return kNumProps; }
virtual int32_t GetNumProperties() const { return kNumProps; }
const plSoftVolume* GetSoftVolume() const { return fSoftVolume; }
@ -238,7 +238,7 @@ public:
void SetLocalToLight(const hsMatrix44& l2lt, const hsMatrix44& lt2l);
// Visualization
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo) { return addTo; }
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo) { return addTo; }
};
@ -302,7 +302,7 @@ public:
virtual void Write(hsStream* stream, hsResMgr* mgr);
// Visualization
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo);
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
};
class plOmniLightInfo : public plLightInfo
@ -351,7 +351,7 @@ public:
virtual void Write(hsStream* stream, hsResMgr* mgr);
// Visualization
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo);
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
};
@ -398,7 +398,7 @@ public:
virtual void Write(hsStream* stream, hsResMgr* mgr);
// Visualization
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo);
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
};

2
Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp
View File

@ -72,7 +72,7 @@ plKey plLightProxy::IGetNode() const
return fOwner ? fOwner->GetSceneNode() : nil;
}
plDrawableSpans* plLightProxy::ICreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plLightProxy::ICreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
if( fOwner )
{

2
Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h
View File

@ -53,7 +53,7 @@ protected:
plLightInfo* fOwner;
virtual plDrawableSpans* ICreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo=nil);
virtual plDrawableSpans* ICreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo=nil);
virtual plKey IGetNode() const;
public:
plLightProxy();

2
Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp
View File

@ -58,7 +58,7 @@ hsBool plLightSpace::MsgReceive(plMessage* msg)
// which is entering and leaving, and whether it is entering or leaving.
plKey otherKey = nil;
hsBool enter = true;
UInt8 ctx = enter ? plRefMsg::kOnRequest : plRefMsg::kOnRemove;
uint8_t ctx = enter ? plRefMsg::kOnRequest : plRefMsg::kOnRemove;
plLightRefMsg* liMsg = TRACKED_NEW plLightRefMsg(GetKey(), otherKey, IGetLightInfo(), ctx);
plgDispatch::MsgSend(liMsg);
return true;

2
Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h
View File

@ -62,7 +62,7 @@ public:
CLASSNAME_REGISTER( plLightSpace );
GETINTERFACE_ANY( plLightSpace, plMultiModifier );
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty) { return false; }
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty) { return false; }
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);

2
Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
View File

@ -322,7 +322,7 @@ bool plPerspDirSlave::SetupViewTransform(plPipeline* pipe)
hsScalar tanX = 1.f / cotX;
hsScalar tanY = 1.f / cotY;
fView.SetScreenSize((UInt16)fWidth, (UInt16)fHeight);
fView.SetScreenSize((uint16_t)fWidth, (uint16_t)fHeight);
fView.SetCameraTransform(pipe->GetViewTransform().GetWorldToCamera(), pipe->GetViewTransform().GetCameraToWorld());
fView.SetPerspective(true);
fView.SetViewPort(0, 0, (float)fWidth, (float)fHeight, false);

2
Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp
View File

@ -162,7 +162,7 @@ hsBool plShadowCaster::IOnRenderMsg(plRenderMsg* msg)
if( ShadowCastDisabled() )
return true;
const UInt8 shadowQuality = UInt8(plShadowMaster::GetGlobalShadowQuality() * 3.9f);
const uint8_t shadowQuality = uint8_t(plShadowMaster::GetGlobalShadowQuality() * 3.9f);
if( !GetKey()->GetUoid().GetLoadMask().MatchesQuality(shadowQuality) )
return true;

8
Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h
View File

@ -67,11 +67,11 @@ public:
class DrawSpan
{
public:
DrawSpan& Set(plDrawableSpans* dr, const plSpan* sp, UInt32 idx) { fDraw = (dr); fSpan = (sp); fIndex = (idx); return *this; }
DrawSpan& Set(plDrawableSpans* dr, const plSpan* sp, uint32_t idx) { fDraw = (dr); fSpan = (sp); fIndex = (idx); return *this; }
plDrawableSpans* fDraw;
const plSpan* fSpan;
UInt32 fIndex;
uint32_t fIndex;
};
protected:
@ -85,7 +85,7 @@ protected:
// never expected to change. Anything that might be
// triggered should go into plMultiModifier::fProps,
// to be network synced.
UInt8 fCastFlags;
uint8_t fCastFlags;
hsScalar fBoost;
hsScalar fAttenScale;
@ -110,7 +110,7 @@ public:
CLASSNAME_REGISTER( plShadowCaster );
GETINTERFACE_ANY( plShadowCaster, plMultiModifier );
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty) { return true; }
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty) { return true; }
virtual hsBool MsgReceive(plMessage* msg);

24
Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp
View File

@ -62,7 +62,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plTweak.h"
UInt32 plShadowMaster::fGlobalMaxSize = 512;
uint32_t plShadowMaster::fGlobalMaxSize = 512;
hsScalar plShadowMaster::fGlobalMaxDist = 160.f; // PERSPTEST
// hsScalar plShadowMaster::fGlobalMaxDist = 100000.f; // PERSPTEST
hsScalar plShadowMaster::fGlobalVisParm = 1.f;
@ -76,10 +76,10 @@ void plShadowMaster::SetGlobalShadowQuality(hsScalar s)
fGlobalVisParm = s;
}
void plShadowMaster::SetGlobalMaxSize(UInt32 s)
void plShadowMaster::SetGlobalMaxSize(uint32_t s)
{
const UInt32 kMaxMaxGlobalSize = 512;
const UInt32 kMinMaxGlobalSize = 32;
const uint32_t kMaxMaxGlobalSize = 512;
const uint32_t kMinMaxGlobalSize = 32;
// Make sure it's a power of two.
if( ((s-1) & ~s) != (s-1) )
@ -215,7 +215,7 @@ hsBool plShadowMaster::IOnCastMsg(plShadowCastMsg* castMsg)
|| fLightInfo->InVisNot(plGlobalVisMgr::Instance()->GetVisNot()) )
return false;
const UInt8 shadowQuality = UInt8(plShadowMaster::GetGlobalShadowQuality() * 3.9f);
const uint8_t shadowQuality = uint8_t(plShadowMaster::GetGlobalShadowQuality() * 3.9f);
if( !GetKey()->GetUoid().GetLoadMask().MatchesQuality(shadowQuality) )
return false;
@ -258,10 +258,10 @@ hsBool plShadowMaster::IOnCastMsg(plShadowCastMsg* castMsg)
// That's the distance used for culling ShadowReceivers
// The ShadowSlaveYon is used directly in the
slave->fIndex = UInt32(-1);
slave->fIndex = uint32_t(-1);
castMsg->Pipeline()->SubmitShadowSlave(slave);
if( slave->fIndex == UInt32(-1) )
if( slave->fIndex == uint32_t(-1) )
{
IRecycleSlave(slave);
return false;
@ -294,7 +294,7 @@ void plShadowMaster::IComputeCasterBounds(const plShadowCaster* caster, hsBounds
for( i = 0; i < castSpans.GetCount(); i++ )
{
plDrawableSpans* dr = castSpans[i].fDraw;
UInt32 index = castSpans[i].fIndex;
uint32_t index = castSpans[i].fIndex;
// Right now, the generic world bounds seems close enough, even when skinned.
// It gets a little off on the lower LODs, but, hey, they're the lower LODs.
@ -716,7 +716,7 @@ protected:
public:
plDrawableSpans* fDraw;
plSpan* fSpan;
UInt32 fIndex;
uint32_t fIndex;
};
hsTArray<plDrawSpan> fSpans;
@ -803,7 +803,7 @@ public:
CLASSNAME_REGISTER( plShadowCaster );
GETINTERFACE_ANY( plShadowCaster, plMultiModifier );
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty) {}
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty) {}
virtual hsBool MsgReceive(plMessage* msg);
@ -1015,8 +1015,8 @@ public:
plVolumeIsect* fISect;
UInt32 fWidth;
UInt32 fHeight;
uint32_t fWidth;
uint32_t fHeight;
};
BeginScene (on EvalMsg?)

20
Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h
View File

@ -71,7 +71,7 @@ public:
protected:
// Global clamp on shadow map size and stuff
static UInt32 fGlobalMaxSize;
static uint32_t fGlobalMaxSize;
static hsScalar fGlobalMaxDist;
static hsScalar fGlobalVisParm;
@ -80,8 +80,8 @@ protected:
hsScalar fMaxDist;
hsScalar fMinDist;
UInt32 fMaxSize;
UInt32 fMinSize;
uint32_t fMaxSize;
uint32_t fMinSize;
hsScalar fPower;
@ -128,7 +128,7 @@ public:
virtual void SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l) {}
Int32 GetNumProperties() const { return kNumProps; }
int32_t GetNumProperties() const { return kNumProps; }
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
@ -147,16 +147,16 @@ public:
hsScalar GetMinDist() const { return fMinDist; }
void SetMaxDist(hsScalar m);
UInt32 GetMaxSize() const { return fMaxSize; }
UInt32 GetMinSize() const { return fMinSize; }
void SetMaxSize(UInt32 s) { fMaxSize = s; }
void SetMinSize(UInt32 s) { fMinSize = s; }
uint32_t GetMaxSize() const { return fMaxSize; }
uint32_t GetMinSize() const { return fMinSize; }
void SetMaxSize(uint32_t s) { fMaxSize = s; }
void SetMinSize(uint32_t s) { fMinSize = s; }
hsScalar GetPower() const { return fPower; }
void SetPower(hsScalar f) { fPower = f; }
static void SetGlobalMaxSize(UInt32 s) ;
static UInt32 GetGlobalMaxSize() { return fGlobalMaxSize; }
static void SetGlobalMaxSize(uint32_t s) ;
static uint32_t GetGlobalMaxSize() { return fGlobalMaxSize; }
static void SetGlobalMaxDist(hsScalar s) { fGlobalMaxDist = s; }
static hsScalar GetGlobalMaxDist() { return fGlobalMaxDist; }

4
Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
View File

@ -108,7 +108,7 @@ bool plShadowSlave::ISetupOrthoViewTransform()
fView.SetView(hsPoint3(minX, minY, minZ), hsPoint3(maxX, maxY, maxZ));
fView.SetScreenSize((UInt16)fWidth, (UInt16)fHeight);
fView.SetScreenSize((uint16_t)fWidth, (uint16_t)fHeight);
fView.SetCameraTransform(fWorldToLight, fLightToWorld);
fView.SetPerspective(false);
fView.SetViewPort(0, 0, hsScalar(fWidth), hsScalar(fHeight), false);
@ -209,7 +209,7 @@ bool plShadowSlave::ISetupPerspViewTransform()
hsScalar tanX = 1.f / cotX;
hsScalar tanY = 1.f / cotY;
fView.SetView(hsPoint3(-tanX, -tanY, minZ), hsPoint3(tanX, tanY, maxZ));
fView.SetScreenSize((UInt16)fWidth, (UInt16)fHeight);
fView.SetScreenSize((uint16_t)fWidth, (uint16_t)fHeight);
fView.SetCameraTransform(fWorldToLight, fLightToWorld);
fView.SetPerspective(true);
fView.SetViewPort(0, 0, hsScalar(fWidth), hsScalar(fHeight), false);

8
Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.h
View File

@ -56,7 +56,7 @@ class plShadowSlave
{
public:
UInt32 fIndex;
uint32_t fIndex;
hsMatrix44 fWorldToLight;
hsMatrix44 fLightToWorld;
@ -78,14 +78,14 @@ public:
plVolumeIsect* fIsect;
UInt32 fWidth;
UInt32 fHeight;
uint32_t fWidth;
uint32_t fHeight;
hsScalar fAttenDist;
hsScalar fPriority;
UInt32 fFlags;
uint32_t fFlags;
enum SlaveFlag
{