Fix formatting and clean up namespace declarations in editor and GUI files

This commit is contained in:
scawful
2024-12-29 16:45:48 -05:00
parent 4049a31d14
commit c0bce7fd1c
3 changed files with 7 additions and 11 deletions

View File

@@ -32,7 +32,7 @@ namespace editor {
* The class inherits from the SharedRom class. * The class inherits from the SharedRom class.
*/ */
class ScreenEditor : public SharedRom, public Editor { class ScreenEditor : public SharedRom, public Editor {
public: public:
ScreenEditor() { ScreenEditor() {
screen_canvas_.SetCanvasSize(ImVec2(512, 512)); screen_canvas_.SetCanvasSize(ImVec2(512, 512));
type_ = EditorType::kScreen; type_ = EditorType::kScreen;
@@ -49,7 +49,7 @@ public:
absl::Status SaveDungeonMaps(); absl::Status SaveDungeonMaps();
private: private:
void DrawTitleScreenEditor(); void DrawTitleScreenEditor();
void DrawNamingScreenEditor(); void DrawNamingScreenEditor();
void DrawOverworldMapEditor(); void DrawOverworldMapEditor();
@@ -110,8 +110,7 @@ private:
zelda3::screen::Inventory inventory_; zelda3::screen::Inventory inventory_;
}; };
} // namespace editor } // namespace editor
} // namespace yaze
} // namespace yaze
#endif #endif

View File

@@ -29,7 +29,6 @@ namespace yaze {
namespace editor { namespace editor {
using core::Renderer; using core::Renderer;
using ImGui::BeginChild; using ImGui::BeginChild;
using ImGui::BeginTabBar; using ImGui::BeginTabBar;
using ImGui::BeginTabItem; using ImGui::BeginTabItem;
@@ -197,7 +196,6 @@ void OverworldEditor::DrawToolset() {
} }
if (show_tile16_editor_) { if (show_tile16_editor_) {
// Create a table in ImGui for the Tile16 Editor
ImGui::Begin("Tile16 Editor", &show_tile16_editor_, ImGui::Begin("Tile16 Editor", &show_tile16_editor_,
ImGuiWindowFlags_MenuBar); ImGuiWindowFlags_MenuBar);
status_ = tile16_editor_.Update(); status_ = tile16_editor_.Update();

View File

@@ -4,10 +4,9 @@
#include <format> #include <format>
#include <string> #include <string>
#include "imgui/imgui.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "imgui/imgui.h"
namespace yaze { namespace yaze {
namespace gui { namespace gui {
@@ -47,7 +46,7 @@ absl::Status DisplayPalette(gfx::SnesPalette &palette, bool loaded);
void SelectablePalettePipeline(uint64_t &palette_id, bool &refresh_graphics, void SelectablePalettePipeline(uint64_t &palette_id, bool &refresh_graphics,
gfx::SnesPalette &palette); gfx::SnesPalette &palette);
} // namespace gui } // namespace gui
} // namespace yaze } // namespace yaze
#endif #endif