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

controller and canvas houskeeping

Browse Source
This commit is contained in:
Justin Scofield
2025-01-05 06:17:09 -05:00
parent 2d9f4be91d
commit f1f6df829f
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/controller.h
View File

@@ -53,13 +53,13 @@ class Controller : public ExperimentFlags {
auto window() -> SDL_Window * { return window_.get(); } auto window() -> SDL_Window * { return window_.get(); }
void init_test_editor(editor::Editor *editor) { test_editor_ = editor; } void init_test_editor(editor::Editor *editor) { test_editor_ = editor; }
void set_active(bool active) { active_ = active; } void set_active(bool active) { active_ = active; }
auto active() { return active_; } auto active() const { return active_; }
private: private:
friend int ::main(int argc, char **argv); friend int ::main(int argc, char **argv);
bool active_ = false; bool active_ = false;
Platform platform_; Platform platform_ = Platform::kUnknown;
editor::Editor *test_editor_ = nullptr; editor::Editor *test_editor_ = nullptr;
editor::EditorManager editor_manager_; editor::EditorManager editor_manager_;

21
src/app/gui/canvas.h
View File

@@ -1,6 +1,7 @@
#ifndef YAZE_GUI_CANVAS_H #ifndef YAZE_GUI_CANVAS_H
#define YAZE_GUI_CANVAS_H #define YAZE_GUI_CANVAS_H
#include <cstdint>
#include <string> #include <string>
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
@@ -130,8 +131,8 @@ public:
void DrawLayeredElements(); void DrawLayeredElements();
int GetTileIdFromMousePos() { int GetTileIdFromMousePos() {
int x = mouse_pos_in_canvas_.x; float x = mouse_pos_in_canvas_.x;
int y = mouse_pos_in_canvas_.y; float y = mouse_pos_in_canvas_.y;
int num_columns = (canvas_sz_.x / global_scale_) / custom_step_; int num_columns = (canvas_sz_.x / global_scale_) / custom_step_;
int num_rows = (canvas_sz_.y / global_scale_) / custom_step_; int num_rows = (canvas_sz_.y / global_scale_) / custom_step_;
int tile_id = (x / custom_step_) + (y / custom_step_) * num_columns; int tile_id = (x / custom_step_) + (y / custom_step_) * num_columns;
@@ -206,6 +207,7 @@ private:
bool enable_context_menu_ = true; bool enable_context_menu_ = true;
bool custom_canvas_size_ = false; bool custom_canvas_size_ = false;
bool select_rect_active_ = false; bool select_rect_active_ = false;
bool refresh_graphics_ = false;
float custom_step_ = 0.0f; float custom_step_ = 0.0f;
float global_scale_ = 1.0f; float global_scale_ = 1.0f;
@@ -216,14 +218,11 @@ private:
uint16_t edit_palette_index_ = 0; uint16_t edit_palette_index_ = 0;
uint64_t edit_palette_group_name_index_ = 0; uint64_t edit_palette_group_name_index_ = 0;
uint64_t edit_palette_sub_index_ = 0; uint64_t edit_palette_sub_index_ = 0;
bool refresh_graphics_ = false;
std::string canvas_id_ = "Canvas";
std::string context_id_ = "CanvasContext";
ImDrawList *draw_list_;
ImVector<ImVec2> points_; ImDrawList* draw_list_ = nullptr;
ImVector<ImVector<std::string>> labels_;
ImVec2 scrolling_; ImVec2 scrolling_;
ImVec2 canvas_sz_; ImVec2 canvas_sz_;
ImVec2 canvas_p0_; ImVec2 canvas_p0_;
@@ -231,7 +230,13 @@ private:
ImVec2 drawn_tile_pos_; ImVec2 drawn_tile_pos_;
ImVec2 mouse_pos_in_canvas_; ImVec2 mouse_pos_in_canvas_;
ImVec2 selected_tile_pos_ = ImVec2(-1, -1); ImVec2 selected_tile_pos_ = ImVec2(-1, -1);
ImVector<ImVec2> points_;
ImVector<ImVec2> selected_points_; ImVector<ImVec2> selected_points_;
ImVector<ImVector<std::string>> labels_;
std::string canvas_id_ = "Canvas";
std::string context_id_ = "CanvasContext";
std::vector<ImVec2> selected_tiles_; std::vector<ImVec2> selected_tiles_;
}; };