Dragging and selecting works. Dragging the selection not yet.

This commit is contained in:
Sebastian
2024-11-25 00:53:10 +01:00
parent f04838bffa
commit 9c0aac8618
9 changed files with 76 additions and 53 deletions
+13 -13
View File
@@ -31,7 +31,7 @@
using json = nlohmann::json;
VISEQ::APP::CANVAS::Canvas canvas;
std::shared_ptr<VISEQ::APP::CANVAS::Canvas> canvas = std::make_shared<VISEQ::APP::CANVAS::Canvas>();
VISEQ::APP::AppManager app;
std::shared_ptr<VISEQ::APP::State> state = VISEQ::APP::State::get();
@@ -74,10 +74,10 @@ int main(){
SetTargetFPS(state->settings.fps);
canvas.camera.target = (Vector2){ state->settings.width/2.0f, state->settings.height/2.0f };
canvas.camera.offset = (Vector2){ state->settings.width/2.0f, state->settings.height/2.0f };
canvas.camera.rotation = 0.0f;
canvas.camera.zoom = 1.0f;
canvas->camera.target = (Vector2){ state->settings.width/2.0f, state->settings.height/2.0f };
canvas->camera.offset = (Vector2){ state->settings.width/2.0f, state->settings.height/2.0f };
canvas->camera.rotation = 0.0f;
canvas->camera.zoom = 1.0f;
if(std::filesystem::exists("state.json")){
std::ifstream f("state.json");
@@ -176,9 +176,9 @@ int main(){
BeginDrawing();
ClearBackground((Color){46,46,46});
canvas.drawStart();
canvas->drawStart();
state->update(canvas.camera);
state->update(canvas->camera);
/*else if(IsKeyDown(KEY_LEFT_SHIFT)){*/
/* float steps = round((dragNode->neighbors.front()->position.dist(mouse_pos)) / state->settings.grid) * state->settings.grid;*/
@@ -290,7 +290,7 @@ int main(){
/* drag_distance = 0;*/
/* }*/
/* if(mouse_right_down) {*/
/* canvas.camera.target = Vector2Add(canvas.camera.target, delta);*/
/* canvas->camera.target = Vector2Add(canvas->camera.target, delta);*/
/* drag_distance += delta.length();*/
/* }*/
/* if(mouse_right_released && drag_distance < 5) {*/
@@ -490,14 +490,14 @@ int main(){
/* }*/
/*};*/
canvas.update();
canvas->update();
app.update();
canvas.draw();
app.draw(SCREEN_MOUSE, canvas.camera);
canvas.drawEnd();
canvas->draw();
app.draw(SCREEN_MOUSE, canvas->camera);
canvas->drawEnd();
app.drawUI(SCREEN_MOUSE, canvas.camera);
app.drawUI(SCREEN_MOUSE, canvas->camera);
EndDrawing();
}