scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rearranging some files and namespaces

Browse Source
This commit is contained in:
Justin Scofield
2022-06-12 18:36:53 -04:00
parent b325669ca8
commit aa787a39fa
13 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Application/Editor/Editor.cc
View File

@@ -413,7 +413,7 @@ void Editor::DrawProjectEditor() {
const float GRID_STEP = 8.0f;
float x = fmodf(scrolling.x, GRID_STEP);
float y = fmodf(scrolling.y, GRID_STEP);
draw_list->AddImage((void*)(intptr_t)value,
draw_list->AddImage((void *)(SDL_Surface *)value,
ImVec2(canvas_p0.x + x, canvas_p0.y),
ImVec2(canvas_p0.x + x, canvas_p1.y));
x += GRID_STEP;

4
src/Application/Editor/Editor.h
View File

@@ -12,7 +12,7 @@
#include "Core/Constants.h"
#include "Core/Icons.h"
#include "OverworldEditor.h"
#include "Utils/ROM.h"
#include "Data/ROM.h"
namespace yaze {
namespace Application {
@@ -40,7 +40,7 @@ class Editor {
void *rom_data_;
bool isLoaded = true;
Utils::ROM rom;
Data::ROM rom;
TextEditor asm_editor_;
TextEditor::LanguageDefinition language65816Def;
OverworldEditor overworld_editor_;

6
src/Application/Editor/OverworldEditor.h
View File

@@ -4,7 +4,7 @@
#include <imgui/imgui.h>
#include "Core/Icons.h"
#include "Data/Overworld.h"
#include "Data/OW/Overworld.h"
#include "Graphics/Palette.h"
#include "Graphics/Scene.h"
#include "Graphics/Tile.h"
@@ -21,7 +21,7 @@ class OverworldEditor {
public:
void Update();
void SetRom(Utils::ROM &rom) { rom_ = rom; }
void SetRom(Data::ROM &rom) { rom_ = rom; }
private:
void DrawToolset();
@@ -33,7 +33,7 @@ class OverworldEditor {
bool show_changelist_ = false;
Utils::ROM rom_;
Data::ROM rom_;
Data::Overworld overworld;
Graphics::Scene current_scene_;
Graphics::Bitmap allgfxBitmap;