actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-05 23:34:49 +00:00
parent b28fb1d5c9
commit 2defb1963a
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageBitmapTexture.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ if( g_bFoobar ) LOG->Trace("save %s", actualID.filename.c_str());
case 16: case 16:
{ {
/* Bits of alpha in the source: */ /* Bits of alpha in the source: */
int src_alpha_bits = 8 - img->format->Aloss; int src_alpha_bits = 8 - img->format->Loss[3];
/* Don't use more than we were hinted to. */ /* Don't use more than we were hinted to. */
src_alpha_bits = min( actualID.iAlphaBits, src_alpha_bits ); src_alpha_bits = min( actualID.iAlphaBits, src_alpha_bits );
stepmania/src/RageSurfaceUtils.cpp
+9 -11
View File
@@ -70,14 +70,12 @@ void RageSurfaceUtils::GetRGBAV( uint32_t pixel, const RageSurface *src, uint8_t
{ {
GetRawRGBAV(pixel, src->fmt, v); GetRawRGBAV(pixel, src->fmt, v);
const RageSurfaceFormat *fmt = src->format; const RageSurfaceFormat *fmt = src->format;
v[0] = v[0] << fmt->Rloss; for( int c = 0; c < 4; ++c )
v[1] = v[1] << fmt->Gloss; v[c] = v[c] << fmt->Loss[c];
v[2] = v[2] << fmt->Bloss;
// Correct for surfaces that don't have an alpha channel. // Correct for surfaces that don't have an alpha channel.
if( fmt->Aloss == 8) if( fmt->Loss[3] == 8 )
v[3] = 255; v[3] = 255;
else
v[3] = v[3] << fmt->Aloss;
} }
void RageSurfaceUtils::GetRGBAV( const uint8_t *p, const RageSurface *src, uint8_t *v ) void RageSurfaceUtils::GetRGBAV( const uint8_t *p, const RageSurface *src, uint8_t *v )
@@ -110,10 +108,10 @@ void RageSurfaceUtils::SetRawRGBAV( uint8_t *p, const RageSurface *src, const ui
/* Inverse of GetRGBAV. */ /* Inverse of GetRGBAV. */
uint32_t RageSurfaceUtils::SetRGBAV( const RageSurfaceFormat *fmt, const uint8_t *v ) uint32_t RageSurfaceUtils::SetRGBAV( const RageSurfaceFormat *fmt, const uint8_t *v )
{ {
return (v[0] >> fmt->Rloss) << fmt->Rshift | return (v[0] >> fmt->Loss[0]) << fmt->Shift[0] |
(v[1] >> fmt->Gloss) << fmt->Gshift | (v[1] >> fmt->Loss[1]) << fmt->Shift[1] |
(v[2] >> fmt->Bloss) << fmt->Bshift | (v[2] >> fmt->Loss[2]) << fmt->Shift[2] |
(v[3] >> fmt->Aloss) << fmt->Ashift; (v[3] >> fmt->Loss[3]) << fmt->Shift[3];
} }
void RageSurfaceUtils::SetRGBAV( uint8_t *p, const RageSurface *src, const uint8_t *v ) void RageSurfaceUtils::SetRGBAV( uint8_t *p, const RageSurface *src, const uint8_t *v )
@@ -803,7 +801,7 @@ RageSurface *RageSurfaceUtils::LoadSurface( CString file )
*/ */
RageSurface *RageSurfaceUtils::PalettizeToGrayscale( const RageSurface *src_surf, int GrayBits, int AlphaBits ) RageSurface *RageSurfaceUtils::PalettizeToGrayscale( const RageSurface *src_surf, int GrayBits, int AlphaBits )
{ {
AlphaBits = min( AlphaBits, 8-src_surf->format->Aloss ); AlphaBits = min( AlphaBits, 8-src_surf->format->Loss[3] );
const int TotalBits = GrayBits + AlphaBits; const int TotalBits = GrayBits + AlphaBits;
ASSERT( TotalBits <= 8 ); ASSERT( TotalBits <= 8 );