miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed alpha surfaces in Alien Blaster

Browse Source
This commit is contained in:
pelya
2010-07-21 12:16:04 +03:00
parent e39e54fce5
commit 9f8dde30fc
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
alienblaster/project/jni/application/src/SdlForwardCompat.h
View File

@@ -28,7 +28,8 @@ static inline SdlCompat_AcceleratedSurface * SdlCompat_CreateAcceleratedSurface(
// Allocate accelerated surface even if that means loss of color quality
Uint32 format;
/*
if( surface->flags & SDL_SRCALPHA )
{
format = SDL_PIXELFORMAT_RGBA4444;
@@ -59,17 +60,33 @@ static inline SdlCompat_AcceleratedSurface * SdlCompat_CreateAcceleratedSurface(
format = SDL_PIXELFORMAT_RGB565;
ret->t = SDL_CreateTextureFromSurface(format, surface);
}
*/
format = SDL_PIXELFORMAT_RGB565;
if( surface->flags & SDL_SRCCOLORKEY )
format = SDL_PIXELFORMAT_RGBA5551;
ret->t = SDL_CreateTextureFromSurface(format, surface);
ret->w = surface->w;
ret->h = surface->h;
ret->format = new SDL_PixelFormat();
*(ret->format) = *(surface->format);
if( ! ret->t )
{
SDL_SetError("SdlCompat_CreateAcceleratedSurface: Cannot allocate HW texture, W %d H %d format %x surface->flags %x", ret->w, ret->h, format, surface->flags );
return ret;
}
if( surface->flags & SDL_SRCALPHA )
{
SDL_SetTextureBlendMode( ret->t, SDL_BLENDMODE_BLEND );
Uint8 alpha = 128;
if( SDL_GetSurfaceAlphaMod( surface, &alpha ) < 0 )
alpha = 128;
SDL_SetTextureAlphaMod( ret->t, alpha );
}
ret->format = new SDL_PixelFormat();
*(ret->format) = *(surface->format);
return ret;
};

2
alienblaster/project/jni/application/src/explosion.cpp
View File

@@ -26,7 +26,7 @@ using namespace std;
Explosion::Explosion(string fn, const Vector2D &position,
const Vector2D &velocity, const ExplosionTypes &explosionType) {
sprite = surfaceDB.loadSurface(fn);
sprite = surfaceDB.loadSurface(fn, true);
nrAnimStages = sprite->w / sprite->h;
expired = false;

4
alienblaster/project/jni/application/src/global.cpp
View File

@@ -368,8 +368,8 @@ void initAllSurfaces() {
surfaceDB.loadSurface("./images/heavyFighterDeflector.bmp", true);
//surfaceDB.loadSurface("./images/font-20red");
//surfaceDB.loadSurface("./images/font-20blue");
surfaceDB.loadSurface("./images/explosion.bmp");
surfaceDB.loadSurface("./images/explosionEnemy.bmp");
surfaceDB.loadSurface("./images/explosion.bmp", true);
surfaceDB.loadSurface("./images/explosionEnemy.bmp", true);
surfaceDB.loadSurface("./images/bannerExcellent.bmp", true);
surfaceDB.loadSurface("./images/bannerYouRule.bmp", true);
surfaceDB.loadSurface("./images/bannerHeiho.bmp", true);

7
alienblaster/project/jni/application/src/surfaceDB.cpp
View File

@@ -93,14 +93,7 @@ SdlCompat_AcceleratedSurface *SurfaceDB::loadSurface( string fn, bool alpha ) {
}
if ( alpha ) {
hwSurface = SDL_DisplayFormatAlpha(newSurface);
if( hwSurface ) {
SDL_FreeSurface(newSurface);
newSurface = hwSurface;
}
SDL_SetAlpha( newSurface, SDL_SRCALPHA, 128 );
SDL_SetColorKey( newSurface, SDL_SRCCOLORKEY,
SDL_MapRGB(newSurface->format, transR, transG, transB) );
}
surfaceDB[ fn ] = SdlCompat_CreateAcceleratedSurface( newSurface );