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

FIX:upgrade scale_feature api 

Jira: STUDIO-6460
Change-Id: Icda3218da5bfe3206285681a8dac13e9d14dfc60
This commit is contained in:
zhou.xu 2024-03-11 15:08:26 +08:00 committed by Lane.Wei
parent af3bf453c1
commit af9ac3d216
4 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Measure.cpp
View File

@ -947,7 +947,7 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
result.distance_infinite = std::make_optional(DistAndPoints{ it->dist, it->from, it->to }); result.distance_infinite = std::make_optional(DistAndPoints{ it->dist, it->from, it->to });
} }
else { else {
std::vector<SurfaceFeature>* plane_features = f2.world_plane_features; auto plane_features = f2.world_plane_features;
std::vector<DistAndPoints> distances; std::vector<DistAndPoints> distances;
for (const SurfaceFeature& sf : *plane_features) { for (const SurfaceFeature& sf : *plane_features) {
if (sf.get_type() == SurfaceFeatureType::Edge) { if (sf.get_type() == SurfaceFeatureType::Edge) {
@ -1199,7 +1199,7 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature&
const bool coplanar = are_parallel(normal1, normal2) && Eigen::Hyperplane<double, 3>(normal1, center).absDistance(origin2) < EPSILON; const bool coplanar = are_parallel(normal1, normal2) && Eigen::Hyperplane<double, 3>(normal1, center).absDistance(origin2) < EPSILON;
if (!coplanar) { if (!coplanar) {
std::vector<SurfaceFeature>* plane_features = f2.world_plane_features; auto plane_features = f2.world_plane_features;
std::vector<DistAndPoints> distances; std::vector<DistAndPoints> distances;
for (const SurfaceFeature& sf : *plane_features) { for (const SurfaceFeature& sf : *plane_features) {
if (sf.get_type() == SurfaceFeatureType::Edge) { if (sf.get_type() == SurfaceFeatureType::Edge) {

11
src/libslic3r/Measure.hpp
View File

@ -35,6 +35,11 @@ public:
SurfaceFeature(const SurfaceFeature& sf){ SurfaceFeature(const SurfaceFeature& sf){
this->clone(sf); this->clone(sf);
mesh = sf.mesh;
plane_indices = sf.plane_indices;
world_tran = sf.world_tran;
world_plane_features = sf.world_plane_features;
origin_surface_feature = sf.origin_surface_feature;
} }
void clone(const SurfaceFeature &sf) void clone(const SurfaceFeature &sf)
@ -44,10 +49,6 @@ public:
m_pt2 = sf.get_pt2(); m_pt2 = sf.get_pt2();
m_pt3 = sf.get_pt3(); m_pt3 = sf.get_pt3();
m_value = sf.get_value(); m_value = sf.get_value();
mesh = sf.mesh;
plane_indices = sf.plane_indices;
world_tran = sf.world_tran;
world_plane_features = sf.world_plane_features;
} }
void translate(const Vec3d& displacement); void translate(const Vec3d& displacement);
void translate(const Transform3d& tran); void translate(const Transform3d& tran);
@ -94,7 +95,7 @@ public:
indexed_triangle_set* mesh{nullptr}; indexed_triangle_set* mesh{nullptr};
std::vector<int>* plane_indices{nullptr}; std::vector<int>* plane_indices{nullptr};
Transform3d world_tran; Transform3d world_tran;
std::vector<SurfaceFeature>* world_plane_features{nullptr}; std::shared_ptr<std::vector<SurfaceFeature>> world_plane_features{nullptr};
std::shared_ptr<SurfaceFeature> origin_surface_feature{nullptr}; std::shared_ptr<SurfaceFeature> origin_surface_feature{nullptr};
Vec3d get_pt1() const{ return m_pt1; } Vec3d get_pt1() const{ return m_pt1; }

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

@ -793,20 +793,7 @@ void GLGizmoMeasure::on_render()
break; break;
} }
case Measure::SurfaceFeatureType::Plane: { case Measure::SurfaceFeatureType::Plane: {
const auto &[idx, normal, pt] = m_curr_feature->get_plane(); update_world_plane_features(m_curr_measuring.get(), *m_curr_feature);
m_curr_feature->plane_indices = const_cast<std::vector<int>*>(&m_curr_measuring->get_plane_triangle_indices(idx));
auto cur_plane_features = const_cast<std::vector<Measure::SurfaceFeature> *>(&m_curr_measuring->get_plane_features(idx));
if (cur_plane_features) {
if (!m_curr_feature->world_plane_features) {
m_curr_feature->world_plane_features = new std::vector<Measure::SurfaceFeature>();
}
m_curr_feature->world_plane_features->clear(); // resize(cur_plane_features->size());
for (size_t i = 0; i < cur_plane_features->size(); i++) {
Measure::SurfaceFeature temp(cur_plane_features->at(i));
temp.translate(m_curr_feature->world_tran);
m_curr_feature->world_plane_features->push_back(std::move(temp));
}
}
m_curr_plane.plane_idx = -1; m_curr_plane.plane_idx = -1;
init_plane_glmodel(GripperType::PLANE, *m_curr_feature, m_curr_plane); init_plane_glmodel(GripperType::PLANE, *m_curr_feature, m_curr_plane);
break; break;
@ -1347,49 +1334,28 @@ void GLGizmoMeasure::render_dimensioning()
const double ratio = new_value / old_value; const double ratio = new_value / old_value;
wxGetApp().plater()->take_snapshot(_u8L("Scale")); wxGetApp().plater()->take_snapshot(_u8L("Scale"));
struct TrafoData auto scale_feature = [this](Measure::SurfaceFeature& feature) {
{ Measure::Measuring *cur_measuring = get_measuring_of_mesh(feature.mesh, feature.world_tran);
double ratio;
Vec3d old_pivot;
Vec3d new_pivot;
Transform3d scale_matrix;
TrafoData(double ratio, const Vec3d& old_pivot, const Vec3d& new_pivot) {
this->ratio = ratio;
this->scale_matrix = Geometry::scale_transform(ratio);
this->old_pivot = old_pivot;
this->new_pivot = new_pivot;
}
Vec3d transform(const Vec3d& point) const { return this->scale_matrix * (point - this->old_pivot) + this->new_pivot; }
};
auto scale_feature = [](Measure::SurfaceFeature& feature, const TrafoData& trafo_data) {
switch (feature.get_type()) switch (feature.get_type())
{ {
case Measure::SurfaceFeatureType::Point: case Measure::SurfaceFeatureType::Point:
{
feature = Measure::SurfaceFeature(trafo_data.transform(feature.get_point()));
break;
}
case Measure::SurfaceFeatureType::Edge: case Measure::SurfaceFeatureType::Edge:
{
const auto [from, to] = feature.get_edge();
const std::optional<Vec3d> extra = feature.get_extra_point();
const std::optional<Vec3d> new_extra = extra.has_value() ? trafo_data.transform(*extra) : extra;
feature = Measure::SurfaceFeature(Measure::SurfaceFeatureType::Edge, trafo_data.transform(from), trafo_data.transform(to), new_extra);
break;
}
case Measure::SurfaceFeatureType::Circle: case Measure::SurfaceFeatureType::Circle:
{
const auto [center, radius, normal] = feature.get_circle();
feature = Measure::SurfaceFeature(Measure::SurfaceFeatureType::Circle, trafo_data.transform(center), normal, std::nullopt, trafo_data.ratio * radius);
break;
}
case Measure::SurfaceFeatureType::Plane: case Measure::SurfaceFeatureType::Plane:
{ {
const auto [idx, normal, origin] = feature.get_plane(); feature.clone(*feature.origin_surface_feature);
feature = Measure::SurfaceFeature(Measure::SurfaceFeatureType::Plane, normal, trafo_data.transform(origin), std::nullopt, idx); feature.translate(feature.world_tran);
if (feature.get_type() == Measure::SurfaceFeatureType::Circle) {
m_feature_circle_first.last_circle_feature = nullptr;
m_feature_circle_first.inv_zoom = 0;
m_feature_circle_second.last_circle_feature = nullptr;
m_feature_circle_second.inv_zoom = 0;
}
if (feature.get_type() == Measure::SurfaceFeatureType::Plane) {
if (cur_measuring) {
update_world_plane_features(cur_measuring, feature);
}
}
break; break;
} }
default: { break; } default: { break; }
@ -1405,21 +1371,21 @@ void GLGizmoMeasure::render_dimensioning()
// scale selection // scale selection
Selection& selection = m_parent.get_selection(); Selection& selection = m_parent.get_selection();
selection.setup_cache(); selection.setup_cache();
Vec3d old_center, new_center; Vec3d old_center, new_center;
if (scale_single_volume && m_hit_different_volumes.size()==1) { if (scale_single_volume && m_hit_different_volumes.size()==1) {
//todo //todo//update_single_mesh_world_tran
} else { } else {
old_center = selection.get_bounding_box().center(); old_center = selection.get_bounding_box().center();
selection.scale(ratio * Vec3d::Ones(), type); selection.scale(ratio * Vec3d::Ones(), type);
wxGetApp().plater()->canvas3D()->do_scale(""); // avoid storing another snapshot wxGetApp().plater()->canvas3D()->do_scale(""); // avoid storing another snapshot
new_center = selection.get_bounding_box().center(); new_center = selection.get_bounding_box().center();
register_single_mesh_pick();
} }
wxGetApp().obj_manipul()->set_dirty(); wxGetApp().obj_manipul()->set_dirty();
// scale dimensioning // scale dimensioning
const TrafoData trafo_data(ratio, old_center, new_center); scale_feature(*m_selected_features.first.feature);
scale_feature(*m_selected_features.first.feature, trafo_data);
if (m_selected_features.second.feature.has_value()) if (m_selected_features.second.feature.has_value())
scale_feature(*m_selected_features.second.feature, trafo_data); scale_feature(*m_selected_features.second.feature);
// update measure on next call to data_changed() // update measure on next call to data_changed()
m_pending_scale = true; m_pending_scale = true;
@ -2341,5 +2307,38 @@ bool Slic3r::GUI::GLGizmoMeasure::is_two_volume_in_same_model_object()
return false; return false;
} }
Measure::Measuring *GLGizmoMeasure::get_measuring_of_mesh(indexed_triangle_set *mesh, Transform3d &tran)
{
for (auto glvolume:m_hit_order_volumes) {
auto ori_mesh = const_cast<TriangleMesh*>(glvolume->ori_mesh);
auto ori_triangle_set = const_cast<indexed_triangle_set*>(&ori_mesh->its);
if (ori_triangle_set == mesh) {
tran = m_mesh_raycaster_map[glvolume]->world_tran.get_matrix();
return m_mesh_measure_map[glvolume].get();
}
}
return nullptr;
}
void GLGizmoMeasure::update_world_plane_features(Measure::Measuring *cur_measuring, Measure::SurfaceFeature& feautre)
{
if (cur_measuring) {
const auto &[idx, normal, pt] = feautre.get_plane();
feautre.plane_indices = const_cast<std::vector<int> *>(&cur_measuring->get_plane_triangle_indices(idx));
auto cur_plane_features = const_cast<std::vector<Measure::SurfaceFeature> *>(&cur_measuring->get_plane_features(idx));
if (cur_plane_features) {
if (!feautre.world_plane_features) {
feautre.world_plane_features = std::make_shared<std::vector<Measure::SurfaceFeature>>();
}
feautre.world_plane_features->clear(); // resize(cur_plane_features->size());
for (size_t i = 0; i < cur_plane_features->size(); i++) {
Measure::SurfaceFeature temp(cur_plane_features->at(i));
temp.translate(feautre.world_tran);
feautre.world_plane_features->push_back(std::move(temp));
}
}
}
}
} // namespace GUI } // namespace GUI
} // namespace Slic3r } // namespace Slic3r

2
src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
View File

@ -197,6 +197,8 @@ protected:
void reset_feature1(); void reset_feature1();
void reset_feature2(); void reset_feature2();
bool is_two_volume_in_same_model_object(); bool is_two_volume_in_same_model_object();
Measure::Measuring* get_measuring_of_mesh(indexed_triangle_set *mesh, Transform3d &tran);
void update_world_plane_features(Measure::Measuring *cur_measuring, Measure::SurfaceFeature &feautre);
private: private:
// This map holds all translated description texts, so they can be easily referenced during layout calculations // This map holds all translated description texts, so they can be easily referenced during layout calculations
// etc. When language changes, GUI is recreated and this class constructed again, so the change takes effect. // etc. When language changes, GUI is recreated and this class constructed again, so the change takes effect.