mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:fix "Shift+pick point" bug 

Jira: STUDIO-6433
Change-Id: Ib333e9c4d27e65968cfc5fc0136c18b1e18254bf
This commit is contained in:
zhou.xu 2024-03-07 19:17:58 +08:00 committed by Lane.Wei
parent 6dad59102b
commit 4230ca8372
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/Measure.cpp
View File

@ -1220,6 +1220,9 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
result.distance_infinite = std::make_optional(DistAndPoints{ it->dist, it->from, it->to });
}
}
else {
result.distance_strict = std::make_optional(DistAndPoints{0, center, origin2});
}
}
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////

6
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -649,9 +649,7 @@ void GLGizmoMeasure::on_render()
Vec3f hit = Vec3f::Zero();
double closest_hit_squared_distance = std::numeric_limits<double>::max();
for (auto item : m_gripper_id_raycast_map) {
if (!item.second->is_active()) {
continue;
}
auto world_tran = item.second->world_tran;
Vec3f normal_on_gripper;
if (item.second->mesh_raycaster->closest_hit(mouse_position, item.second->world_tran.get_matrix(), camera, hit, normal_on_gripper)) {
@ -2234,8 +2232,6 @@ void GLGizmoMeasure::reset_gripper_pick(GripperType id, bool is_all)
reset_gripper_pick(GripperType::CIRCLE);
reset_gripper_pick(GripperType::CIRCLE_1);
reset_gripper_pick(GripperType::CIRCLE_2);
reset_gripper_pick(GripperType::SPHERE_1);
reset_gripper_pick(GripperType::SPHERE_1);
}
}