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

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

2
Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp
View File

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

2
Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h
View File

@ -54,7 +54,7 @@ protected:
plVirtualCam1* 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:
plCameraProxy();

6
Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h
View File

@ -362,7 +362,7 @@ public:
kCircleLocalAvatar = 0x40,
};
protected:
UInt32 fCircleFlags;
uint32_t fCircleFlags;
hsPoint3 fCenter;
plSceneObject* fCenterObject; // optional, use instead of fCenter
hsScalar fRadius;
@ -386,14 +386,14 @@ public:
virtual void Update(hsBool forced = false);
virtual hsBool MsgReceive(plMessage* msg);
UInt32 GetCircleFlags() { return fCircleFlags; }
uint32_t GetCircleFlags() { return fCircleFlags; }
hsPoint3* GetCenter() { return &fCenter; } // use GetCenterPoint
hsPoint3 GetCenterPoint();
hsScalar GetRadius() { return fRadius; }
plSceneObject* GetCenterObject() { return fCenterObject; }
void SetCircumferencePerSec(hsScalar h) { fCirPerSec = h; }
void SetCircleFlags(UInt32 f) { fCircleFlags|=f; }
void SetCircleFlags(uint32_t f) { fCircleFlags|=f; }
void SetCenter(hsPoint3* ctr) { fCenter = *ctr; } // Circle lies in the plane z = ctr->z
void SetRadius(hsScalar radius) { fRadius = radius; }
void SetFarCircleCam(hsBool farType) { if (farType) fCircleFlags |= kFarthest; else fCircleFlags &= ~kFarthest; }

2
Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h
View File

@ -96,7 +96,7 @@ class plCameraModifier1 : public plSingleModifier
protected:
void Output();
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty) { return true; }
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty) { return true; }
public:

2
Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp
View File

@ -56,7 +56,7 @@ hsScalar plInterestingModifier::fInterestRadius = 100.0f;
hsScalar plInterestingModifier::fInterestWeight = 1.0f;
hsBool plInterestingModifier::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plInterestingModifier::IEval(double secs, hsScalar del, uint32_t dirty)
{
for (int i=0; i < GetNumTargets(); i++)
{

8
Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h
View File

@ -61,13 +61,13 @@ protected:
kTypeLookAtMod,
};
UInt8 fType;
uint8_t fType;
hsScalar fView;
static hsScalar fInterestRadius;
static hsScalar fInterestWeight;
virtual hsBool IEval(double secs, hsScalar del, UInt32 dirty);
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
public:
plInterestingModifier(){ fType = kTypeInteresting;}
@ -86,8 +86,8 @@ public:
virtual void AddTarget(plSceneObject* so);
void SetType(UInt8 type) { fType = type; }
UInt8 GetType() { return fType; }
void SetType(uint8_t type) { fType = type; }
uint8_t GetType() { return fType; }
};

4
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
View File

@ -186,7 +186,7 @@ plVirtualCam1::plVirtualCam1()
// only open log file if logging is on
if ( !plStatusLog::fLoggingOff )
{
wchar fileAndPath[MAX_PATH];
wchar_t fileAndPath[MAX_PATH];
PathGetLogDirectory(fileAndPath, arrsize(fileAndPath));
PathAddFilename(fileAndPath, fileAndPath, L"camLog.txt", arrsize(fileAndPath));
foutLog = _wfopen( fileAndPath, L"wt" );
@ -490,7 +490,7 @@ void plVirtualCam1::ICreatePlate()
plMipmap *ourMip = fEffectPlate->CreateMaterial( 16, 16, true );
for( y = 0; y < ourMip->GetHeight(); y++ )
{
UInt32 *pixels = ourMip->GetAddr32( 0, y );
uint32_t *pixels = ourMip->GetAddr32( 0, y );
for( x = 0; x < ourMip->GetWidth(); x++ )
pixels[ x ] = 0xff000000;
}