Remove unnecessary stuff
This commit is contained in:
parent
e16c886a1a
commit
c79a46e6cb
@ -357,8 +357,6 @@ set(SLIC3R_SOURCES
|
|||||||
BranchingTree/BranchingTree.hpp
|
BranchingTree/BranchingTree.hpp
|
||||||
BranchingTree/PointCloud.cpp
|
BranchingTree/PointCloud.cpp
|
||||||
BranchingTree/PointCloud.hpp
|
BranchingTree/PointCloud.hpp
|
||||||
OrganicTree/OrganicTree.hpp
|
|
||||||
OrganicTree/OrganicTreeImpl.hpp
|
|
||||||
|
|
||||||
Arachne/BeadingStrategy/BeadingStrategy.hpp
|
Arachne/BeadingStrategy/BeadingStrategy.hpp
|
||||||
Arachne/BeadingStrategy/BeadingStrategy.cpp
|
Arachne/BeadingStrategy/BeadingStrategy.cpp
|
||||||
|
@ -1,95 +0,0 @@
|
|||||||
#ifndef ORGANICTREE_HPP
|
|
||||||
#define ORGANICTREE_HPP
|
|
||||||
|
|
||||||
#include <type_traits>
|
|
||||||
#include <utility>
|
|
||||||
#include <optional>
|
|
||||||
|
|
||||||
namespace Slic3r { namespace organictree {
|
|
||||||
|
|
||||||
enum class NodeType { Bed, Mesh, Junction };
|
|
||||||
|
|
||||||
template <class T> struct DomainTraits_ {
|
|
||||||
using Node = typename T::Node;
|
|
||||||
|
|
||||||
static void push(const T &dom, const Node &n)
|
|
||||||
{
|
|
||||||
dom.push_junction(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Node pop(T &dom) { return dom.pop(); }
|
|
||||||
|
|
||||||
static bool empty(const T &dom) { return dom.empty(); }
|
|
||||||
|
|
||||||
static std::optional<std::pair<Node, NodeType>>
|
|
||||||
closest(const T &dom, const Node &n)
|
|
||||||
{
|
|
||||||
return dom.closest(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Node merge_node(const T &dom, const Node &a, const Node &b)
|
|
||||||
{
|
|
||||||
return dom.merge_node(a, b);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void bridge(T &dom, const Node &from, const Node &to)
|
|
||||||
{
|
|
||||||
dom.bridge(from, to);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void anchor(T &dom, const Node &from, const Node &to)
|
|
||||||
{
|
|
||||||
dom.anchor(from, to);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void pillar(T &dom, const Node &from, const Node &to)
|
|
||||||
{
|
|
||||||
dom.pillar(from, to);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void merge (T &dom, const Node &n1, const Node &n2, const Node &mrg)
|
|
||||||
{
|
|
||||||
dom.merge(n1, n2, mrg);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void report_fail(T &dom, const Node &n) { dom.report_fail(n); }
|
|
||||||
};
|
|
||||||
|
|
||||||
template<class Domain>
|
|
||||||
void build_tree(Domain &&D)
|
|
||||||
{
|
|
||||||
using Dom = DomainTraits_<std::remove_cv_t<std::remove_reference_t<Domain>>>;
|
|
||||||
using Node = typename Dom::Node;
|
|
||||||
|
|
||||||
while (! Dom::empty(D)) {
|
|
||||||
Node n = Dom::pop(D);
|
|
||||||
|
|
||||||
std::optional<std::pair<Node, NodeType>> C = Dom::closest(D, n);
|
|
||||||
|
|
||||||
if (!C) {
|
|
||||||
Dom::report_fail(D, n);
|
|
||||||
} else switch (C->second) {
|
|
||||||
case NodeType::Bed:
|
|
||||||
Dom::pillar(D, n, C->first);
|
|
||||||
break;
|
|
||||||
case NodeType::Mesh:
|
|
||||||
Dom::anchor(D, n, C->first);
|
|
||||||
break;
|
|
||||||
case NodeType::Junction: {
|
|
||||||
Node M = Dom::merge_node(D, n, C->first);
|
|
||||||
|
|
||||||
if (M == C->first) {
|
|
||||||
Dom::bridge(D, n, C->first);
|
|
||||||
} else {
|
|
||||||
Dom::push(D, M);
|
|
||||||
Dom::merge(D, n, M, C->first);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}} // namespace Slic3r::organictree
|
|
||||||
|
|
||||||
#endif // ORGANICTREE_HPP
|
|
@ -1,11 +0,0 @@
|
|||||||
#ifndef ORGANICTREEIMPL_HPP
|
|
||||||
#define ORGANICTREEIMPL_HPP
|
|
||||||
|
|
||||||
namespace Slic3r { namespace organictree {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}}
|
|
||||||
|
|
||||||
#endif // ORGANICTREEIMPL_HPP
|
|
@ -12,8 +12,6 @@
|
|||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
|
|
||||||
#include <boost/log/trivial.hpp>
|
|
||||||
|
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/GUI.hpp"
|
#include "slic3r/GUI/GUI.hpp"
|
||||||
#include "slic3r/GUI/GUI_ObjectSettings.hpp"
|
#include "slic3r/GUI/GUI_ObjectSettings.hpp"
|
||||||
@ -1021,8 +1019,6 @@ void GLGizmoSlaSupports::select_point(int i)
|
|||||||
m_new_point_head_diameter = m_editing_cache[0].support_point.head_front_radius * 2.f;
|
m_new_point_head_diameter = m_editing_cache[0].support_point.head_front_radius * 2.f;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!m_editing_cache[i].selected)
|
|
||||||
BOOST_LOG_TRIVIAL(debug) << "Support point selected [" << i << "]: " << m_editing_cache[i].support_point.pos.transpose() << " \tnormal: " << m_editing_cache[i].normal.transpose();
|
|
||||||
m_editing_cache[i].selected = true;
|
m_editing_cache[i].selected = true;
|
||||||
m_selection_empty = false;
|
m_selection_empty = false;
|
||||||
m_new_point_head_diameter = m_editing_cache[i].support_point.head_front_radius * 2.f;
|
m_new_point_head_diameter = m_editing_cache[i].support_point.head_front_radius * 2.f;
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user