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

remove Rloss, Gloss, Bloss, Aloss

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-05 23:37:04 +00:00
parent e6eb3e5ff9
commit 83265c4d63
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurface.cpp
+27 -27
View File
@@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "RageSurface.h" #include "RageSurface.h"
#include "RageUtil.h"
bool RageSurfaceColor::operator== ( const RageSurfaceColor &rhs ) const bool RageSurfaceColor::operator== ( const RageSurfaceColor &rhs ) const
{ {
@@ -40,16 +41,14 @@ int32_t RageSurfacePalette::FindClosestColor( const RageSurfaceColor &color ) co
RageSurfaceFormat::RageSurfaceFormat(): RageSurfaceFormat::RageSurfaceFormat():
Rmask(Mask[0]), Gmask(Mask[1]), Bmask(Mask[2]), Amask(Mask[3]), Rmask(Mask[0]), Gmask(Mask[1]), Bmask(Mask[2]), Amask(Mask[3]),
Rshift(Shift[0]), Gshift(Shift[1]), Bshift(Shift[2]), Ashift(Shift[3]), Rshift(Shift[0]), Gshift(Shift[1]), Bshift(Shift[2]), Ashift(Shift[3])
Rloss(Loss[0]), Gloss(Loss[1]), Bloss(Loss[2]), Aloss(Loss[3])
{ {
palette = NULL; palette = NULL;
} }
RageSurfaceFormat::RageSurfaceFormat( const RageSurfaceFormat &cpy ): RageSurfaceFormat::RageSurfaceFormat( const RageSurfaceFormat &cpy ):
Rmask(Mask[0]), Gmask(Mask[1]), Bmask(Mask[2]), Amask(Mask[3]), Rmask(Mask[0]), Gmask(Mask[1]), Bmask(Mask[2]), Amask(Mask[3]),
Rshift(Shift[0]), Gshift(Shift[1]), Bshift(Shift[2]), Ashift(Shift[3]), Rshift(Shift[0]), Gshift(Shift[1]), Bshift(Shift[2]), Ashift(Shift[3])
Rloss(Loss[0]), Gloss(Loss[1]), Bloss(Loss[2]), Aloss(Loss[3])
{ {
memcpy( this, &cpy, sizeof(RageSurfaceFormat) ); memcpy( this, &cpy, sizeof(RageSurfaceFormat) );
if( palette ) if( palette )
@@ -70,10 +69,10 @@ void RageSurfaceFormat::GetRGB( uint32_t val, uint8_t *r, uint8_t *g, uint8_t *b
*g = palette->colors[val].g; *g = palette->colors[val].g;
*b = palette->colors[val].b; *b = palette->colors[val].b;
} else { } else {
*r = int8_t( (val & Rmask) >> Rshift << Rloss ); *r = int8_t( (val & Mask[0]) >> Shift[0] << Loss[0] );
*g = int8_t( (val & Gmask) >> Gshift << Gloss ); *g = int8_t( (val & Mask[1]) >> Shift[1] << Loss[1] );
*b = int8_t( (val & Bmask) >> Bshift << Bloss ); *b = int8_t( (val & Mask[2]) >> Shift[2] << Loss[2] );
// *a = int8_t( (val & Amask) >> Ashift << Aloss ); // *a = int8_t( (val & Amask) >> Ashift << Loss[3] );
} }
} }
@@ -87,10 +86,11 @@ bool RageSurfaceFormat::MapRGBA( uint8_t r, uint8_t g, uint8_t b, uint8_t a, uin
return false; return false;
val = (uint32_t) n; val = (uint32_t) n;
} else { } else {
val = (r >> Rloss << Rshift) | val =
(g >> Gloss << Gshift) | (r >> Loss[0] << Shift[0]) |
(b >> Bloss << Bshift) | (g >> Loss[1] << Shift[1]) |
(a >> Aloss << Ashift); (b >> Loss[2] << Shift[2]) |
(a >> Loss[3] << Shift[3]);
} }
return true; return true;
} }
@@ -187,31 +187,31 @@ void SetupFormat( RageSurfaceFormat &fmt,
fmt.BytesPerPixel = BitsPerPixel/8; fmt.BytesPerPixel = BitsPerPixel/8;
if( fmt.BytesPerPixel == 1 ) if( fmt.BytesPerPixel == 1 )
{ {
fmt.Rmask = fmt.Gmask = fmt.Bmask = fmt.Amask = 0; ZERO( fmt.Mask );
fmt.Rshift = fmt.Gshift = fmt.Bshift = fmt.Ashift = 0; ZERO( fmt.Shift );
/* Loss for paletted textures is zero, since the actual palette entries are 8-bit. */ /* Loss for paletted textures is zero, since the actual palette entries are 8-bit. */
fmt.Rloss = fmt.Gloss = fmt.Bloss = fmt.Aloss = 0; ZERO( fmt.Loss );
fmt.palette = new RageSurfacePalette; fmt.palette = new RageSurfacePalette;
fmt.palette->ncolors = 256; fmt.palette->ncolors = 256;
} }
else else
{ {
fmt.Rmask = Rmask; fmt.Mask[0] = Rmask;
fmt.Gmask = Gmask; fmt.Mask[1] = Gmask;
fmt.Bmask = Bmask; fmt.Mask[2] = Bmask;
fmt.Amask = Amask; fmt.Mask[3] = Amask;
fmt.Rshift = GetShiftFromMask( Rmask ); fmt.Shift[0] = GetShiftFromMask( Rmask );
fmt.Gshift = GetShiftFromMask( Gmask ); fmt.Shift[1] = GetShiftFromMask( Gmask );
fmt.Bshift = GetShiftFromMask( Bmask ); fmt.Shift[2] = GetShiftFromMask( Bmask );
fmt.Ashift = GetShiftFromMask( Amask ); fmt.Shift[3] = GetShiftFromMask( Amask );
fmt.Rloss = (uint8_t) (8-GetBitsFromMask( Rmask )); fmt.Loss[0] = (uint8_t) (8-GetBitsFromMask( Rmask ));
fmt.Gloss = (uint8_t) (8-GetBitsFromMask( Gmask )); fmt.Loss[1] = (uint8_t) (8-GetBitsFromMask( Gmask ));
fmt.Bloss = (uint8_t) (8-GetBitsFromMask( Bmask )); fmt.Loss[2] = (uint8_t) (8-GetBitsFromMask( Bmask ));
fmt.Aloss = (uint8_t) (8-GetBitsFromMask( Amask )); fmt.Loss[3] = (uint8_t) (8-GetBitsFromMask( Amask ));
} }
} }
stepmania/src/RageSurface.h
-1
View File
@@ -37,7 +37,6 @@ struct RageSurfaceFormat
uint8_t Loss[4]; uint8_t Loss[4];
uint32_t &Rmask, &Gmask, &Bmask, &Amask; /* deprecated */ uint32_t &Rmask, &Gmask, &Bmask, &Amask; /* deprecated */
uint32_t &Rshift, &Gshift, &Bshift, &Ashift; /* deprecated */ uint32_t &Rshift, &Gshift, &Bshift, &Ashift; /* deprecated */
uint8_t &Rloss, &Gloss, &Bloss, &Aloss; /* deprecated */
RageSurfacePalette *palette; RageSurfacePalette *palette;
void GetRGB( uint32_t val, uint8_t *r, uint8_t *g, uint8_t *b ) const; void GetRGB( uint32_t val, uint8_t *r, uint8_t *g, uint8_t *b ) const;