X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=6bd09aa3bf1adedb7ed6ba67b4f8e8162d439da8;hb=fe57866d9aa0cc2ebf48411eaf7bb4180cf85a84;hp=14fd7c65de90badadcab8c8d79e3baec070831e0;hpb=8125bee6411975e55f2f571748782b11e9b6aae9;p=rocksndiamonds.git diff --git a/src/libgame/image.c b/src/libgame/image.c index 14fd7c65..6bd09aa3 100644 --- a/src/libgame/image.c +++ b/src/libgame/image.c @@ -21,16 +21,17 @@ struct ImageInfo Bitmap *bitmaps[NUM_IMG_BITMAP_POINTERS]; - int original_width; /* original image file width */ - int original_height; /* original image file height */ + int original_width; // original image file width + int original_height; // original image file height - boolean contains_small_images; /* set after adding small images */ - boolean scaled_up; /* set after scaling up */ + boolean contains_small_images; // set after adding small images + boolean contains_textures; // set after adding GPU textures + boolean scaled_up; // set after scaling up - int conf_tile_size; /* tile size as defined in config */ - int game_tile_size; /* tile size as resized for game */ + int conf_tile_size; // tile size as defined in config + int game_tile_size; // tile size as resized for game - char *leveldir; /* level set when image was loaded */ + char *leveldir; // level set when image was loaded }; typedef struct ImageInfo ImageInfo; @@ -56,6 +57,7 @@ static void *Load_Image(char *filename) img_info->original_height = img_info->bitmaps[IMG_BITMAP_STANDARD]->height; img_info->contains_small_images = FALSE; + img_info->contains_textures = FALSE; img_info->scaled_up = FALSE; img_info->conf_tile_size = 0; // will be set later @@ -84,7 +86,7 @@ static void FreeImage(void *ptr) free(image); } -int getImageListSize() +int getImageListSize(void) { return (image_info->num_file_list_entries + image_info->num_dynamic_file_list_entries); @@ -138,6 +140,13 @@ char *getTokenFromImageID(int graphic) return (file_list != NULL ? file_list->token : NULL); } +char *getFilenameFromImageID(int graphic) +{ + struct FileInfo *file_list = getImageListEntryFromImageID(graphic); + + return (file_list != NULL ? file_list->filename : NULL); +} + int getImageIDFromToken(char *token) { struct FileInfo *file_list = image_info->file_list; @@ -151,17 +160,17 @@ int getImageIDFromToken(char *token) return -1; } -char *getImageConfigFilename() +char *getImageConfigFilename(void) { return getCustomArtworkConfigFilename(image_info->type); } -int getImageListPropertyMappingSize() +int getImageListPropertyMappingSize(void) { return image_info->num_property_mapping_entries; } -struct PropertyMapping *getImageListPropertyMapping() +struct PropertyMapping *getImageListPropertyMapping(void) { return image_info->property_mapping; } @@ -177,7 +186,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, image_info = checked_calloc(sizeof(struct ArtworkListInfo)); image_info->type = ARTWORK_TYPE_GRAPHICS; - /* ---------- initialize file list and suffix lists ---------- */ + // ---------- initialize file list and suffix lists ---------- image_info->num_file_list_entries = num_file_list_entries; image_info->num_dynamic_file_list_entries = 0; @@ -193,7 +202,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, image_info->suffix_list = config_suffix_list; - /* ---------- initialize base prefix and suffixes lists ---------- */ + // ---------- initialize base prefix and suffixes lists ---------- image_info->num_base_prefixes = 0; for (i = 0; base_prefixes[i] != NULL; i++) @@ -225,7 +234,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, image_info->property_mapping = NULL; - /* ---------- initialize artwork reference and content lists ---------- */ + // ---------- initialize artwork reference and content lists ---------- image_info->sizeof_artwork_list_entry = sizeof(ImageInfo *); @@ -235,13 +244,13 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, image_info->content_list = NULL; - /* ---------- initialize artwork loading/freeing functions ---------- */ + // ---------- initialize artwork loading/freeing functions ---------- image_info->load_artwork = Load_Image; image_info->free_artwork = FreeImage; } -void ReloadCustomImages() +void ReloadCustomImages(void) { print_timestamp_init("ReloadCustomImages"); @@ -270,16 +279,10 @@ static boolean CheckIfImageContainsSmallImages(ImageInfo *img_info, // custom artwork set redefines classic (or default) graphics with wrong tile // size (by mistake or by intention), it will be corrected to its original // tile size here by forcing complete re-creation of all small images again - // (this does not work if different tile sizes are used in same image file) if (!strEqual(img_info->leveldir, leveldir_current->identifier) && img_info->conf_tile_size != tile_size) { -#if 0 - printf("::: RE-CREATING DEFAULT TILE SIZE: %d -> %d\n", - img_info->conf_tile_size, tile_size); -#endif - int bitmap_nr = GET_BITMAP_ID_FROM_TILESIZE(img_info->conf_tile_size); int i; @@ -309,6 +312,16 @@ static boolean CheckIfImageContainsSmallImages(ImageInfo *img_info, return FALSE; } + // special case 1 (continued): + // + // if different tile sizes are used in same image file (usually by mistake, + // like forgetting option ".tile_size" for one or more graphic definitions), + // make sure to use only the first tile size that is processed for this image + // (and ignore all subsequent, potentially different tile size definitions + // for this image within the current level set by disabling the above check) + + setString(&img_info->leveldir, leveldir_current->identifier); + // special case 2: // // graphic config setting "game.tile_size" has changed since last level set; @@ -316,12 +329,6 @@ static boolean CheckIfImageContainsSmallImages(ImageInfo *img_info, if (img_info->game_tile_size != gfx.game_tile_size) { -#if 0 - if (strSuffix(img_info->source_filename, "RocksHeroes.png")) - printf("::: RE-CREATING IN-GAME TILE SIZE: %d -> %d\n", - img_info->game_tile_size, gfx.game_tile_size); -#endif - ReCreateGameTileSizeBitmap(img_info->bitmaps); img_info->game_tile_size = gfx.game_tile_size; @@ -351,6 +358,39 @@ void CreateImageWithSmallImages(int pos, int zoom_factor, int tile_size) setString(&img_info->leveldir, leveldir_current->identifier); } +void CreateImageTextures(int pos) +{ + ImageInfo *img_info = getImageInfoEntryFromImageID(pos); + + if (img_info == NULL || img_info->contains_textures) + return; + + CreateBitmapTextures(img_info->bitmaps); + + img_info->contains_textures = TRUE; +} + +static void FreeImageTextures(int pos) +{ + ImageInfo *img_info = getImageInfoEntryFromImageID(pos); + + if (img_info == NULL || !img_info->contains_textures) + return; + + FreeBitmapTextures(img_info->bitmaps); + + img_info->contains_textures = FALSE; +} + +void FreeAllImageTextures(void) +{ + int num_images = getImageListSize(); + int i; + + for (i = 0; i < num_images; i++) + FreeImageTextures(i); +} + void ScaleImage(int pos, int zoom_factor) { ImageInfo *img_info = getImageInfoEntryFromImageID(pos); @@ -364,7 +404,7 @@ void ScaleImage(int pos, int zoom_factor) img_info->scaled_up = TRUE; } -void FreeAllImages() +void FreeAllImages(void) { FreeCustomArtworkLists(image_info); }