Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
More work on color-key mode.
Browse files Browse the repository at this point in the history
  • Loading branch information
Eli Gottlieb committed Jul 23, 2010
1 parent 217dd8b commit 9600256
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/video/SDL_shape.c
View file
Expand Up @@ -96,7 +96,7 @@ void SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8*
break;
case(ShapeModeColorKey):
key = mode.parameters.colorKey;
bitmap[bitmap_pixel / ppb] |= (key.r == r && key.g == g && key.b == b ? value : 0) << ((ppb - 1) - (bitmap_pixel % ppb));
bitmap[bitmap_pixel / ppb] |= ((key.r == r && key.g == g && key.b == b) ? value : 0) << ((ppb - 1) - (bitmap_pixel % ppb));
break;
}
}
Expand Down
62 changes: 38 additions & 24 deletions test/testshape.c
View file
Expand Up @@ -14,6 +14,12 @@

#define TICK_INTERVAL 18

typedef struct LoadedPicture {
SDL_Surface *surface;
SDL_Texture *texture;
SDL_WindowShapeMode mode;
} LoadedPicture;

void render(SDL_Window* window,SDL_Texture *texture,SDL_Rect texture_dimensions) {
SDL_SelectRenderer(window);

Expand Down Expand Up @@ -49,28 +55,39 @@ int main(int argc,char** argv) {
}

Uint8 num_pictures = argc - 1;
SDL_Surface **pictures = malloc(sizeof(SDL_Surface*)*num_pictures);
LoadedPicture* pictures = malloc(sizeof(LoadedPicture)*num_pictures);
int i = 0;
for(i=0;i<num_pictures;i++)
pictures[i] = NULL;
pictures[i].surface = NULL;
for(i=0;i<num_pictures;i++) {
pictures[i] = SDL_LoadBMP(argv[i+1]);
if(pictures[i] == NULL) {
pictures[i].surface = SDL_LoadBMP(argv[i+1]);
if(pictures[i].surface == NULL) {
int j = 0;
for(j=0;j<num_pictures;j++)
if(pictures[j] != NULL)
SDL_FreeSurface(pictures[j]);
if(pictures[j].surface != NULL)
SDL_FreeSurface(pictures[j].surface);
free(pictures);
SDL_VideoQuit();
printf("Could not load surface from named bitmap file.\n");
exit(-3);
}
SDL_PixelFormat* format = pictures[i].surface->format;
Uint32 format_enum = SDL_MasksToPixelFormatEnum (format->BitsPerPixel,format->Rmask,format->Gmask, format->Bmask,format->Amask);
if(SDL_ISPIXELFORMAT_ALPHA(format_enum)) {
pictures[i].mode.mode = ShapeModeBinarizeAlpha;
pictures[i].mode.parameters.binarizationCutoff = 1;
}
else {
pictures[i].mode.mode = ShapeModeColorKey;
SDL_Color black = {0,0,0,0xff};
pictures[i].mode.parameters.colorKey = black;
}
}

SDL_Window *window = SDL_CreateShapedWindow("SDL_Shape test",SHAPED_WINDOW_X,SHAPED_WINDOW_Y,SHAPED_WINDOW_DIMENSION,SHAPED_WINDOW_DIMENSION,SDL_WINDOW_RESIZABLE | SDL_WINDOW_SHOWN);
if(window == NULL) {
for(i=0;i<num_pictures;i++)
SDL_FreeSurface(pictures[i]);
SDL_FreeSurface(pictures[i].surface);
free(pictures);
SDL_VideoQuit();
printf("Could not create shaped window for SDL_Shape.\n");
Expand All @@ -79,26 +96,24 @@ int main(int argc,char** argv) {
if(SDL_CreateRenderer(window,-1,SDL_RENDERER_PRESENTFLIP2) == -1) {
SDL_DestroyWindow(window);
for(i=0;i<num_pictures;i++)
SDL_FreeSurface(pictures[i]);
SDL_FreeSurface(pictures[i].surface);
free(pictures);
SDL_VideoQuit();
printf("Could not create rendering context for SDL_Shape window.\n");
exit(-5);
}

SDL_Texture **textures = malloc(sizeof(SDL_Texture*)*num_pictures);
for(i=0;i<num_pictures;i++)
textures[i] = NULL;
pictures[i].texture = NULL;
for(i=0;i<num_pictures;i++) {
textures[i] = SDL_CreateTextureFromSurface(0,pictures[i]);
if(textures[i] == NULL) {
pictures[i].texture = SDL_CreateTextureFromSurface(0,pictures[i].surface);
if(pictures[i].texture == NULL) {
int j = 0;
for(j=0;j<num_pictures;i++)
if(textures[i] != NULL)
SDL_DestroyTexture(textures[i]);
free(textures);
if(pictures[i].texture != NULL)
SDL_DestroyTexture(pictures[i].texture);
for(i=0;i<num_pictures;i++)
SDL_FreeSurface(pictures[i]);
SDL_FreeSurface(pictures[i].surface);
free(pictures);
SDL_DestroyRenderer(window);
SDL_DestroyWindow(window);
Expand All @@ -116,9 +131,9 @@ int main(int argc,char** argv) {
int button_down = 0;
Uint32 format = 0,access = 0;
SDL_Rect texture_dimensions = {0,0,0,0};
SDL_QueryTexture(textures[current_picture],&format,&access,&texture_dimensions.w,&texture_dimensions.h);
SDL_QueryTexture(pictures[current_picture].texture,&format,&access,&texture_dimensions.w,&texture_dimensions.h);
SDL_SetWindowSize(window,texture_dimensions.w,texture_dimensions.h);
SDL_SetWindowShape(window,pictures[current_picture],&mode);
SDL_SetWindowShape(window,pictures[current_picture].surface,&mode);
next_time = SDL_GetTicks() + TICK_INTERVAL;
while(should_exit == 0) {
event_pending = SDL_PollEvent(&event);
Expand All @@ -133,28 +148,27 @@ int main(int argc,char** argv) {
current_picture += 1;
if(current_picture >= num_pictures)
current_picture = 0;
SDL_QueryTexture(textures[current_picture],&format,&access,&texture_dimensions.w,&texture_dimensions.h);
SDL_QueryTexture(pictures[current_picture].texture,&format,&access,&texture_dimensions.w,&texture_dimensions.h);
SDL_SetWindowSize(window,texture_dimensions.w,texture_dimensions.h);
SDL_SetWindowShape(window,pictures[current_picture],&mode);
SDL_SetWindowShape(window,pictures[current_picture].surface,&mode);
}
if(event.type == SDL_QUIT)
should_exit = 1;
event_pending = 0;
}
render(window,textures[current_picture],texture_dimensions);
render(window,pictures[current_picture].texture,texture_dimensions);
SDL_Delay(time_left());
next_time += TICK_INTERVAL;
}

//Free the textures.
for(i=0;i<num_pictures;i++)
SDL_DestroyTexture(textures[i]);
free(textures);
SDL_DestroyTexture(pictures[i].texture);
//Destroy the window.
SDL_DestroyWindow(window);
//Free the original surfaces backing the textures.
for(i=0;i<num_pictures;i++)
SDL_FreeSurface(pictures[i]);
SDL_FreeSurface(pictures[i].surface);
free(pictures);
//Call SDL_VideoQuit() before quitting.
SDL_VideoQuit();
Expand Down

0 comments on commit 9600256

Please sign in to comment.