diff --git a/media/font/8bithud.png b/data/font/8bithud.png similarity index 100% rename from media/font/8bithud.png rename to data/font/8bithud.png diff --git a/media/font/8bithud.txt b/data/font/8bithud.txt similarity index 100% rename from media/font/8bithud.txt rename to data/font/8bithud.txt diff --git a/media/font/debug.png b/data/font/debug.png similarity index 100% rename from media/font/debug.png rename to data/font/debug.png diff --git a/media/font/debug.txt b/data/font/debug.txt similarity index 100% rename from media/font/debug.txt rename to data/font/debug.txt diff --git a/data/gamecontrollerdb.txt b/data/input/gamecontrollerdb.txt similarity index 100% rename from data/gamecontrollerdb.txt rename to data/input/gamecontrollerdb.txt diff --git a/data/map/01.map b/data/map/01.map index abc062a..3e135fa 100644 --- a/data/map/01.map +++ b/data/map/01.map @@ -1,5 +1,4 @@ -tileset_img=tiles_surface.png -bg_img=bg_surface.png +tileset_img=surface.png room_up=0 room_down=0 diff --git a/data/map/02.map b/data/map/02.map index 9d2b128..e47a5a1 100644 --- a/data/map/02.map +++ b/data/map/02.map @@ -1,5 +1,4 @@ -tileset_img=tiles_surface.png -bg_img=bg_surface.png +tileset_img=surface.png room_up=0 room_down=03.map diff --git a/data/map/03.map b/data/map/03.map index 68cbb57..b7762da 100644 --- a/data/map/03.map +++ b/data/map/03.map @@ -1,5 +1,4 @@ -tileset_img=tiles_surface.png -bg_img=bg_surface.png +tileset_img=surface.png room_up=02.map room_down=0 diff --git a/media/gfx/tiles_surface.png b/data/map/surface.png similarity index 100% rename from media/gfx/tiles_surface.png rename to data/map/surface.png diff --git a/data/map/surface.tsx b/data/map/surface.tsx index 77ef15e..58e3c78 100644 --- a/data/map/surface.tsx +++ b/data/map/surface.tsx @@ -1,4 +1,4 @@ - - + + diff --git a/media/gfx/tiles_volcano.png b/data/map/volcano.png similarity index 100% rename from media/gfx/tiles_volcano.png rename to data/map/volcano.png diff --git a/media/music/music_menu.ogg b/data/music/music_menu.ogg similarity index 100% rename from media/music/music_menu.ogg rename to data/music/music_menu.ogg diff --git a/media/music/music_surface.ogg b/data/music/music_surface.ogg similarity index 100% rename from media/music/music_surface.ogg rename to data/music/music_surface.ogg diff --git a/media/music/music_volcano.ogg b/data/music/music_volcano.ogg similarity index 100% rename from media/music/music_volcano.ogg rename to data/music/music_volcano.ogg diff --git a/data/animations/player.ani b/data/player/player.ani similarity index 100% rename from data/animations/player.ani rename to data/player/player.ani diff --git a/media/gfx/player.png b/data/player/player.png similarity index 100% rename from media/gfx/player.png rename to data/player/player.png diff --git a/media/sound/sound_drop_enemy.wav b/data/sound/sound_drop_enemy.wav similarity index 100% rename from media/sound/sound_drop_enemy.wav rename to data/sound/sound_drop_enemy.wav diff --git a/media/sound/sound_drop_splat.wav b/data/sound/sound_drop_splat.wav similarity index 100% rename from media/sound/sound_drop_splat.wav rename to data/sound/sound_drop_splat.wav diff --git a/media/sound/sound_menu_logo.wav b/data/sound/sound_menu_logo.wav similarity index 100% rename from media/sound/sound_menu_logo.wav rename to data/sound/sound_menu_logo.wav diff --git a/media/sound/sound_menu_start.wav b/data/sound/sound_menu_start.wav similarity index 100% rename from media/sound/sound_menu_start.wav rename to data/sound/sound_menu_start.wav diff --git a/media/sound/sound_player_coin.wav b/data/sound/sound_player_coin.wav similarity index 100% rename from media/sound/sound_player_coin.wav rename to data/sound/sound_player_coin.wav diff --git a/media/sound/sound_player_death.wav b/data/sound/sound_player_death.wav similarity index 100% rename from media/sound/sound_player_death.wav rename to data/sound/sound_player_death.wav diff --git a/media/sound/sound_player_jump.wav b/data/sound/sound_player_jump.wav similarity index 100% rename from media/sound/sound_player_jump.wav rename to data/sound/sound_player_jump.wav diff --git a/media/gfx/actors.png b/media/gfx/actors.png deleted file mode 100644 index 3ab34b8..0000000 Binary files a/media/gfx/actors.png and /dev/null differ diff --git a/media/gfx/bg_surface.png b/media/gfx/bg_surface.png deleted file mode 100644 index 093344a..0000000 Binary files a/media/gfx/bg_surface.png and /dev/null differ diff --git a/media/gfx/filter.png b/media/gfx/filter.png deleted file mode 100644 index 91cec7e..0000000 Binary files a/media/gfx/filter.png and /dev/null differ diff --git a/media/gfx/hud.png b/media/gfx/hud.png deleted file mode 100644 index 74f4be1..0000000 Binary files a/media/gfx/hud.png and /dev/null differ diff --git a/media/gfx/menu.png b/media/gfx/menu.png deleted file mode 100644 index 6d9ef3d..0000000 Binary files a/media/gfx/menu.png and /dev/null differ diff --git a/media/gfx/menu_animation.png b/media/gfx/menu_animation.png deleted file mode 100644 index 2694a84..0000000 Binary files a/media/gfx/menu_animation.png and /dev/null differ diff --git a/source/map.cpp b/source/map.cpp index 5fe682c..9b8cd02 100644 --- a/source/map.cpp +++ b/source/map.cpp @@ -15,10 +15,8 @@ Map::Map(std::string file, SDL_Renderer *renderer, Asset *asset) // Crea los objetos texture_tile = new LTexture(); - texture_bg = new LTexture(); load(file); loadTextureFromFile(texture_tile, asset->get(tileset_img), renderer); - loadTextureFromFile(texture_bg, asset->get(bg_img), renderer); // Crea la textura para el mapa de tiles de la habitación map_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT); @@ -36,9 +34,6 @@ Map::~Map() texture_tile->unload(); delete texture_tile; - texture_bg->unload(); - delete texture_bg; - SDL_DestroyTexture(map_texture); } @@ -180,12 +175,16 @@ void Map::fillMapTexture() SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0xFF); SDL_RenderClear(renderer); - // Dibuja la textura de fondo - SDL_Rect clip = {0, 0, 320, 208}; - texture_bg->render(renderer, 0, 0, &clip); + // Dibuja el degradado de fondo + for (int i = 0; i < 208; i++) + { + SDL_SetRenderDrawColor(renderer, 234, 171, 159, 0xFF); + SDL_SetRenderDrawColor(renderer, 144, 225, 231, 0xFF); + SDL_RenderDrawLine(renderer, 0, i, 320, i); + } // Dibuja el mapeado de tiles - clip = {0, 0, tile_size, tile_size}; + SDL_Rect clip = {0, 0, tile_size, tile_size}; for (int y = 0; y < map_height; y++) for (int x = 0; x < map_width; x++) diff --git a/source/map.h b/source/map.h index 9b82fdf..51df551 100644 --- a/source/map.h +++ b/source/map.h @@ -42,7 +42,6 @@ private: std::string bg_img; // Imagen con los graficos para la habitación std::vector tilemap; // Indice de los tiles a dibujar en la habitación LTexture *texture_tile; // Textura con los graficos de los tiles habitación - LTexture *texture_bg; // Textura con los graficos de fondo de la habitación SDL_Texture *map_texture; // Textura para dibujar el mapa de la habitación int tile_size; // Ancho del tile en pixels diff --git a/source/prog.cpp b/source/prog.cpp index 3a407b0..16dcf78 100644 --- a/source/prog.cpp +++ b/source/prog.cpp @@ -137,45 +137,40 @@ bool Prog::initSDL() // Crea el indice de ficheros de recursos bool Prog::setFileList() { - // Ficheros binarios + // Ficheros del mapa asset->add("/data/map/01.map", data); asset->add("/data/map/01.tmx", data); asset->add("/data/map/02.map", data); asset->add("/data/map/02.tmx", data); asset->add("/data/map/03.map", data); asset->add("/data/map/03.tmx", data); + asset->add("/data/map/surface.png", bitmap); + + // Ficheros de configuración asset->add("/data/config.bin", data, false); - asset->add("/data/gamecontrollerdb.txt", data); - asset->add("/data/animations/player.ani", data); + asset->add("/data/input/gamecontrollerdb.txt", data); + + // Ficheros del jugador + asset->add("/data/player/player.png", bitmap); + asset->add("/data/player/player.ani", data); - // Texturas - asset->add("/media/gfx/actors.png", bitmap); - asset->add("/media/gfx/bg_surface.png", bitmap); - asset->add("/media/gfx/filter.png", bitmap); - asset->add("/media/gfx/hud.png", bitmap); - asset->add("/media/gfx/menu_animation.png", bitmap); - asset->add("/media/gfx/menu.png", bitmap); - asset->add("/media/gfx/player.png", bitmap); - asset->add("/media/gfx/tiles_surface.png", bitmap); - asset->add("/media/gfx/tiles_volcano.png", bitmap); + // Ficheros de sonido + asset->add("/data/sound/sound_player_coin.wav", sound); + asset->add("/data/sound/sound_player_death.wav", sound); + asset->add("/data/sound/sound_drop_enemy.wav", sound); + asset->add("/data/sound/sound_drop_splat.wav", sound); + asset->add("/data/sound/sound_player_jump.wav", sound); + asset->add("/data/sound/sound_menu_logo.wav", sound); + asset->add("/data/sound/sound_menu_start.wav", sound); - // Sonidos - asset->add("/media/sound/sound_player_coin.wav", sound); - asset->add("/media/sound/sound_player_death.wav", sound); - asset->add("/media/sound/sound_drop_enemy.wav", sound); - asset->add("/media/sound/sound_drop_splat.wav", sound); - asset->add("/media/sound/sound_player_jump.wav", sound); - asset->add("/media/sound/sound_menu_logo.wav", sound); - asset->add("/media/sound/sound_menu_start.wav", sound); + // Ficheros con musica + asset->add("/data/music/music_menu.ogg", music); + asset->add("/data/music/music_surface.ogg", music); + asset->add("/data/music/music_volcano.ogg", music); - // Musicas - asset->add("/media/music/music_menu.ogg", music); - asset->add("/media/music/music_surface.ogg", music); - asset->add("/media/music/music_volcano.ogg", music); - - // Texto - asset->add("/media/font/debug.png", font); - asset->add("/media/font/debug.txt", font); + // Ficheros de fuentes de texto + asset->add("/data/font/debug.png", font); + asset->add("/data/font/debug.txt", font); return asset->check(); }