Skip to content
Snippets Groups Projects
Verified Commit 10e2272f authored by TORTEROTOT THOMAS's avatar TORTEROTOT THOMAS
Browse files

Cleaner and more faithful item/lives display & terrain sprite loading refactor

parent 6f8a1693
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/engine/cell.cpp
+ 6
− 6
View file @ 10e2272f
......@@ -52,20 +52,20 @@ void Cell::update_type(const ECellType new_type)
}
void Cell::update_sprite_handle(
const std::unordered_map<ECellType, SpriteHandle>& map_cell_type,
const std::unordered_map<EItemType, SpriteHandle>& map_item_type,
const std::array<SpriteHandle, 16>& walls)
const std::unordered_map<ECellType, SpriteHandle>& cell_sprite_handles,
const std::unordered_map<EItemType, SpriteHandle>& item_sprite_handles,
const std::array<SpriteHandle, 16>& wall_sprite_handles)
{
switch (type)
{
case ECellType::Wall:
sprite_handle = walls[wall_masks.pos & ~wall_masks.neg];
sprite_handle = wall_sprite_handles[wall_masks.pos & ~wall_masks.neg];
break;
case ECellType::Item:
sprite_handle = map_item_type.find(item_type)->second;
sprite_handle = item_sprite_handles.find(item_type)->second;
break;
default:
sprite_handle = map_cell_type.find(type)->second;
sprite_handle = cell_sprite_handles.find(type)->second;
break;
}
}
......
src/engine/cell.hpp
+ 3
− 3
View file @ 10e2272f
......@@ -62,9 +62,9 @@ public:
void update_type(const ECellType new_type);
void update_sprite_handle(
const std::unordered_map<ECellType, SpriteHandle>& map_cell_type,
const std::unordered_map<EItemType, SpriteHandle>& map_item_type,
const std::array<SpriteHandle, 16>& walls);
const std::unordered_map<ECellType, SpriteHandle>& cell_sprite_handles,
const std::unordered_map<EItemType, SpriteHandle>& item_sprite_handles,
const std::array<SpriteHandle, 16>& wall_sprite_handles);
void draw(int32_t terrain_unit_scale, SDL_Surface* surface_override = nullptr) const;
private:
......
src/engine/sprite_sheet.cpp
+ 5
− 0
View file @ 10e2272f
......@@ -124,4 +124,9 @@ std::optional<SpriteHandle> SpriteSheet::find_sprite_by_name(const std::string&
return found->first;
}
SpriteHandle SpriteSheet::find_sprite_by_name_or_default(const std::string& name, SpriteHandle default_value)
{
return find_sprite_by_name(name).value_or(default_value);
}
}
src/engine/sprite_sheet.hpp
+ 1
− 0
View file @ 10e2272f
......@@ -134,6 +134,7 @@ public:
// Creating a new sprite with a name already in use will update all sprites using this name. Be careful, it's not an intended behavior.
SpriteHandle new_sprite(const std::string& name, SDL_Rect base_transform, double animation_speed = 1.0, const std::vector<Vector2I>& offsets = {});
[[nodiscard]] static std::optional<SpriteHandle> find_sprite_by_name(const std::string& name);
[[nodiscard]] static SpriteHandle find_sprite_by_name_or_default(const std::string& name, SpriteHandle default_value=SpriteHandle{});
// Draw sprite at location
void render_sprite(const SpriteHandle& sprite, Vector2I pos, double scale_x = 1.0, double scale_y = 1.0, SDL_Surface* surface_override = nullptr) const;
......
src/engine/terrain.cpp
+ 42
− 37
View file @ 10e2272f
......@@ -35,6 +35,16 @@ std::unordered_map<EItemType, int> Terrain::item_values = {
{EItemType::Key, 5000}
};
EItemType Terrain::get_level_item(int level) const
{
return level_items[static_cast<size_t>(level) < level_items.size() ? level : 0];
}
SpriteHandle Terrain::get_item_sprite_handle(EItemType item) const
{
return item_sprite_handles.find(item)->second;
}
void Terrain::load_from_file(const std::filesystem::path& path)
{
width = 0;
......@@ -105,7 +115,7 @@ void Terrain::eat(const Vector2I& pos)
if (gum_count == 70 || gum_count == 170)
{
const auto level = Engine::get().get_gamemode<PacmanGamemode>().current_level();
const EItemType spawned_item = level_items[static_cast<size_t>(level) < level_items.size() ? level : 0];
const EItemType spawned_item = get_level_item(level);
item_timer = Engine::get().random_double(9.3333, 10);
get_cell({10, 15}).set_item(spawned_item);
}
......@@ -202,49 +212,44 @@ void Terrain::update_sprite_handles()
{
const SpriteHandle null_handle;
auto get_sprite_handle = [null_handle](const std::string& name)
{
return SpriteSheet::find_sprite_by_name(name).value_or(null_handle);
};
const std::unordered_map<ECellType, SpriteHandle> map_cell_type = {
const std::unordered_map<ECellType, SpriteHandle> cell_sprite_handles = {
{ECellType::Void, null_handle},
{ECellType::Gum, get_sprite_handle("gum")},
{ECellType::BiGum, get_sprite_handle("bigum")},
{ECellType::Door, get_sprite_handle("door")}
{ECellType::Gum, SpriteSheet::find_sprite_by_name_or_default("gum")},
{ECellType::BiGum, SpriteSheet::find_sprite_by_name_or_default("bigum")},
{ECellType::Door, SpriteSheet::find_sprite_by_name_or_default("door")}
};
const std::unordered_map<EItemType, SpriteHandle> map_item_type = {
{EItemType::Cherry, get_sprite_handle("cherry")},
{EItemType::Strawberry, get_sprite_handle("strawberry")},
{EItemType::Abricot, get_sprite_handle("abricot")},
{EItemType::Apple, get_sprite_handle("apple")},
{EItemType::Grapes, get_sprite_handle("wtfruit")},
{EItemType::Galaxian, get_sprite_handle("axe")},
{EItemType::Bell, get_sprite_handle("bell")},
{EItemType::Key, get_sprite_handle("key")},
item_sprite_handles = {
{EItemType::Cherry, SpriteSheet::find_sprite_by_name_or_default("cherry")},
{EItemType::Strawberry, SpriteSheet::find_sprite_by_name_or_default("strawberry")},
{EItemType::Abricot, SpriteSheet::find_sprite_by_name_or_default("abricot")},
{EItemType::Apple, SpriteSheet::find_sprite_by_name_or_default("apple")},
{EItemType::Grapes, SpriteSheet::find_sprite_by_name_or_default("wtfruit")},
{EItemType::Galaxian, SpriteSheet::find_sprite_by_name_or_default("axe")},
{EItemType::Bell, SpriteSheet::find_sprite_by_name_or_default("bell")},
{EItemType::Key, SpriteSheet::find_sprite_by_name_or_default("key")},
};
std::array<SpriteHandle, 16> walls;
walls[0] = get_sprite_handle("wall_none");
walls[Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_N");
walls[Cell::WALL_MASK_EAST] = get_sprite_handle("wall_E");
walls[Cell::WALL_MASK_EAST | Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_NE");
walls[Cell::WALL_MASK_WEST] = get_sprite_handle("wall_W");
walls[Cell::WALL_MASK_WEST | Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_NW");
walls[Cell::WALL_MASK_WEST | Cell::WALL_MASK_EAST] = get_sprite_handle("wall_EW");
walls[Cell::WALL_MASK_WEST | Cell::WALL_MASK_EAST | Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_NEW");
walls[Cell::WALL_MASK_SOUTH] = get_sprite_handle("wall_S");
walls[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_NS");
walls[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_EAST] = get_sprite_handle("wall_ES");
walls[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_EAST | Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_NES");
walls[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_WEST] = get_sprite_handle("wall_WS");
walls[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_WEST | Cell::WALL_MASK_NORTH] = get_sprite_handle("wall_NWS");
walls[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_WEST | Cell::WALL_MASK_EAST] = get_sprite_handle("wall_EWS");
walls[Cell::WALL_MASK_FULL] = get_sprite_handle("wall_full");
std::array<SpriteHandle, 16> wall_sprite_handles;
wall_sprite_handles[0] = SpriteSheet::find_sprite_by_name_or_default("wall_none");
wall_sprite_handles[Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_N");
wall_sprite_handles[Cell::WALL_MASK_EAST] = SpriteSheet::find_sprite_by_name_or_default("wall_E");
wall_sprite_handles[Cell::WALL_MASK_EAST | Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_NE");
wall_sprite_handles[Cell::WALL_MASK_WEST] = SpriteSheet::find_sprite_by_name_or_default("wall_W");
wall_sprite_handles[Cell::WALL_MASK_WEST | Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_NW");
wall_sprite_handles[Cell::WALL_MASK_WEST | Cell::WALL_MASK_EAST] = SpriteSheet::find_sprite_by_name_or_default("wall_EW");
wall_sprite_handles[Cell::WALL_MASK_WEST | Cell::WALL_MASK_EAST | Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_NEW");
wall_sprite_handles[Cell::WALL_MASK_SOUTH] = SpriteSheet::find_sprite_by_name_or_default("wall_S");
wall_sprite_handles[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_NS");
wall_sprite_handles[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_EAST] = SpriteSheet::find_sprite_by_name_or_default("wall_ES");
wall_sprite_handles[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_EAST | Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_NES");
wall_sprite_handles[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_WEST] = SpriteSheet::find_sprite_by_name_or_default("wall_WS");
wall_sprite_handles[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_WEST | Cell::WALL_MASK_NORTH] = SpriteSheet::find_sprite_by_name_or_default("wall_NWS");
wall_sprite_handles[Cell::WALL_MASK_SOUTH | Cell::WALL_MASK_WEST | Cell::WALL_MASK_EAST] = SpriteSheet::find_sprite_by_name_or_default("wall_EWS");
wall_sprite_handles[Cell::WALL_MASK_FULL] = SpriteSheet::find_sprite_by_name_or_default("wall_full");
for (auto& cell : grid)
cell.update_sprite_handle(map_cell_type, map_item_type, walls);
cell.update_sprite_handle(cell_sprite_handles, item_sprite_handles, wall_sprite_handles);
}
void Terrain::create_wall_cache_surface()
......
src/engine/terrain.hpp
+ 4
− 0
View file @ 10e2272f
......@@ -23,6 +23,9 @@ public:
return unit_length;
}
[[nodiscard]] EItemType get_level_item(int level) const;
[[nodiscard]] SpriteHandle get_item_sprite_handle(EItemType item) const;
void tick(double delta_time);
void draw();
......@@ -60,6 +63,7 @@ private:
static std::array<EItemType, 13> level_items;
static std::unordered_map<EItemType, int> item_values;
std::unordered_map<EItemType, SpriteHandle> item_sprite_handles;
int32_t unit_length = 16;
uint32_t width = 0;
uint32_t height = 0;
......
src/game/pacman_gamemode.cpp
+ 5
− 17
View file @ 10e2272f
......@@ -175,25 +175,13 @@ void PacmanGamemode::draw()
for (int32_t i = 0; i < lives; ++i)
{
SpriteSheet::find_sprite_by_name("pacman_life")->draw({(2 - i) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
SpriteSheet::find_sprite_by_name("pacman_life")->draw({(i + 2) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
}
if (level >= 1)
SpriteSheet::find_sprite_by_name("cherry")->draw({(18) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level >= 2)
SpriteSheet::find_sprite_by_name("strawberry")->draw({(17) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level >= 4)
SpriteSheet::find_sprite_by_name("abricot")->draw({(16) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level >= 6)
SpriteSheet::find_sprite_by_name("apple")->draw({(15) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level >= 8)
SpriteSheet::find_sprite_by_name("wtfruit")->draw({(14) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level >= 10)
SpriteSheet::find_sprite_by_name("axe")->draw({(13) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level >= 12)
SpriteSheet::find_sprite_by_name("bell")->draw({(12) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
if (level > 12)
SpriteSheet::find_sprite_by_name("key")->draw({(11) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
int32_t items_to_display = std::min(level, 7);
for (int32_t i = 0; i < items_to_display; ++i)
terrain->get_item_sprite_handle(terrain->get_level_item(level - items_to_display + i + 1))
.draw({(18 - i) * terrain->get_unit_length(), (static_cast<int32_t>(terrain->get_height())) * terrain->get_unit_length()});
// Hide tunnel
SDL_FillRect(pm::Engine::get().get_surface_handle(), &tunnel_rect, 0);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment