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

Fix several errors and warnings from GCC compilation

Browse Source
This commit is contained in:
Michael Hansen
2012-02-09 00:56:03 -08:00
parent e6ebf7ffaf
commit ad66286a17
78 changed files with 318 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h
View File

@ -209,7 +209,7 @@ public:
void SetPlane(const hsVector3& n, float d) { fNorm = n; fDist = d; }
const hsVector3& GetNormal() const { return fNorm; }
const float GetDist() const { return fDist; }
float GetDist() const { return fDist; }
plCullStatus TestBounds(const hsBounds3Ext& bnd) const;
plCullStatus TestSphere(const hsPoint3& center, float rad) const;

10
Sources/Plasma/PubUtilLib/plPipeline/plDebugText.h
View File

@ -94,7 +94,7 @@ class plDebugText
};
~plDebugText() { ; }
static plDebugText &Instance( void ) { return fInstance; }
uint32_t CalcStringWidth( const char *string );
@ -139,12 +139,12 @@ class plDebugText
void SetFont(const char *face, uint16_t size ) { hsStrncpy( fFontFace, face, sizeof( fFontFace ) ); fFontSize = size; }
const char *GetFontFace( void ) { return fFontFace; }
const uint16_t GetFontSize( void ) { return fFontSize; }
uint16_t GetFontHeight();
uint16_t GetFontSize( void ) { return fFontSize; }
uint16_t GetFontHeight();
void SetEnable( hsBool on ) { fEnabled = on; }
void DisablePermanently( void ) { fEnabled = false; fLockEnable = true; }
const hsBool IsEnabled( void ) { return fEnabled; }
hsBool IsEnabled( void ) { return fEnabled; }
void GetScreenSize( uint32_t *width, uint32_t *height );
};

8
Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp
View File

@ -573,7 +573,10 @@ void plDynamicCamMap::ISetupRenderRequest(plPipeline *pipe)
hsMatrix44 w2c, c2w;
if (fCamera)
{
w2c.MakeCamera(&fCamera->GetTargetPos(), &fCamera->GetTargetPOA(), &hsVector3(0.f, 0.f, 1.f));
hsPoint3 pos = fCamera->GetTargetPos();
hsPoint3 poa = fCamera->GetTargetPOA();
hsVector3 vec(0.f, 0.f, 1.f);
w2c.MakeCamera(&pos, &poa, &vec);
w2c.GetInverse(&c2w);
}
else
@ -584,7 +587,8 @@ void plDynamicCamMap::ISetupRenderRequest(plPipeline *pipe)
// Could be optimized, but the matrix construction work here seems cheap relative to the cost
// of rerendering all this stuff to a separate target, so I doubt we'd notice.
hsMatrix44 invert;
invert.MakeScaleMat(&(hsVector3(1.f, 1.f, -1.f)));
hsVector3 vec(1.f, 1.f, -1.f);
invert.MakeScaleMat(&vec);
w2c = pipe->GetWorldToCamera();
c2w = pipe->GetCameraToWorld();

6
Sources/Plasma/PubUtilLib/plPipeline/plPlates.h
View File

@ -182,9 +182,9 @@ class plGraphPlate : public plPlate
void SetDataColors( const std::vector<uint32_t> & hexColors );
const char *GetLabelText( int i ) { return fLabelText[ i ].c_str(); }
const uint32_t GetDataColor( int i ) { return fDataHexColors[ i ]; }
const uint32_t GetNumLabels() { return fLabelText.size(); }
const uint32_t GetNumColors() { return fDataHexColors.size(); }
uint32_t GetDataColor( int i ) { return fDataHexColors[ i ]; }
uint32_t GetNumLabels() { return fLabelText.size(); }
uint32_t GetNumColors() { return fDataHexColors.size(); }
};
//// plPlateManager Class Definition /////////////////////////////////////////