1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +00:00

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

This commit is contained in:
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions

View File

@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStream.h"
#include "hsFastMath.h"
plCullPoly& plCullPoly::InitFromVerts(UInt32 f)
plCullPoly& plCullPoly::InitFromVerts(uint32_t f)
{
fFlags = f;

View File

@ -62,7 +62,7 @@ public:
kTwoSided = 0x2
};
UInt32 fFlags;
uint32_t fFlags;
mutable hsBitVector fClipped; // fClipped[i] => edge(fVerts[i], fVerts[(i+1)%n])
hsTArray<hsPoint3> fVerts;
@ -82,7 +82,7 @@ public:
plCullPoly& Init(const plCullPoly& p) { fClipped.Clear(); fVerts.SetCount(0); fFlags = p.fFlags; fNorm = p.fNorm; fDist = p.fDist; fCenter = p.fCenter; return *this; }
plCullPoly& Flip(const plCullPoly& p);
plCullPoly& InitFromVerts(UInt32 f=kNone);
plCullPoly& InitFromVerts(uint32_t f=kNone);
hsScalar ICalcRadius() const;
plCullPoly& Transform(const hsMatrix44& l2w, const hsMatrix44& w2l, plCullPoly& dst) const;

View File

@ -175,7 +175,7 @@ plOccNode* plOccTree::IAddPolyRecur(plOccNode* node, plOccPoly* poly)
plOccPoly* outPoly = nil;
UInt32 test = ITestPoly(node->fPlane, poly, inPoly, outPoly);
uint32_t test = ITestPoly(node->fPlane, poly, inPoly, outPoly);
switch( test )
{

View File

@ -66,7 +66,7 @@ public:
plOccPlane fPlane;
hsTArray<hsPoint3> fVerts;
hsTArray<UInt8> fEdgeFlags; // flag[i] => edge(fVerts[i], fVerts[(i+1)%n])
hsTArray<uint8_t> fEdgeFlags; // flag[i] => edge(fVerts[i], fVerts[(i+1)%n])
};
class plOccNode
@ -82,7 +82,7 @@ protected:
kSplit = 0x2
};
UInt32 fFlags;
uint32_t fFlags;
plOccPlane fPolyPlane; // Plane of the poly we came from
plOccPlane fViewPlane; // Plane perp to view dir.
@ -106,7 +106,7 @@ protected:
kNeedsBuild = 0x1
};
UInt8 fFlags;
uint8_t fFlags;
// Temp pools for building our trees each frame.
hsTArray<plOccPoly> fPolyPool;

View File

