OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +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

2
Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp
View File

@ -138,7 +138,7 @@ void plDistOpacityMod::ISetOpacity()
}
hsBool plDistOpacityMod::MsgReceive(plMessage* msg)
bool plDistOpacityMod::MsgReceive(plMessage* msg)
{
plArmatureUpdateMsg* arm = plArmatureUpdateMsg::ConvertNoRef(msg);
if( arm && arm->IsLocal() )

4
Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h
View File

@ -84,7 +84,7 @@ protected:
hsTArray<plFadeOpacityLay*> fFadeLays;
// We only act in response to messages.
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return false; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return false; }
float ICalcOpacity(const hsPoint3& targPos, const hsPoint3& refPos) const;
void ISetOpacity();
@ -107,7 +107,7 @@ public:
virtual void SetKey(plKey k);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);

10
Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp
View File

@ -81,7 +81,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
t0 = t - curr * fadeUp;
*/
hsBool plFadeOpacityMod::fLOSCheckDisabled = false;
bool plFadeOpacityMod::fLOSCheckDisabled = false;
const float kDefFadeUp(5.f);
const float kDefFadeDown(1.f);
@ -101,7 +101,7 @@ plFadeOpacityMod::~plFadeOpacityMod()
{
}
hsBool plFadeOpacityMod::MsgReceive(plMessage* msg)
bool plFadeOpacityMod::MsgReceive(plMessage* msg)
{
plRenderMsg* rend = plRenderMsg::ConvertNoRef(msg);
if( rend )
@ -145,7 +145,7 @@ void plFadeOpacityMod::SetTarget(plSceneObject* so)
fSetup = false;
}
hsBool plFadeOpacityMod::IShouldCheck(plPipeline* pipe)
bool plFadeOpacityMod::IShouldCheck(plPipeline* pipe)
{
if (pipe->TestVisibleWorld(GetTarget()))
return true;
@ -163,7 +163,7 @@ void plFadeOpacityMod::IOnRenderMsg(plRenderMsg* rend)
// Okay, we're going to check.
hsBool hit = false;
bool hit = false;
if( !fLOSCheckDisabled )
{
@ -199,7 +199,7 @@ void plFadeOpacityMod::IOnRenderMsg(plRenderMsg* rend)
ISetOpacity();
}
hsBool plFadeOpacityMod::IReady()
bool plFadeOpacityMod::IReady()
{
plSceneObject* so = GetTarget();
if( !so )

16
Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h
View File

@ -88,11 +88,11 @@ protected:
hsTArray<plFadeOpacityLay*> fFadeLays;
// A global to turn the whole thing off for debug/perf
static hsBool fLOSCheckDisabled;
static bool fLOSCheckDisabled;
void IOnRenderMsg(plRenderMsg* rend);
hsBool IReady();
hsBool IShouldCheck(plPipeline* pipe);
bool IReady();
bool IShouldCheck(plPipeline* pipe);
hsPoint3 IGetOurPos();
void ICalcOpacity();
void ISetOpacity();
@ -101,7 +101,7 @@ protected:
void ISetup(plSceneObject* so);
// We only act in response to messages.
virtual hsBool IEval(double secs, float del, uint32_t dirty) { return false; }
virtual bool IEval(double secs, float del, uint32_t dirty) { return false; }
public:
plFadeOpacityMod();
@ -112,7 +112,7 @@ public:
virtual void SetKey(plKey k);
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
@ -121,7 +121,7 @@ public:
void FadeUp();
void FadeDown();
void Fade(hsBool up) { if( up ) FadeUp(); else FadeDown(); }
void Fade(bool up) { if( up ) FadeUp(); else FadeDown(); }
void SetFadeUp(float f) { fFadeUp = f; }
float GetFadeUp() const { return fFadeUp; }
@ -129,8 +129,8 @@ public:
void SetFadeDown(float f) { fFadeDown = f; }
float GetFadeDown() const { return fFadeDown; }
static hsBool GetLOSCheckDisabled() { return fLOSCheckDisabled; }
static void SetLOSCheckDisabled(hsBool on) { fLOSCheckDisabled = on; }
static bool GetLOSCheckDisabled() { return fLOSCheckDisabled; }
static void SetLOSCheckDisabled(bool on) { fLOSCheckDisabled = on; }
};
#endif // plFadeOpacityMod_inc

16
Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp
View File

@ -65,8 +65,8 @@ struct plAVIFileInfo
#endif // HS_BUILD_FOR_WIN32
#if HS_BUILD_FOR_WIN32
static hsBool ICopySourceToTexture24(BITMAPINFO* bmi, plMipmap* t);
static hsBool ICopySourceToTexture16(BITMAPINFO* bmi, plMipmap* t);
static bool ICopySourceToTexture24(BITMAPINFO* bmi, plMipmap* t);
static bool ICopySourceToTexture16(BITMAPINFO* bmi, plMipmap* t);
#endif
@ -83,7 +83,7 @@ plLayerAVI::~plLayerAVI()
}
hsBool plLayerAVI::IInit()
bool plLayerAVI::IInit()
{
#if HS_BUILD_FOR_WIN32
int ret = AVIStreamOpenFromFile( &fAVIInfo->fAVIStream,
@ -126,7 +126,7 @@ int32_t plLayerAVI::ISecsToFrame(float secs)
return int32_t(secs * timeScale + 0.5f);
}
hsBool plLayerAVI::IGetCurrentFrame()
bool plLayerAVI::IGetCurrentFrame()
{
#if HS_BUILD_FOR_WIN32
if( !fAVIInfo->fAVIStream )
@ -154,7 +154,7 @@ hsBool plLayerAVI::IGetCurrentFrame()
}
#if HS_BUILD_FOR_WIN32
static hsBool ICopySourceToTexture16(BITMAPINFO* bmi, plMipmap* b)
static bool ICopySourceToTexture16(BITMAPINFO* bmi, plMipmap* b)
{
hsAssert( b != nil, "nil mipmap passed to ICopySourceToTexture16()" );
@ -191,7 +191,7 @@ static hsBool ICopySourceToTexture16(BITMAPINFO* bmi, plMipmap* b)
return false;
}
static hsBool ICopySourceToTexture24(BITMAPINFO* bmi, plMipmap* b)
static bool ICopySourceToTexture24(BITMAPINFO* bmi, plMipmap* b)
{
hsAssert( b != nil, "nil mipmap passed to ICopySourceToTexture24()" );
@ -228,7 +228,7 @@ static hsBool ICopySourceToTexture24(BITMAPINFO* bmi, plMipmap* b)
}
#endif
hsBool plLayerAVI::ICloseMovie()
bool plLayerAVI::ICloseMovie()
{
#if HS_BUILD_FOR_WIN32
if( fAVIInfo->fGetFrame )
@ -244,7 +244,7 @@ hsBool plLayerAVI::ICloseMovie()
return false;
}
hsBool plLayerAVI::IRelease()
bool plLayerAVI::IRelease()
{
ICloseMovie();

8
Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.h
View File

@ -53,12 +53,12 @@ protected:
plAVIFileInfo* fAVIInfo;
hsBool ICloseMovie();
bool ICloseMovie();
virtual int32_t ISecsToFrame(float secs);
virtual hsBool IInit();
virtual hsBool IGetCurrentFrame();
virtual hsBool IRelease();
virtual bool IInit();
virtual bool IGetCurrentFrame();
virtual bool IRelease();
public:
plLayerAVI();

16
Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp
View File

@ -71,7 +71,7 @@ plLayerMovie::~plLayerMovie()
delete *fTexture;
}
hsBool plLayerMovie::ISetFault(const char* errStr)
bool plLayerMovie::ISetFault(const char* errStr)
{
#ifdef HS_DEBUGGING
char buff[256];
@ -82,7 +82,7 @@ hsBool plLayerMovie::ISetFault(const char* errStr)
return true;
}
hsBool plLayerMovie::ISetLength(float secs)
bool plLayerMovie::ISetLength(float secs)
{
fLength = secs;
return false;
@ -100,14 +100,14 @@ int plLayerMovie::GetHeight() const
return mip ? mip->GetHeight() : 0;
}
hsBool plLayerMovie::ISetSize(int width, int height)
bool plLayerMovie::ISetSize(int width, int height)
{
fWidth = width;
fHeight = height;
return false;
}
hsBool plLayerMovie::ISetupBitmap()
bool plLayerMovie::ISetupBitmap()
{
if( !GetTexture() )
{
@ -124,7 +124,7 @@ hsBool plLayerMovie::ISetupBitmap()
return false;
}
hsBool plLayerMovie::ICheckBitmap()
bool plLayerMovie::ICheckBitmap()
{
if( !GetTexture() )
ISetupBitmap();
@ -132,14 +132,14 @@ hsBool plLayerMovie::ICheckBitmap()
return false;
}
hsBool plLayerMovie::IMovieIsIdle()
bool plLayerMovie::IMovieIsIdle()
{
IRelease();
return false;
}
hsBool plLayerMovie::ICurrentFrameDirty(double wSecs)
bool plLayerMovie::ICurrentFrameDirty(double wSecs)
{
float secs = fTimeConvert.WorldToAnimTime(wSecs);
uint32_t frame = ISecsToFrame(secs);
@ -214,7 +214,7 @@ void plLayerMovie::SetMovieName(const char* n)
fMovieName = hsStrcpy(n);
}
hsBool plLayerMovie::MsgReceive(plMessage* msg)
bool plLayerMovie::MsgReceive(plMessage* msg)
{
return plLayerAnimation::MsgReceive(msg);
}

26
Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h
View File

@ -63,18 +63,18 @@ protected:
virtual int32_t ISecsToFrame(float secs) = 0;
hsBool IGetFault() const { return !(fMovieName && *fMovieName); }
hsBool ISetFault(const char* errStr);
hsBool ICheckBitmap();
hsBool IMovieIsIdle(); // will call IRelease();
hsBool ISetupBitmap();
hsBool ISetSize(int w, int h);
hsBool ISetLength(float secs);
hsBool ICurrentFrameDirty(double wSecs);
bool IGetFault() const { return !(fMovieName && *fMovieName); }
bool ISetFault(const char* errStr);
bool ICheckBitmap();
bool IMovieIsIdle(); // will call IRelease();
bool ISetupBitmap();
bool ISetSize(int w, int h);
bool ISetLength(float secs);
bool ICurrentFrameDirty(double wSecs);
virtual hsBool IInit() = 0; // Load header etc, must call ISetSize(w, h), ISetLength(s)
virtual hsBool IGetCurrentFrame() = 0; // Load fCurrentFrame into bitmap
virtual hsBool IRelease() = 0; // release any system resources.
virtual bool IInit() = 0; // Load header etc, must call ISetSize(w, h), ISetLength(s)
virtual bool IGetCurrentFrame() = 0; // Load fCurrentFrame into bitmap
virtual bool IRelease() = 0; // release any system resources.
public:
plLayerMovie();
virtual ~plLayerMovie();
@ -87,12 +87,12 @@ public:
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
hsBool IsStopped() { return fTimeConvert.IsStopped(); }
bool IsStopped() { return fTimeConvert.IsStopped(); }
void SetMovieName(const char* n);
const char* GetMovieName() const { return fMovieName; }
virtual hsBool MsgReceive(plMessage* msg);
virtual bool MsgReceive(plMessage* msg);
// Movie specific
int GetWidth() const;