3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix transformation to closest point

Browse source
This commit is contained in:
Filip Sykala - NTB T15p 2022-12-19 13:27:11 +01:00
parent cc9aba8474
commit 994da70ed3
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View file

@ -2868,6 +2868,14 @@ void GLGizmoEmboss::do_rotate(float relative_z_angle)
m_parent.do_rotate(snapshot_name); m_parent.do_rotate(snapshot_name);
} }
namespace priv { namespace priv {
/// <summary>
/// Transform origin of Text volume onto surface of model.
/// </summary>
/// <param name="volume">Text</param>
/// <param name="raycast_manager">AABB trees of object</param>
/// <param name="selection">Transformation of actual instance</param>
/// <returns>True when transform otherwise false</returns>
bool transform_on_surface(ModelVolume &volume, RaycastManager &raycast_manager, const Selection &selection) bool transform_on_surface(ModelVolume &volume, RaycastManager &raycast_manager, const Selection &selection)
{ {
// Move object on surface // Move object on surface

12
src/slic3r/Utils/RaycastManager.cpp
View file

@ -134,7 +134,7 @@ std::optional<RaycastManager::Hit> RaycastManager::unproject(const Vec3d &point,
if (raycaster_it == m_raycasters.end()) continue; if (raycaster_it == m_raycasters.end()) continue;
const MeshRaycaster &raycaster = *(raycaster_it->second); const MeshRaycaster &raycaster = *(raycaster_it->second);
const AABBMesh& mesh = raycaster.get_aabb_mesh(); const AABBMesh& mesh = raycaster.get_aabb_mesh();
const Transform3d & tr_inv = transformation.inverse(); Transform3d tr_inv = transformation.inverse();
Vec3d mesh_point = tr_inv * point; Vec3d mesh_point = tr_inv * point;
Vec3d mesh_direction = tr_inv.linear() * direction; Vec3d mesh_direction = tr_inv.linear() * direction;
std::vector<AABBMesh::hit_result> hits = mesh.query_ray_hits(mesh_point, mesh_direction); std::vector<AABBMesh::hit_result> hits = mesh.query_ray_hits(mesh_point, mesh_direction);
@ -151,22 +151,24 @@ std::optional<RaycastManager::Hit> RaycastManager::unproject(const Vec3d &point,
} }
std::optional<RaycastManager::Hit> RaycastManager::closest(const Vec3d &point, const ISkip *skip) const { std::optional<RaycastManager::Hit> RaycastManager::closest(const Vec3d &point, const ISkip *skip) const {
Vec3f point_f = point.cast<float>();
std::optional<priv::HitWithDistance> closest; std::optional<priv::HitWithDistance> closest;
for (const auto &item : m_transformations) { for (const auto &item : m_transformations) {
const TrKey &key = item.first; const TrKey &key = item.first;
size_t volume_id = key.second; size_t volume_id = key.second;
if (skip != nullptr && skip->skip(volume_id)) if (skip != nullptr && skip->skip(volume_id))
continue; continue;
const Transform3d &transformation = item.second;
auto raycaster_it = std::find_if(m_raycasters.begin(), m_raycasters.end(), auto raycaster_it = std::find_if(m_raycasters.begin(), m_raycasters.end(),
[volume_id](const RaycastManager::Raycaster &it) -> bool { return volume_id == it.first; }); [volume_id](const RaycastManager::Raycaster &it) -> bool { return volume_id == it.first; });
if (raycaster_it == m_raycasters.end()) if (raycaster_it == m_raycasters.end())
continue; continue;
const MeshRaycaster &raycaster = *(raycaster_it->second); const MeshRaycaster &raycaster = *(raycaster_it->second);
const Transform3d &transformation = item.second;
Transform3d tr_inv = transformation.inverse();
Vec3d mesh_point_d = tr_inv * point;
Vec3f mesh_point_f = mesh_point_d.cast<float>();
Vec3f n; Vec3f n;
Vec3f p = raycaster.get_closest_point(point_f, &n); Vec3f p = raycaster.get_closest_point(mesh_point_f, &n);
double squared_distance = (point_f - p).squaredNorm(); double squared_distance = (mesh_point_f - p).squaredNorm();
if (closest.has_value() && closest->squared_distance < squared_distance) if (closest.has_value() && closest->squared_distance < squared_distance)
continue; continue;
SurfacePoint surface_point(p,n); SurfacePoint surface_point(p,n);