Some progress on selecting, hovering but still buggy and not a good design really.
This commit is contained in:
@@ -19,6 +19,8 @@ namespace VISEQ::APP{
|
||||
|
||||
enum InteractionState {HOVER_CANVAS, HOVER_NODE, HOVER_CONNECTOR, ADD_NODES_MENU, DRAG_NODE, CONNECT_NODE, DRAW_SELECTION, SCALE_SELECTION, DELETE_SELECTED_NODES, COPY_SELECTED_NODES, PASTE_SELECTED_NODES};
|
||||
|
||||
inline std::vector<std::string> state_string = {"HOVER_CANVAS"," HOVER_NODE"," HOVER_CONNECTOR"," ADD_NODES_MENU"," DRAG_NODE"," CONNECT_NODE"," DRAW_SELECTION"," SCALE_SELECTION"," DELETE_SELECTED_NODES"," COPY_SELECTED_NODES"," PASTE_SELECTED_NODES"};
|
||||
|
||||
struct MouseState{
|
||||
bool down = false;
|
||||
bool clicked = false;
|
||||
@@ -44,6 +46,7 @@ namespace VISEQ::APP{
|
||||
Vec2Df mod_mouse;
|
||||
|
||||
InteractionState istate = HOVER_CANVAS;
|
||||
InteractionState old_istate = HOVER_CANVAS;
|
||||
|
||||
int node_mode = 0;
|
||||
|
||||
@@ -62,6 +65,8 @@ namespace VISEQ::APP{
|
||||
Vec2Df mouse_delta;
|
||||
|
||||
void update(Camera2D camera){
|
||||
if(istate != old_istate) std::cout << state_string[istate] << std::endl;
|
||||
|
||||
mouse_delta = {GetMouseDelta().x, GetMouseDelta().y};
|
||||
|
||||
settings.speed = (settings.grid * 16.0f) * (settings.bpm / 120.f);
|
||||
@@ -97,6 +102,7 @@ namespace VISEQ::APP{
|
||||
mod_mouse.x = round(mouse_pos.x / settings.grid) * settings.grid;
|
||||
mod_mouse.y = round(mouse_pos.y / settings.grid) * settings.grid;
|
||||
}
|
||||
old_istate = istate;
|
||||
}
|
||||
|
||||
inline static std::shared_ptr<State> instance;
|
||||
|
||||
Reference in New Issue
Block a user