@ -130,12 +130,12 @@ void plOccluder::IRemoveVisRegion(plVisRegion* reg)
}
}
plDrawableSpans* plOccluder::CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo)
plDrawableSpans* plOccluder::CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo)
{
hsTArray<hsPoint3> pos;
hsTArray<hsVector3> norm;
hsTArray<hsColorRGBA> color;
hsTArray<UInt16> tris;
hsTArray<uint16_t> tris;
plLayer* lay = plLayer::ConvertNoRef(mat->GetLayer(0)->BottomOfStack());
if( lay )
@ -258,7 +258,7 @@ hsScalar plOccluder::IComputeSurfaceArea()
void plOccluder::SetPolyList(const hsTArray<plCullPoly>& list)
{
UInt16 n = list.GetCount();
uint16_t n = list.GetCount();
fPolys.SetCount(n);
int i;
for( i = 0; i < n; i++ )
@ -290,7 +290,7 @@ void plOccluder::Read(hsStream* s, hsResMgr* mgr)
fPriority = s->ReadLEScalar();
hsTArray<plCullPoly>& localPolys = IGetLocalPolyList();
UInt16 n = s->ReadLE16();
uint16_t n = s->ReadLE16();
localPolys.SetCount(n);
int i;
for( i = 0; i < n; i++ )
@ -360,7 +360,7 @@ void plMobileOccluder::SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l
void plMobileOccluder::SetPolyList(const hsTArray<plCullPoly>& list)
{
UInt16 n = list.GetCount();
uint16_t n = list.GetCount();
fOrigPolys.SetCount(n);
fPolys.SetCount(n);

View File

@ -114,13 +114,13 @@ public:
virtual const hsTArray<plCullPoly>& GetWorldPolyList() const { return fPolys; }
virtual const hsTArray<plCullPoly>& GetLocalPolyList() const { return fPolys; }
virtual Int32 GetNumProperties() const { return kNumProps; }
virtual int32_t GetNumProperties() const { return kNumProps; }
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
// Visualization
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<UInt32>& idx, plDrawableSpans* addTo);
virtual plDrawableSpans* CreateProxy(hsGMaterial* mat, hsTArray<uint32_t>& idx, plDrawableSpans* addTo);
// Export only function to initialize.
virtual void ComputeFromPolys();

View File

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

View File

@ -55,7 +55,7 @@ protected:
plOccluder* 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:
plOccluderProxy();

View File

@ -116,7 +116,7 @@ hsBool plPageTreeMgr::Harvest(plVolumeIsect* isect, hsTArray<plDrawVisList>& lev
if( !(GetSpaceTree() || IBuildSpaceTree()) )
return false;
static hsTArray<Int16> list;
static hsTArray<int16_t> list;
GetSpaceTree()->HarvestLeaves(isect, list);
@ -139,7 +139,7 @@ int plPageTreeMgr::Render(plPipeline* pipe)
if( !(GetSpaceTree() || IBuildSpaceTree()) )
return 0;
static hsTArray<Int16> list;
static hsTArray<int16_t> list;
list.SetCount(0);
plProfile_BeginTiming(RenderScene);
@ -276,7 +276,7 @@ hsBool plPageTreeMgr::ISortByLevel(plPipeline* pipe, hsTArray<plDrawVisList>& dr
// Returns the index of the last one drawn.
int plPageTreeMgr::IPrepForRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisList>& drawVis, int& iDrawStart)
{
UInt32 renderLevel = drawVis[iDrawStart].fDrawable->GetRenderLevel().Level();
uint32_t renderLevel = drawVis[iDrawStart].fDrawable->GetRenderLevel().Level();
int i;
@ -308,7 +308,7 @@ int plPageTreeMgr::IPrepForRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawV
iDraw++ )
{
plDrawable* drawable = drawVis[iDraw].fDrawable;
hsTArray<Int16>& visList = drawVis[iDraw].fVisList;
hsTArray<int16_t>& visList = drawVis[iDraw].fVisList;
for( i = 0; i < visList.GetCount(); i++ )
{
plDrawSpanPair* pair = pairs.Push();
@ -354,7 +354,7 @@ hsBool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisLi
plDrawable* drawable = drawList[pairs[i].fDrawable]->fDrawable;
listTrav = &scratchList[iSort++];
listTrav->fBody = (void*)*(UInt32*)&pairs[i];
listTrav->fBody = (void*)*(uint32_t*)&pairs[i];
listTrav->fNext = listTrav + 1;
if( drawable->GetNativeProperty(plDrawable::kPropSortAsOne) )
@ -381,7 +381,7 @@ hsBool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisLi
plProfile_EndTiming(DrawObjSort);
static hsTArray<Int16> visList;
static hsTArray<int16_t> visList;
visList.SetCount(0);
plVisMgr* visMgr = fDisableVisMgr ? nil : fVisMgr;
@ -449,7 +449,7 @@ hsBool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisLi
int curDraw = curPair.fDrawable;
listTrav = listTrav->fNext;
static hsTArray<UInt32> numDrawn;
static hsTArray<uint32_t> numDrawn;
numDrawn.SetCountAndZero(drawList.GetCount());
visList.Append(drawList[curDraw]->fVisList[numDrawn[curDraw]++]);
@ -653,7 +653,7 @@ hsBool plPageTreeMgr::IGetCullPolys(plPipeline* pipe)
hsRadixSort::Elem* sortedList = rad.Sort(scratchList.AcquireArray(), 0);
listTrav = sortedList;
const UInt32 kMaxOccluders = 1000;
const uint32_t kMaxOccluders = 1000;
if( numSubmit > kMaxOccluders )
numSubmit = kMaxOccluders;
@ -673,7 +673,7 @@ hsBool plPageTreeMgr::IGetCullPolys(plPipeline* pipe)
return fCullPolys.GetCount() > 0;
}
hsBool plPageTreeMgr::IGetOcclusion(plPipeline* pipe, hsTArray<Int16>& list)
hsBool plPageTreeMgr::IGetOcclusion(plPipeline* pipe, hsTArray<int16_t>& list)
{
plProfile_BeginTiming(DrawOccBuild);

View File

@ -59,9 +59,9 @@ class plDrawSpanPair
{
public:
plDrawSpanPair() {}
plDrawSpanPair(UInt16 d, UInt16 s) : fDrawable(d), fSpan(s) {}
UInt16 fDrawable;
UInt16 fSpan;
plDrawSpanPair(uint16_t d, uint16_t s) : fDrawable(d), fSpan(s) {}
uint16_t fDrawable;
uint16_t fSpan;
};
class plDrawVisList
@ -71,7 +71,7 @@ public:
virtual ~plDrawVisList() {}
plDrawable* fDrawable;
hsTArray<Int16> fVisList;
hsTArray<int16_t> fVisList;
plDrawVisList& operator=(const plDrawVisList& v) { fDrawable = v.fDrawable; fVisList = v.fVisList; return *this; }
};
@ -94,7 +94,7 @@ protected:
hsBool IBuildSpaceTree();
hsBool IRefreshTree(plPipeline* pipe);
void ISortCullPolys(plPipeline* pipe);
hsBool IGetOcclusion(plPipeline* pipe, hsTArray<Int16>& list);
hsBool IGetOcclusion(plPipeline* pipe, hsTArray<int16_t>& list);
hsBool IGetCullPolys(plPipeline* pipe);
void IResetOcclusion(plPipeline* pipe);
void IAddCullPolyList(const hsTArray<plCullPoly>& polyList);

View File

@ -83,18 +83,18 @@ plPostEffectMod::~plPostEffectMod()
void plPostEffectMod::ISetupRenderRequest()
{
UInt32 rtFlags = 0;
uint32_t rtFlags = 0;
// If we go to rendering to sub-window, we'll want to explicitly set width and height
UInt32 width = 0;
UInt32 height = 0;
uint32_t width = 0;
uint32_t height = 0;
UInt32 colorDepth = 0;
UInt32 zDepth = 0;
UInt32 stencilDepth = 0;
uint32_t colorDepth = 0;
uint32_t zDepth = 0;
uint32_t stencilDepth = 0;
fRenderRequest = TRACKED_NEW plRenderRequest;
UInt32 renderState = plPipeline::kRenderNormal
uint32_t renderState = plPipeline::kRenderNormal
| plPipeline::kRenderNoProjection
| plPipeline::kRenderNoLights
| plPipeline::kRenderClearDepth;
@ -157,7 +157,7 @@ hsBool plPostEffectMod::IIsEnabled() const
return /*GetTarget() &&*/ !fPageMgr->Empty() && fState.IsBitSet(kEnabled);
}
hsBool plPostEffectMod::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plPostEffectMod::IEval(double secs, hsScalar del, uint32_t dirty)
{
return false;
}

View File

@ -84,7 +84,7 @@ protected:
hsMatrix44 fDefaultW2C, fDefaultC2W;
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty); // called only by owner object's Eval()
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty); // called only by owner object's Eval()
void ISetupRenderRequest();
void IDestroyRenderRequest();

View File

@ -119,7 +119,7 @@ void plRelevanceMgr::SetRegionVectors(const hsPoint3 &pos, hsBitVector &regionsI
}
}
UInt32 plRelevanceMgr::GetNumRegions() const
uint32_t plRelevanceMgr::GetNumRegions() const
{
int i;
@ -149,7 +149,7 @@ hsBool plRelevanceMgr::MsgReceive(plMessage* msg)
return hsKeyedObject::MsgReceive(msg);
}
UInt32 plRelevanceMgr::GetIndex(char *regionName)
uint32_t plRelevanceMgr::GetIndex(char *regionName)
{
int i;
for (i = 0; i < fRegions.GetCount(); i++)
@ -161,9 +161,9 @@ UInt32 plRelevanceMgr::GetIndex(char *regionName)
return -1;
}
void plRelevanceMgr::MarkRegion(UInt32 localIdx, UInt32 remoteIdx, hsBool doICare)
void plRelevanceMgr::MarkRegion(uint32_t localIdx, uint32_t remoteIdx, hsBool doICare)
{
if (localIdx == (UInt32)-1 || remoteIdx == (UInt32)-1)
if (localIdx == (uint32_t)-1 || remoteIdx == (uint32_t)-1)
return;
if (localIdx - 1 >= fRegions.GetCount() || remoteIdx - 1 >= fRegions.GetCount() || fRegions[localIdx - 1] == nil)

View File

@ -80,10 +80,10 @@ public:
hsBool GetEnabled() { return fEnabled; }
void SetEnabled(hsBool val) { fEnabled = val; }
UInt32 GetIndex(char *regionName);
void MarkRegion(UInt32 localIdx, UInt32 remoteIdx, hsBool doICare);
uint32_t GetIndex(char *regionName);
void MarkRegion(uint32_t localIdx, uint32_t remoteIdx, hsBool doICare);
void SetRegionVectors(const hsPoint3 &pos, hsBitVector &regionsImIn, hsBitVector &regionsICareAbout);
UInt32 GetNumRegions() const; // includes the secret 0 region in its count
uint32_t GetNumRegions() const; // includes the secret 0 region in its count
void ParseCsvInput(hsStream *s);
std::string GetRegionNames(hsBitVector regions);

View File

@ -87,9 +87,9 @@ hsBool plRelevanceRegion::MsgReceive(plMessage* msg)
}
void plRelevanceRegion::SetMgrIndex(UInt32 index)
void plRelevanceRegion::SetMgrIndex(uint32_t index)
{
if (fMgrIdx != (UInt32)-1)
if (fMgrIdx != (uint32_t)-1)
fRegionsICareAbout.SetBit(fMgrIdx, false);
fMgrIdx = index;

View File

@ -54,10 +54,10 @@ class plRelevanceRegion : public plObjInterface
protected:
plRegionBase *fRegion;
hsBitVector fRegionsICareAbout;
UInt32 fMgrIdx;
uint32_t fMgrIdx;
public:
plRelevanceRegion() : fRegion(nil), fMgrIdx((UInt32)-1) {}
plRelevanceRegion() : fRegion(nil), fMgrIdx((uint32_t)-1) {}
virtual ~plRelevanceRegion() {}
CLASSNAME_REGISTER( plRelevanceRegion );
@ -66,12 +66,12 @@ public:
virtual hsBool MsgReceive(plMessage* msg);
virtual void SetTransform(const hsMatrix44& l2w, const hsMatrix44& w2l) {}
virtual Int32 GetNumProperties() const { return 1; }
virtual int32_t GetNumProperties() const { return 1; }
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
void SetMgrIndex(UInt32 idx);
void SetMgrIndex(uint32_t idx);
};
#endif // plRelevanceRegion_inc

View File

@ -57,8 +57,8 @@ plRenderRequest::plRenderRequest()
fAck(nil),
fOverrideMat(nil),
fEraseMat(nil),
fDrawableMask(UInt32(-1)),
fSubDrawableMask(UInt32(-1)),
fDrawableMask(uint32_t(-1)),
fSubDrawableMask(uint32_t(-1)),
fRenderState(0),
fClearDepth(1.f),
fFogStart(-1.f),

View File

@ -64,7 +64,7 @@ class plRenderRequest : public plRenderRequestBase
{
public:
protected:
UInt32 fRenderState; // Or'ed from plPipeline::RenderStateSettings::kRender*
uint32_t fRenderState; // Or'ed from plPipeline::RenderStateSettings::kRender*
plDrawable* fClearDrawable;
plRenderTarget* fRenderTarget;
@ -77,8 +77,8 @@ protected:
hsScalar fPriority;
UInt32 fDrawableMask;
UInt32 fSubDrawableMask;
uint32_t fDrawableMask;
uint32_t fSubDrawableMask;
hsColorRGBA fClearColor;
hsScalar fClearDepth;
@ -92,7 +92,7 @@ protected:
hsBitVector fVisForce;
UInt32 fUserData;
uint32_t fUserData;
hsBool fIgnoreOccluders;
public:
@ -102,14 +102,14 @@ public:
hsBool GetRenderSelect() const { return !fVisForce.Empty(); }
hsBool GetRenderCharacters() const;
void SetRenderState(UInt32 st) { fRenderState = st; }
UInt32 GetRenderState() const { return fRenderState; }
void SetRenderState(uint32_t st) { fRenderState = st; }
uint32_t GetRenderState() const { return fRenderState; }
void SetDrawableMask(UInt32 m) { fDrawableMask = m; }
UInt32 GetDrawableMask() const { return fDrawableMask; }
void SetDrawableMask(uint32_t m) { fDrawableMask = m; }
uint32_t GetDrawableMask() const { return fDrawableMask; }
void SetSubDrawableMask(UInt32 m) { fSubDrawableMask = m; }
UInt32 GetSubDrawableMask() const { return fSubDrawableMask; }
void SetSubDrawableMask(uint32_t m) { fSubDrawableMask = m; }
uint32_t GetSubDrawableMask() const { return fSubDrawableMask; }
void RequestAck(plKey key) { fAck = key; }
plKey GetAck() const { return fAck; }
@ -148,8 +148,8 @@ public:
hsScalar GetSizeX() const { return fViewTransform.GetOrthoWidth(); }
hsScalar GetSizeY() const { return fViewTransform.GetOrthoHeight(); }
UInt16 GetScreenWidth() const { return fViewTransform.GetScreenWidth(); }
UInt16 GetScreenHeight() const { return fViewTransform.GetScreenHeight(); }
uint16_t GetScreenWidth() const { return fViewTransform.GetScreenWidth(); }
uint16_t GetScreenHeight() const { return fViewTransform.GetScreenHeight(); }
const hsColorRGBA& GetClearColor() const { return fClearColor; }
hsScalar GetClearDepth() const { return fClearDepth; }
@ -194,8 +194,8 @@ public:
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
void SetUserData(UInt32 n) { fUserData = n; }
UInt32 GetUserData() const { return fUserData; }
void SetUserData(uint32_t n) { fUserData = n; }
uint32_t GetUserData() const { return fUserData; }
void SetIgnoreOccluders(hsBool b) { fIgnoreOccluders = b; }
hsBool GetIgnoreOccluders() { return fIgnoreOccluders; }

View File

@ -96,7 +96,7 @@ void plSceneNode::Read(hsStream* s, hsResMgr* mgr)
{
hsKeyedObject::Read(s, mgr);
UInt32 n;
uint32_t n;
int i;
n = s->ReadLE32();
@ -133,10 +133,10 @@ void plSceneNode::Write(hsStream* s, hsResMgr* mgr)
void plSceneNode::Harvest(plVolumeIsect* isect, hsTArray<plDrawVisList>& levList)
{
static hsTArray<Int16> visList;
static hsTArray<int16_t> visList;
visList.SetCount(0);
GetSpaceTree()->HarvestLeaves(isect, visList);
static hsTArray<Int16> visSpans;
static hsTArray<int16_t> visSpans;
visSpans.SetCount(0);
int i;
@ -155,10 +155,10 @@ void plSceneNode::Harvest(plVolumeIsect* isect, hsTArray<plDrawVisList>& levList
void plSceneNode::CollectForRender(plPipeline* pipe, hsTArray<plDrawVisList>& levList, plVisMgr* visMgr)
{
static hsTArray<Int16> visList;
static hsTArray<int16_t> visList;
visList.SetCount(0);
pipe->HarvestVisible(GetSpaceTree(), visList);
static hsTArray<Int16> visSpans;
static hsTArray<int16_t> visSpans;
visSpans.SetCount(0);
int i;

View File

@ -74,7 +74,7 @@ public:
protected:
hsBool fFilterGenerics; // Export only
Int16 fDepth;
int16_t fDepth;
hsTArray<plSceneObject*> fSceneObjects;
@ -133,9 +133,9 @@ public:
virtual hsBool MsgReceive(plMessage* msg);
Int16 GetDepth() { return fDepth; }
Int16 IncDepth() { return ++fDepth; }
Int16 DecDepth() { return --fDepth; }
int16_t GetDepth() { return fDepth; }
int16_t IncDepth() { return ++fDepth; }
int16_t DecDepth() { return --fDepth; }
void Init( void );

View File

@ -72,9 +72,9 @@ protected:
plVisMgr* fMgr;
Int32 fIndex;
int32_t fIndex;
void SetIndex(Int32 i) { fIndex = i; }
void SetIndex(int32_t i) { fIndex = i; }
friend class plVisMgr;
public:
@ -84,7 +84,7 @@ public:
CLASSNAME_REGISTER( plVisRegion );
GETINTERFACE_ANY( plVisRegion, plObjInterface );
virtual Int32 GetNumProperties() const { return 3; } // This is stupid.
virtual int32_t GetNumProperties() const { return 3; } // This is stupid.
virtual hsBool MsgReceive(plMessage* msg);
@ -97,7 +97,7 @@ public:
hsBool Eval(const hsPoint3& pos) const;
Int32 GetIndex() const { return fIndex; }
int32_t GetIndex() const { return fIndex; }
hsBool Registered() const { return GetIndex() > 0; }