From 7e470f2b3349eeab7e16b7077a81d3fe4c122160 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 29 Dec 2024 16:14:20 -0500 Subject: [PATCH] remove dungeon namespace --- src/app/editor/dungeon/dungeon_editor.cc | 16 ++++++++-------- src/app/editor/dungeon/dungeon_editor.h | 6 +++--- src/app/zelda3/dungeon/object_names.h | 5 +++-- src/app/zelda3/dungeon/object_renderer.cc | 5 +++-- src/app/zelda3/dungeon/object_renderer.h | 5 +++-- src/app/zelda3/dungeon/room.cc | 5 +++-- src/app/zelda3/dungeon/room.h | 5 +++-- src/app/zelda3/dungeon/room_entrance.h | 5 +++-- src/app/zelda3/dungeon/room_object.cc | 5 +++-- src/app/zelda3/dungeon/room_object.h | 5 +++-- src/app/zelda3/dungeon/room_tag.h | 5 +++-- src/test/zelda3/dungeon_room_test.cc | 2 +- src/test/zelda3/overworld_test.cc | 6 +++--- src/yaze.cc | 2 +- 14 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/app/editor/dungeon/dungeon_editor.cc b/src/app/editor/dungeon/dungeon_editor.cc index d0945f79..ab2abe20 100644 --- a/src/app/editor/dungeon/dungeon_editor.cc +++ b/src/app/editor/dungeon/dungeon_editor.cc @@ -74,7 +74,7 @@ absl::Status DungeonEditor::Initialize() { auto dungeon_man_pal_group = rom()->palette_group().dungeon_main; for (int i = 0; i < 0x100 + 40; i++) { - rooms_.emplace_back(zelda3::dungeon::Room(/*room_id=*/i)); + rooms_.emplace_back(zelda3::Room(/*room_id=*/i)); rooms_[i].LoadHeader(); rooms_[i].LoadRoomFromROM(); if (flags()->kDrawDungeonRoomGraphics) { @@ -97,11 +97,11 @@ absl::Status DungeonEditor::Initialize() { LoadDungeonRoomSize(); // LoadRoomEntrances for (int i = 0; i < 0x07; ++i) { - entrances_.emplace_back(zelda3::dungeon::RoomEntrance(*rom(), i, true)); + entrances_.emplace_back(zelda3::RoomEntrance(*rom(), i, true)); } for (int i = 0; i < 0x85; ++i) { - entrances_.emplace_back(zelda3::dungeon::RoomEntrance(*rom(), i, false)); + entrances_.emplace_back(zelda3::RoomEntrance(*rom(), i, false)); } // Load the palette group and palette for the dungeon @@ -325,7 +325,7 @@ void DungeonEditor::DrawRoomSelector() { BeginChild(child_id, ImGui::GetContentRegionAvail(), true, ImGuiWindowFlags_AlwaysVerticalScrollbar)) { int i = 0; - for (const auto each_room_name : zelda3::dungeon::kRoomNames) { + for (const auto each_room_name : zelda3::kRoomNames) { rom()->resource_label()->SelectableLabelWithNameEdit( current_room_id_ == i, "Dungeon Room Names", core::UppercaseHexByte(i), each_room_name.data()); @@ -403,7 +403,7 @@ void DungeonEditor::DrawEntranceSelector() { rom()->resource_label()->SelectableLabelWithNameEdit( current_entrance_id_ == i, "Dungeon Entrance Names", core::UppercaseHexByte(i), - zelda3::dungeon::kEntranceNames[i].data()); + zelda3::kEntranceNames[i].data()); if (ImGui::IsItemClicked()) { current_entrance_id_ = i; @@ -434,12 +434,12 @@ void DungeonEditor::DrawDungeonTabView() { for (int n = 0; n < active_rooms_.Size;) { bool open = true; - if (active_rooms_[n] > sizeof(zelda3::dungeon::kRoomNames) / 4) { + if (active_rooms_[n] > sizeof(zelda3::kRoomNames) / 4) { active_rooms_.erase(active_rooms_.Data + n); continue; } - if (BeginTabItem(zelda3::dungeon::kRoomNames[active_rooms_[n]].data(), + if (BeginTabItem(zelda3::kRoomNames[active_rooms_[n]].data(), &open, ImGuiTabItemFlags_None)) { DrawDungeonCanvas(active_rooms_[n]); EndTabItem(); @@ -549,7 +549,7 @@ void DungeonEditor::DrawObjectRenderer() { int selected_object = 0; int i = 0; - for (const auto object_name : zelda3::dungeon::Type1RoomObjectNames) { + for (const auto object_name : zelda3::Type1RoomObjectNames) { if (ImGui::Selectable(object_name.data(), selected_object == i)) { selected_object = i; current_object_ = i; diff --git a/src/app/editor/dungeon/dungeon_editor.h b/src/app/editor/dungeon/dungeon_editor.h index 6675da8d..5d426105 100644 --- a/src/app/editor/dungeon/dungeon_editor.h +++ b/src/app/editor/dungeon/dungeon_editor.h @@ -119,9 +119,9 @@ class DungeonEditor : public Editor, std::array graphics_bin_; std::vector room_gfx_sheets_; - std::vector rooms_; - std::vector entrances_; - zelda3::dungeon::DungeonObjectRenderer object_renderer_; + std::vector rooms_; + std::vector entrances_; + zelda3::DungeonObjectRenderer object_renderer_; absl::flat_hash_map spriteset_usage_; absl::flat_hash_map blockset_usage_; diff --git a/src/app/zelda3/dungeon/object_names.h b/src/app/zelda3/dungeon/object_names.h index 2ee5b3c6..d7756546 100644 --- a/src/app/zelda3/dungeon/object_names.h +++ b/src/app/zelda3/dungeon/object_names.h @@ -5,7 +5,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + constexpr static inline absl::string_view Type1RoomObjectNames[] = { "Ceiling ↔", @@ -456,7 +456,8 @@ constexpr static inline absl::string_view Type3RoomObjectNames[] = { "Nothing", }; -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/object_renderer.cc b/src/app/zelda3/dungeon/object_renderer.cc index fe00f1b3..7cf77ba2 100644 --- a/src/app/zelda3/dungeon/object_renderer.cc +++ b/src/app/zelda3/dungeon/object_renderer.cc @@ -2,7 +2,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + void DungeonObjectRenderer::LoadObject(uint32_t routine_ptr, std::array& sheet_ids) { @@ -111,7 +111,8 @@ void DungeonObjectRenderer::UpdateObjectBitmap() { bitmap_.Create(256, 256, 8, tilemap_); } -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/object_renderer.h b/src/app/zelda3/dungeon/object_renderer.h index 5acaf0cb..15600305 100644 --- a/src/app/zelda3/dungeon/object_renderer.h +++ b/src/app/zelda3/dungeon/object_renderer.h @@ -15,7 +15,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + struct PseudoVram { std::array sheets; @@ -50,7 +50,8 @@ class DungeonObjectRenderer : public SharedRom { gfx::Bitmap bitmap_; }; -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze \ No newline at end of file diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc index da3d60f1..aeadfbd8 100644 --- a/src/app/zelda3/dungeon/room.cc +++ b/src/app/zelda3/dungeon/room.cc @@ -17,7 +17,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + void Room::LoadHeader() { // Address of the room header @@ -485,7 +485,8 @@ void Room::LoadChests() { } } -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/room.h b/src/app/zelda3/dungeon/room.h index 8a72ff0a..1250eae1 100644 --- a/src/app/zelda3/dungeon/room.h +++ b/src/app/zelda3/dungeon/room.h @@ -15,7 +15,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + // room_object_layout_pointer 0x882D // room_object_pointer 0x874C @@ -600,7 +600,8 @@ constexpr std::string_view kEntranceNames[] = { "Heart Piece Cave 3 (Drop In)", "Ice Rod Cave"}; -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/room_entrance.h b/src/app/zelda3/dungeon/room_entrance.h index bb2482d9..634065f0 100644 --- a/src/app/zelda3/dungeon/room_entrance.h +++ b/src/app/zelda3/dungeon/room_entrance.h @@ -7,7 +7,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + // ============================================================================ // Dungeon Entrances Related Variables @@ -349,7 +349,8 @@ class RoomEntrance { uint8_t camera_boundary_fe_; }; -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/room_object.cc b/src/app/zelda3/dungeon/room_object.cc index 1258b304..796bbe91 100644 --- a/src/app/zelda3/dungeon/room_object.cc +++ b/src/app/zelda3/dungeon/room_object.cc @@ -2,7 +2,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + ObjectOption operator|(ObjectOption lhs, ObjectOption rhs) { return static_cast(static_cast(lhs) | @@ -130,7 +130,8 @@ void RoomObject::DrawTile(gfx::Tile16 t, int xx, int yy, } } -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/room_object.h b/src/app/zelda3/dungeon/room_object.h index 8ba70c68..f6a33d3a 100644 --- a/src/app/zelda3/dungeon/room_object.h +++ b/src/app/zelda3/dungeon/room_object.h @@ -11,7 +11,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + struct SubtypeInfo { uint32_t subtype_ptr; @@ -201,7 +201,8 @@ class Subtype3 : public RoomObject { } }; -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/app/zelda3/dungeon/room_tag.h b/src/app/zelda3/dungeon/room_tag.h index 7a2f4cd6..9e677708 100644 --- a/src/app/zelda3/dungeon/room_tag.h +++ b/src/app/zelda3/dungeon/room_tag.h @@ -5,7 +5,7 @@ namespace yaze { namespace zelda3 { -namespace dungeon { + static const std::string RoomEffect[] = {"Nothing", "Nothing", @@ -85,7 +85,8 @@ static const std::string RoomTag[] = {"Nothing", "Light Torches for Chest", "Kill Boss Again"}; -} // namespace dungeon + + } // namespace zelda3 } // namespace yaze diff --git a/src/test/zelda3/dungeon_room_test.cc b/src/test/zelda3/dungeon_room_test.cc index 0bccce7f..1f0ce2cb 100644 --- a/src/test/zelda3/dungeon_room_test.cc +++ b/src/test/zelda3/dungeon_room_test.cc @@ -25,7 +25,7 @@ class DungeonRoomTest : public ::testing::Test, public SharedRom { }; TEST_F(DungeonRoomTest, SingleRoomLoadOk) { - zelda3::dungeon::Room test_room(/*room_id=*/0); + zelda3::Room test_room(/*room_id=*/0); test_room.LoadHeader(); // Do some assertions based on the output in ZS test_room.LoadRoomFromROM(); diff --git a/src/test/zelda3/overworld_test.cc b/src/test/zelda3/overworld_test.cc index 5dcd4ac2..8e2b2c4b 100644 --- a/src/test/zelda3/overworld_test.cc +++ b/src/test/zelda3/overworld_test.cc @@ -22,7 +22,7 @@ class OverworldTest : public ::testing::Test, public SharedRom { } void TearDown() override {} - zelda3::overworld::Overworld overworld_; + zelda3::Overworld overworld_; }; TEST_F(OverworldTest, OverworldLoadNoRomDataError) { @@ -48,9 +48,9 @@ TEST_F(OverworldTest, OverworldLoadRomDataOk) { // Assert EXPECT_TRUE(status.ok()); EXPECT_EQ(overworld_.overworld_maps().size(), - zelda3::overworld::kNumOverworldMaps); + zelda3::kNumOverworldMaps); EXPECT_EQ(overworld_.tiles16().size(), - zelda3::overworld::kNumTile16Individual); + zelda3::kNumTile16Individual); } } // namespace zelda3 diff --git a/src/yaze.cc b/src/yaze.cc index 2d6389c2..49a2a0a6 100644 --- a/src/yaze.cc +++ b/src/yaze.cc @@ -107,7 +107,7 @@ z3_overworld *yaze_load_overworld(const z3_rom *rom) { } yaze::Rom *internal_rom = static_cast(rom->impl); - auto internal_overworld = new yaze::zelda3::overworld::Overworld(); + auto internal_overworld = new yaze::zelda3::Overworld(); if (!internal_overworld->Load(*internal_rom).ok()) { return nullptr; }