remove app namespace

This commit is contained in:
scawful
2024-12-28 21:28:51 -05:00
parent 3ebe17c7bd
commit e05e7c35db
174 changed files with 475 additions and 658 deletions

View File

@@ -12,7 +12,6 @@
#include "imgui/imgui.h"
namespace yaze {
namespace app {
namespace gui {
using core::Renderer;
@@ -856,5 +855,5 @@ void BitmapCanvasPipeline(gui::Canvas &canvas, const gfx::Bitmap &bitmap,
}
} // namespace gui
} // namespace app
} // namespace yaze

View File

@@ -8,16 +8,15 @@
#include "imgui/imgui.h"
namespace yaze {
namespace app {
/**
* @namespace yaze::app::gui
* @namespace yaze::gui
* @brief Graphical User Interface (GUI) components for the application.
*/
namespace gui {
using app::gfx::Bitmap;
using app::gfx::BitmapTable;
using gfx::Bitmap;
using gfx::BitmapTable;
enum class CanvasType { kTile, kBlock, kMap };
enum class CanvasMode { kPaint, kSelect };
@@ -245,7 +244,7 @@ void BitmapCanvasPipeline(gui::Canvas &canvas, const gfx::Bitmap &bitmap,
bool scrollbar, int canvas_id);
} // namespace gui
} // namespace app
} // namespace yaze
#endif

View File

@@ -10,7 +10,6 @@
#include "app/gfx/snes_color.h"
namespace yaze {
namespace app {
namespace gui {
ImVec4 ConvertSnesColorToImVec4(const SnesColor& color) {
@@ -53,7 +52,7 @@ IMGUI_API bool SnesColorEdit4(absl::string_view label, SnesColor* color,
return pressed;
}
absl::Status DisplayPalette(app::gfx::SnesPalette& palette, bool loaded) {
absl::Status DisplayPalette(gfx::SnesPalette& palette, bool loaded) {
static ImVec4 color = ImVec4(0, 0, 0, 255.f);
ImGuiColorEditFlags misc_flags = ImGuiColorEditFlags_AlphaPreview |
ImGuiColorEditFlags_NoDragDrop |
@@ -170,5 +169,5 @@ void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
}
} // namespace gui
} // namespace app
} // namespace yaze

View File

@@ -11,7 +11,6 @@
#include "app/gfx/snes_palette.h"
namespace yaze {
namespace app {
namespace gui {
using gfx::SnesColor;
@@ -28,13 +27,13 @@ IMGUI_API bool SnesColorButton(absl::string_view id, SnesColor& color,
IMGUI_API bool SnesColorEdit4(absl::string_view label, SnesColor* color,
ImGuiColorEditFlags flags = 0);
absl::Status DisplayPalette(app::gfx::SnesPalette& palette, bool loaded);
absl::Status DisplayPalette(gfx::SnesPalette& palette, bool loaded);
void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
gfx::SnesPalette& palette);
} // namespace gui
} // namespace app
} // namespace yaze
#endif

View File

@@ -133,7 +133,6 @@ bool InputScalarLeft(const char* label, ImGuiDataType data_type, void* p_data,
} // namespace ImGui
namespace yaze {
namespace app {
namespace gui {
const int kStepOneHex = 0x01;
@@ -282,5 +281,5 @@ void FileDialogPipeline(absl::string_view display_key,
}
} // namespace gui
} // namespace app
} // namespace yaze

View File

@@ -21,7 +21,6 @@
#include "imgui_memory_editor.h"
namespace yaze {
namespace app {
namespace gui {
constexpr ImVec2 kDefaultModalSize = ImVec2(200, 0);
@@ -64,7 +63,7 @@ void FileDialogPipeline(absl::string_view display_key,
std::function<void()> callback);
} // namespace gui
} // namespace app
} // namespace yaze
#endif

View File

@@ -3,7 +3,6 @@
#include "absl/strings/str_format.h"
namespace yaze {
namespace app {
namespace gui {
using namespace ImGui;
@@ -342,5 +341,5 @@ void GfxSheetAssetBrowser::Draw(
}
} // namespace gui
} // namespace app
} // namespace yaze

View File

@@ -13,7 +13,6 @@
#define IM_CLAMP(V, MN, MX) ((V) < (MN) ? (MN) : (V) > (MX) ? (MX) : (V))
namespace yaze {
namespace app {
namespace gui {
// Extra functions to add deletion support to ImGuiSelectionBasicStorage
@@ -243,7 +242,7 @@ struct GfxSheetAssetBrowser {
};
} // namespace gui
} // namespace app
} // namespace yaze
#endif // YAZE_APP_GUI_ASSET_BROWSER_H

View File

@@ -4,7 +4,6 @@
#include "imgui/imgui_internal.h"
namespace yaze {
namespace app {
namespace gui {
// TODO: Add more display settings to popup windows.
@@ -649,5 +648,5 @@ TextEditor::LanguageDefinition GetAssemblyLanguageDef() {
}
} // namespace gui
} // namespace app
} // namespace yaze

View File

@@ -9,7 +9,6 @@
#include "imgui/imgui.h"
namespace yaze {
namespace app {
namespace gui {
void BeginWindowWithDisplaySettings(const char *id, bool *active,
@@ -92,7 +91,7 @@ struct MultiSelectWithClipper {
};
} // namespace gui
} // namespace app
} // namespace yaze
#endif

View File

@@ -15,7 +15,6 @@
#include "imgui/imgui.h"
namespace yaze {
namespace app {
namespace gui {
namespace zeml {
@@ -618,5 +617,5 @@ std::string LoadFile(const std::string& filename) {
} // namespace zeml
} // namespace gui
} // namespace app
} // namespace yaze

View File

@@ -11,11 +11,10 @@
#include <vector>
namespace yaze {
namespace app {
namespace gui {
/**
* @namespace yaze::app::gui::zeml
* @namespace yaze::gui::zeml
* @brief Zelda Editor Markup Language Functions
*/
namespace zeml {
@@ -207,7 +206,7 @@ std::string LoadFile(const std::string& filename);
} // namespace zeml
} // namespace gui
} // namespace app
} // namespace yaze
#endif // YAZE_APP_GUI_YAZON_H_