Moving graphics stuff where it belongs
This commit is contained in:
@@ -3,13 +3,12 @@
|
|||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
|
|
||||||
#include "Icons.h"
|
#include "Graphics/Icons.h"
|
||||||
#include "Style.h"
|
#include "Graphics/Style.h"
|
||||||
#include "imgui/backends/imgui_impl_sdl.h"
|
#include "imgui/backends/imgui_impl_sdl.h"
|
||||||
#include "imgui/backends/imgui_impl_sdlrenderer.h"
|
#include "imgui/backends/imgui_impl_sdlrenderer.h"
|
||||||
#include "imgui/imgui.h"
|
#include <imgui/imgui.h>
|
||||||
#include "imgui/imgui_internal.h"
|
// #include "imgui/imgui_internal.h"
|
||||||
#include "imgui/misc/cpp/imgui_stdlib.h"
|
|
||||||
|
|
||||||
namespace yaze {
|
namespace yaze {
|
||||||
namespace Application {
|
namespace Application {
|
||||||
|
|||||||
@@ -10,9 +10,9 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "Core/Constants.h"
|
#include "Core/Constants.h"
|
||||||
#include "Core/Icons.h"
|
|
||||||
#include "OverworldEditor.h"
|
|
||||||
#include "Data/ROM.h"
|
#include "Data/ROM.h"
|
||||||
|
#include "Graphics/Icons.h"
|
||||||
|
#include "OverworldEditor.h"
|
||||||
|
|
||||||
namespace yaze {
|
namespace yaze {
|
||||||
namespace Application {
|
namespace Application {
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include "Core/Icons.h"
|
|
||||||
#include "Graphics/Bitmap.h"
|
#include "Graphics/Bitmap.h"
|
||||||
|
#include "Graphics/Icons.h"
|
||||||
#include "Graphics/Tile.h"
|
#include "Graphics/Tile.h"
|
||||||
|
|
||||||
// first step would be to decompress all graphics data from the game
|
// first step would be to decompress all graphics data from the game
|
||||||
@@ -32,7 +32,7 @@ namespace Editor {
|
|||||||
void OverworldEditor::Update() {
|
void OverworldEditor::Update() {
|
||||||
if (rom_.isLoaded()) {
|
if (rom_.isLoaded()) {
|
||||||
if (!doneLoaded) {
|
if (!doneLoaded) {
|
||||||
//overworld.Load(rom_);
|
// overworld.Load(rom_);
|
||||||
doneLoaded = true;
|
doneLoaded = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,7 +266,6 @@ void OverworldEditor::DrawOverworldCanvas() {
|
|||||||
void OverworldEditor::DrawTileSelector() {
|
void OverworldEditor::DrawTileSelector() {
|
||||||
if (ImGui::BeginTabBar("##TabBar", ImGuiTabBarFlags_FittingPolicyScroll)) {
|
if (ImGui::BeginTabBar("##TabBar", ImGuiTabBarFlags_FittingPolicyScroll)) {
|
||||||
if (ImGui::BeginTabItem("Tile8")) {
|
if (ImGui::BeginTabItem("Tile8")) {
|
||||||
|
|
||||||
ImGui::EndTabItem();
|
ImGui::EndTabItem();
|
||||||
}
|
}
|
||||||
if (ImGui::BeginTabItem("Tile16")) {
|
if (ImGui::BeginTabItem("Tile16")) {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <imgui/imgui.h>
|
#include <imgui/imgui.h>
|
||||||
|
|
||||||
#include "Core/Icons.h"
|
#include "Graphics/Icons.h"
|
||||||
#include "Data/OW/Overworld.h"
|
#include "Data/OW/Overworld.h"
|
||||||
#include "Graphics/Palette.h"
|
#include "Graphics/Palette.h"
|
||||||
#include "Graphics/Scene.h"
|
#include "Graphics/Scene.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user