diff --git a/src/edit/include/edit/editor.hpp b/src/edit/include/edit/editor.hpp
index b20e8af7abea5656a39a8658fa9bda9fd2e6c085..f4dd74ca871b29f359e5e913c8b464bc9867fc12 100644
--- a/src/edit/include/edit/editor.hpp
+++ b/src/edit/include/edit/editor.hpp
@@ -84,6 +84,7 @@ public:
bool &is_connecting_modules;
rofi::cardinal &selected_cardinality;
std::pair<connector_ptr, connector_ptr> &selected_connectors;
+ std::pair<module_ptr, module_ptr> &selected_modules_connect;
bool &is_moving_module;
glm::vec3 &module_position;
bool &is_rotating_module;
@@ -102,7 +103,8 @@ public:
UIData(phase &_editor_phase, mode_I &_editor_mode_I, mode_II &_editor_mode_II, build_mode_I &_editor_build_mode_I, build_mode_II &_editor_build_mode_II,
state &_control_state, bool &_ui_visible, rofi::component &_chosen_component, rofi::connector_type &_chosen_con_type,
std::vector<rofi::component> &_allowed_components, std::vector<module_ptr> &_modules, module_ptr &_selected_module, bool &_is_connecting_modules,
- rofi::cardinal &_selected_cardinality, std::pair<connector_ptr, connector_ptr> &_selected_connectors, bool &_connector_selected, bool &_voxel_selected,
+ rofi::cardinal &_selected_cardinality, std::pair<connector_ptr, connector_ptr> &_selected_connectors, std::pair<module_ptr, module_ptr> &_selected_modules_connect,
+ bool &_connector_selected, bool &_voxel_selected,
bool &_is_moving_module, glm::vec3 &_module_position, int &_coordinate_space_selection, bool &_is_rotating_module, glm::vec3 &_module_rotation_angles,
bool &_is_rotating_component, float &_component_rotation_angle, bool &_is_creating_pad, std::size_t &_selected_pad_width, std::size_t &_selected_pad_height,
std::string &_error_msg, double &_error_start_second, bool &_primary_axis)
@@ -122,6 +124,7 @@ public:
is_connecting_modules{_is_connecting_modules},
selected_cardinality{_selected_cardinality},
selected_connectors{_selected_connectors},
+ selected_modules_connect{_selected_modules_connect},
connector_selected{_connector_selected},
voxel_selected{_voxel_selected},
is_moving_module{_is_moving_module},
@@ -185,8 +188,8 @@ class Editor
UIData ui = UIData{editor_phase, editor_mode_I, editor_mode_II, editor_build_mode_I, editor_build_mode_II, control_state, ui_visible,
chosen_component, chosen_con_type, allowed_components, modules, selected_module, is_connecting_modules, selected_cardinality, selected_connectors,
- connector_selected, voxel_selected, is_moving_module, module_position, coordinate_space_selection, is_rotating_module, module_rotation_angles,
- is_rotating_component, component_rotation_angle, is_creating_pad, selected_pad_width, selected_pad_height,
+ selected_modules_connect, connector_selected, voxel_selected, is_moving_module, module_position, coordinate_space_selection,
+ is_rotating_module, module_rotation_angles, is_rotating_component, component_rotation_angle, is_creating_pad, selected_pad_width, selected_pad_height,
error_msg, error_start_second, primary_axis};
node_ptr hover_nearest_node = nullptr;
@@ -224,6 +227,7 @@ class Editor
std::pair<connector_ptr, connector_ptr> selected_connectors = {nullptr, nullptr};
std::pair<glm::vec3, node_ptr> first_connector_highlights = {glm::vec3(0.0f), nullptr};
std::pair<glm::vec3, node_ptr> second_connector_highlights = {glm::vec3(0.0f), nullptr};
+ std::pair<module_ptr, module_ptr> selected_modules_connect = { nullptr, nullptr };
std::vector<objectbase_ptr> selected_space_joints;
diff --git a/src/edit/src/editor.cpp b/src/edit/src/editor.cpp
index daf52ac921a480e110f669f4e6c4d5e2e4e56ff2..b9a2a58c3ec7aa25d2ee93ddad8bb8d3e75399f5 100644
--- a/src/edit/src/editor.cpp
+++ b/src/edit/src/editor.cpp
@@ -2142,7 +2142,8 @@ void Editor::doConnectModuleAction()
{
controlConnectModule();
hoverOver();
- selectObject();
+ // selectObject();
+ selectModule();
updateSelectedConnectors();
connectModule();
detectCollision(is_connecting_modules || is_disconnecting_modules, rofiworld);
@@ -2159,7 +2160,8 @@ void Editor::doManipulateModuleAction()
void Editor::doRotateComponentAction()
{
- selectObject();
+ // selectObject();
+ selectModule();
updateSelectedComponent();
updateRotationHint();
rotateComponent();
@@ -2244,6 +2246,7 @@ void Editor::controlConnectModule()
selected_connectors = {nullptr, nullptr};
first_connector_highlights = {glm::vec3(0.0f), nullptr};
second_connector_highlights = {glm::vec3(0.0f), nullptr};
+ selected_modules_connect = { nullptr, nullptr };
scene->manageSelection(nullptr);
scene->manageHighlight(glm::vec3(0.0f), nullptr);
scene->manageSecondarySelection({first_connector_highlights.second, second_connector_highlights.second});
@@ -2307,6 +2310,7 @@ void Editor::updateSelectedConnectors()
if (connector == selected_connectors.first)
{
selected_connectors = {nullptr, nullptr};
+ selected_modules_connect = { nullptr, nullptr };
first_connector_highlights = {glm::vec3(0.0f), nullptr};
second_connector_highlights = {glm::vec3(0.0f), nullptr};
scene->manageSelection(nullptr);
@@ -2317,11 +2321,13 @@ void Editor::updateSelectedConnectors()
&& rofiworld->getModuleWithNode(selected_connectors.first->getNode()) == rofiworld->getModuleWithNode(selection)))
{
selected_connectors.first = connector;
+ selected_modules_connect.first = selected_module;
first_connector_highlights = {scene->getHighlightDirection(), selection};
}
else if (connector == selected_connectors.second)
{
selected_connectors.second = nullptr;
+ selected_modules_connect.second = nullptr;
second_connector_highlights = {glm::vec3(0.0f), nullptr};
scene->manageSelection(nullptr);
scene->manageHighlight(glm::vec3(0.0f), nullptr);
@@ -2329,6 +2335,7 @@ void Editor::updateSelectedConnectors()
else if (!selected_connectors.second || (selected_connectors.first && selected_connectors.second))
{
selected_connectors.second = connector;
+ selected_modules_connect.second = selected_module;
second_connector_highlights = {scene->getHighlightDirection(), selection};
}
@@ -2531,6 +2538,7 @@ void Editor::connectModule()
}
selected_connectors = {nullptr, nullptr};
+ selected_modules_connect = {nullptr, nullptr};
first_connector_highlights = {glm::vec3(0.0f), nullptr};
second_connector_highlights = {glm::vec3(0.0f), nullptr};
scene->manageSelection(nullptr);
diff --git a/src/gui/src/ui.cpp b/src/gui/src/ui.cpp
index 07fca3d0d6a629eba51f4272ff54333676ef0507..dc95d4929b86910e2f00a94f70380c08249464f8 100644
--- a/src/gui/src/ui.cpp
+++ b/src/gui/src/ui.cpp
@@ -545,15 +545,20 @@ void module_connection_ui(const osi::Window &window, edit::UIData &data)
{
using namespace rofi;
if (data.editor_build_mode_II != edit::build_mode_II::connect_module
- || data.selected_connectors.first == nullptr
- || data.selected_connectors.second == nullptr)
- {
- data.is_connecting_modules = false;
+ || (data.selected_connectors.first == nullptr
+ && data.selected_connectors.second == nullptr))
return;
- }
- auto fst_connector = data.selected_connectors.first;
- auto snd_connector = data.selected_connectors.second;
+ bool both_connectors_selected = data.selected_connectors.first != nullptr
+ && data.selected_connectors.second != nullptr;
+ if (!both_connectors_selected)
+ data.is_connecting_modules = false;
+
+
+ const auto fst_connector = data.selected_connectors.first;
+ const auto snd_connector = data.selected_connectors.second;
+ const auto fst_module = data.selected_modules_connect.first;
+ const auto snd_module = data.selected_modules_connect.second;
float size_x = static_cast<float>(window.size().x);
float size_y = static_cast<float>(window.size().y);
@@ -564,6 +569,38 @@ void module_connection_ui(const osi::Window &window, edit::UIData &data)
| ImGuiWindowFlags_NoCollapse
| ImGuiWindowFlags_AlwaysAutoResize);
+ if (fst_connector)
+ {
+ ImGui::Text("Source Connector: ");
+ ImGui::SameLine();
+ std::string s_con = fst_module->getType() == "universal"
+ ? fst_module->getConnectorDock(fst_connector)
+ : std::to_string(fst_module->getComponentID(fst_connector));
+ ImGui::Text(s_con.c_str());
+ }
+ else
+ ImGui::NewLine();
+
+ if (snd_connector)
+ {
+ ImGui::Text("Target Connector: ");
+ ImGui::SameLine();
+ std::string t_con = snd_module->getType() == "universal"
+ ? snd_module->getConnectorDock(snd_connector)
+ : std::to_string(snd_module->getComponentID(snd_connector));
+ ImGui::Text(t_con.c_str());
+ }
+ else
+ ImGui::NewLine();
+
+ if (!both_connectors_selected)
+ {
+ for (int i = 0; i < 6; ++i)
+ ImGui::NewLine();
+ ImGui::End();
+ return;
+ }
+
using enum cardinal;
if (Connector::shares_module_link(fst_connector, snd_connector))
@@ -733,9 +770,11 @@ void component_rotation_ui(const osi::Window &window, edit::UIData &data)
float max_limit = 360.0f;
float current_rotation = 0.0f;
float prev_rotation = 0.0f;
+ std::string component_info;
if (data.connector_selected)
{
+ component_info = data.selected_module->getConnectorDock(data.connector) == "A-Z" ? "Shoe A" : "Shoe B";
auto rot_con = std::dynamic_pointer_cast<rofi::RotationConnector>(data.connector);
min_limit = rot_con->getNegRotationLimit();
max_limit = rot_con->getPosRotationLimit();
@@ -743,6 +782,7 @@ void component_rotation_ui(const osi::Window &window, edit::UIData &data)
}
else
{
+ component_info = data.voxel->getNode()->getPositionLocal() == glm::vec3(0.0f) ? "Body A" : "Body B";
auto voxel_y_axis = data.voxel->getNode()->getRotationAxisYLocal();
auto rotated_angle_rad = glm::orientedAngle(glm::vec3(0.0f, 1.0f, 0.0f), voxel_y_axis, glm::vec3(0.0f, 0.0f, 1.0f));
@@ -759,6 +799,8 @@ void component_rotation_ui(const osi::Window &window, edit::UIData &data)
| ImGuiWindowFlags_NoCollapse
| ImGuiWindowFlags_AlwaysAutoResize);
+ ImGui::Text(component_info.c_str());
+
ImGui::DragFloat("Step", &data.component_rotation_step, 0.25f, 0.0f, 90.0f, "%.3f", ImGuiSliderFlags_AlwaysClamp);
if (ImGui::ArrowButton("##ArrowLeftCompRot", 0))