From 624dc2a4138783745713e093c7e5ae2e012ff820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0toura=C4=8D?= <525032@mail.muni.cz> Date: Fri, 2 Jun 2023 16:12:07 +0200 Subject: [PATCH] comment edits --- src/studio/include/studio/simulator.hpp | 4 ++-- src/studio/src/simulator.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/studio/include/studio/simulator.hpp b/src/studio/include/studio/simulator.hpp index ade000b..7a5f234 100644 --- a/src/studio/include/studio/simulator.hpp +++ b/src/studio/include/studio/simulator.hpp @@ -58,9 +58,9 @@ struct Simulator : public osi::Simulator std::pair<float, float> intersect_axis(float rayDirection_a, float rayPosition_a, float LH_first_a, float LH_second_a); std::pair<float, float> intersect(glm::vec3 rayPosition, glm::vec3 rayDirection, std::pair<glm::vec3, glm::vec3> LH); - node_ptr find_intersection(glm::vec3 rayPosition, glm::vec3 rayDirection); + node_ptr find_intersection(glm::vec3 rayPosition, glm::vec3 rayDirection); // Not node tree compatible std::pair<glm::vec3, glm::vec3> get_pick_ray(); - void manage_selection(node_ptr nearest_node); + void manage_selection(node_ptr nearest_node); // Not node tree compatible void select_object(); void process_mouse(); diff --git a/src/studio/src/simulator.cpp b/src/studio/src/simulator.cpp index 4e4e6f5..ed4751b 100644 --- a/src/studio/src/simulator.cpp +++ b/src/studio/src/simulator.cpp @@ -464,8 +464,7 @@ void Simulator::manage_selection(node_ptr nearest_node) { if (selection_AABB) { - // Not node tree compatible - auto it = std::find(scene.begin(), scene.end(), selection_AABB); // WRONG? + auto it = std::find(scene.begin(), scene.end(), selection_AABB); if (it != scene.end()) scene.erase(it); selection_AABB = nullptr; -- GitLab