This commit is contained in:
Glenn Maynard
2006-01-20 06:30:13 +00:00
parent a0d32887b4
commit f3d3100d36
2 changed files with 9 additions and 9 deletions
+5 -5
View File
@@ -45,7 +45,7 @@ inline unsigned long max( unsigned long a, unsigned int b ) { return a > b? a:b;
template<typename T, typename U>
inline U interp( T x, U l, U h )
{
return U(x * (h - l) + l);
return U(x * (h - l) + l);
}
inline bool CLAMP( int &x, int l, int h )
@@ -187,7 +187,7 @@ public:
// Simple function for generating random numbers
inline float randomf( const float low=-1.0f, const float high=1.0f )
{
return RandomFloat( low, high );
return RandomFloat( low, high );
}
/* return f rounded to the nearest multiple of fRoundInterval */
@@ -375,12 +375,12 @@ public:
bool Replace( const RString &sReplacement, const RString &sSubject, RString &sOut );
private:
void Compile();
void Release();
void Compile();
void Release();
void *m_pReg;
unsigned m_iBackrefs;
RString m_sPattern;
RString m_sPattern;
};
+4 -4
View File
@@ -260,8 +260,8 @@ void StreamDisplay::DrawMask( float fPercent )
rect.right = -m_fMeterWidth/2 + fChamberRightPercent*m_fMeterWidth+1;
rect.bottom = -m_fMeterHeight/2 + fHeightPercent*m_fMeterHeight;
rect.left = MIN( rect.left, + m_fMeterWidth/2 );
rect.right = MIN( rect.right, + m_fMeterWidth/2 );
rect.left = min( rect.left, + m_fMeterWidth/2 );
rect.right = min( rect.right, + m_fMeterWidth/2 );
m_quadMask.StretchTo( rect );
m_quadMask.Draw();
@@ -272,8 +272,8 @@ void StreamDisplay::DrawMask( float fPercent )
rect.right = +m_fMeterWidth/2;
rect.bottom = +m_fMeterHeight/2;
rect.left = MIN( rect.left, + m_fMeterWidth/2 );
rect.right = MIN( rect.right, + m_fMeterWidth/2 );
rect.left = min( rect.left, + m_fMeterWidth/2 );
rect.right = min( rect.right, + m_fMeterWidth/2 );
m_quadMask.StretchTo( rect );
m_quadMask.Draw();