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

Measuring: added getters for circle visualization

Browse Source
This commit is contained in:
Lukas Matena 2022-07-27 11:45:42 +02:00 committed by enricoturri1966
parent 7d6d33f92c
commit 457afca5de
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libslic3r/Measure.cpp
View File

@ -262,7 +262,7 @@ void MeasuringImpl::extract_features()
for (const auto& [start_idx, end_idx] : circles) { for (const auto& [start_idx, end_idx] : circles) {
std::pair<Vec3d, double> center_and_radius = get_center_and_radius(border, start_idx, end_idx, trafo); std::pair<Vec3d, double> center_and_radius = get_center_and_radius(border, start_idx, end_idx, trafo);
plane.surface_features.emplace_back(std::unique_ptr<SurfaceFeature>( plane.surface_features.emplace_back(std::unique_ptr<SurfaceFeature>(
new Circle(center_and_radius.first, center_and_radius.second))); new Circle(center_and_radius.first, center_and_radius.second, plane.normal)));
} }
} }
@ -382,6 +382,15 @@ double Measuring::get_distance(const SurfaceFeature* feature, const Vec3d* pt)
Eigen::ParametrizedLine<double, 3> line(s, (e-s).normalized()); Eigen::ParametrizedLine<double, 3> line(s, (e-s).normalized());
return line.distance(*pt); return line.distance(*pt);
} }
else if (feature->get_type() == SurfaceFeatureType::Circle) {
const Circle* circle = static_cast<const Circle*>(feature);
// Find a plane containing normal, center and the point.
const Vec3d& c = circle->get_center();
const Vec3d& n = circle->get_normal();
Eigen::Hyperplane<double, 3> circle_plane(n, c);
Vec3d proj = circle_plane.projection(*pt);
return std::sqrt( std::pow((proj - c).norm() - circle->get_radius(), 2.) + (*pt - proj).squaredNorm());
}
return std::numeric_limits<double>::max(); return std::numeric_limits<double>::max();
} }

8
src/libslic3r/Measure.hpp
View File

@ -28,22 +28,28 @@ public:
class Edge : public SurfaceFeature { class Edge : public SurfaceFeature {
public: public:
Edge(const Vec3d& start, const Vec3d& end) : m_start{start}, m_end{end} {} Edge(const Vec3d& start, const Vec3d& end) : m_start{start}, m_end{end} {}
Edge(const Vec3d& start, const Vec3d& end, const Vec3d& pin) : m_start{start}, m_end{end},
m_pin{std::unique_ptr<Vec3d>(new Vec3d(pin))} {}
SurfaceFeatureType get_type() const override { return SurfaceFeatureType::Edge; } SurfaceFeatureType get_type() const override { return SurfaceFeatureType::Edge; }
std::pair<Vec3d, Vec3d> get_edge() const { return std::make_pair(m_start, m_end); } std::pair<Vec3d, Vec3d> get_edge() const { return std::make_pair(m_start, m_end); }
private: private:
Vec3d m_start; Vec3d m_start;
Vec3d m_end; Vec3d m_end;
std::unique_ptr<Vec3d> m_pin;
}; };
class Circle : public SurfaceFeature { class Circle : public SurfaceFeature {
public: public:
Circle(const Vec3d& center, double radius) : m_center{center}, m_radius{radius} {} Circle(const Vec3d& center, double radius, const Vec3d& normal)
: m_center{center}, m_radius{radius}, m_normal{normal} {}
SurfaceFeatureType get_type() const override { return SurfaceFeatureType::Circle; } SurfaceFeatureType get_type() const override { return SurfaceFeatureType::Circle; }
Vec3d get_center() const { return m_center; } Vec3d get_center() const { return m_center; }
double get_radius() const { return m_radius; } double get_radius() const { return m_radius; }
Vec3d get_normal() const { return m_normal; }
private: private:
Vec3d m_center; Vec3d m_center;
double m_radius; double m_radius;
Vec3d m_normal;
}; };
class Plane : public SurfaceFeature { class Plane : public SurfaceFeature {

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

@ -174,12 +174,28 @@ void GLGizmoMeasure::on_render()
if (feature->get_type() == Measure::SurfaceFeatureType::Circle) { if (feature->get_type() == Measure::SurfaceFeatureType::Circle) {
const auto* circle = static_cast<const Measure::Circle*>(feature); const auto* circle = static_cast<const Measure::Circle*>(feature);
Transform3d view_feature_matrix = view_model_matrix * Transform3d(Eigen::Translation3d(circle->get_center())); const Vec3d& c = circle->get_center();
view_feature_matrix = view_model_matrix * Transform3d(Eigen::Translation3d(circle->get_center())); const Vec3d& n = circle->get_normal();
Transform3d view_feature_matrix = view_model_matrix * Transform3d(Eigen::Translation3d(c));
view_feature_matrix.scale(0.5); view_feature_matrix.scale(0.5);
shader->set_uniform("view_model_matrix", view_feature_matrix); shader->set_uniform("view_model_matrix", view_feature_matrix);
m_vbo_sphere.set_color(ColorRGBA(0.f, 1.f, 0.f, 1.f)); m_vbo_sphere.set_color(ColorRGBA(0.8f, 0.2f, 0.2f, 1.f));
m_vbo_sphere.render(); m_vbo_sphere.render();
// Now draw the circle itself - let's take a funny shortcut:
Vec3d rad = n.cross(Vec3d::UnitX());
if (rad.squaredNorm() < 0.1)
rad = n.cross(Vec3d::UnitY());
rad *= circle->get_radius() * rad.norm();
const int N = 20;
for (int i=0; i<N; ++i) {
rad = Eigen::AngleAxisd(6.28/N, n) * rad;
view_feature_matrix = view_model_matrix * Transform3d(Eigen::Translation3d(c));
view_feature_matrix = view_feature_matrix * Transform3d(Eigen::Translation3d(rad));
view_feature_matrix.scale(N/100.);
shader->set_uniform("view_model_matrix", view_feature_matrix);
m_vbo_sphere.render();
}
} }
else if (feature->get_type() == Measure::SurfaceFeatureType::Edge) { else if (feature->get_type() == Measure::SurfaceFeatureType::Edge) {
const auto* edge = static_cast<const Measure::Edge*>(feature); const auto* edge = static_cast<const Measure::Edge*>(feature);