3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 07:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add convexity to csgsettings. Defer all rendering to Display.

Browse source
This commit is contained in:
tamasmeszaros 2019-12-16 14:04:26 +01:00
parent b1186e339d
commit 878f8a8ead
3 changed files with 169 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

51
sandboxes/opencsg/GLScene.hpp
View file

@ -45,8 +45,7 @@ public:
class Listener {
public:
virtual ~Listener() = default;
virtual ~Listener();
virtual void on_left_click_down() {}
virtual void on_left_click_up() {}
@ -219,9 +218,16 @@ public:
};
class CSGSettings {
public:
static const constexpr unsigned DEFAULT_CONVEXITY = 10;
private:
OpenCSG::Algorithm m_csgalg = OpenCSG::Algorithm::Automatic;
OpenCSG::DepthComplexityAlgorithm m_depth_algo = OpenCSG::DepthComplexityAlgorithm::NoDepthComplexitySampling;
OpenCSG::Optimization m_optim = OpenCSG::Optimization::OptimizationDefault;
bool m_enable = true;
unsigned int m_convexity = DEFAULT_CONVEXITY;
public:
int get_algo() const { return int(m_csgalg); }
void set_algo(OpenCSG::Algorithm alg) { m_csgalg = alg; }
@ -231,6 +237,12 @@ public:
int get_optimization() const { return int(m_optim); }
void set_optimization(OpenCSG::Optimization o) { m_optim = o; }
void enable_csg(bool en = true) { m_enable = en; }
bool is_enabled() const { return m_enable; }
unsigned get_convexity() const { return m_convexity; }
void set_convexity(unsigned c) { m_convexity = c; }
};
class Display : public std::enable_shared_from_this<Display>,
@ -247,6 +259,19 @@ protected:
shptr<Camera> m_camera;
struct SceneCache {
Collection<shptr<Primitive>> primitives;
Collection<Primitive *> primitives_free;
Collection<OpenCSG::Primitive *> primitives_csg;
void clear();
shptr<Primitive> add_mesh(const TriangleMesh &mesh);
shptr<Primitive> add_mesh(const TriangleMesh &mesh,
OpenCSG::Operation op,
unsigned covexity);
} m_scene_cache;
public:
Display(shptr<Scene> scene = nullptr, shptr<Camera> camera = nullptr)
: m_scene(scene)
@ -284,26 +309,12 @@ public:
class Scene: public MouseInput::Listener
{
Collection<shptr<Primitive>> m_primitives;
Collection<Primitive *> m_primitives_free;
Collection<OpenCSG::Primitive *> m_primitives_csg;
uqptr<SLAPrint> m_print;
public:
Scene();
~Scene();
const Collection<Primitive*>& free_primitives() const
{
return m_primitives_free;
}
const Collection<OpenCSG::Primitive*>& csg_primitives() const
{
return m_primitives_csg;
}
void add_display(shptr<Display> disp)
{
m_displays.emplace_back(disp);
@ -311,16 +322,10 @@ public:
}
void set_print(uqptr<SLAPrint> &&print);
const SLAPrint * get_print() const { return m_print.get(); }
BoundingBoxf3 get_bounding_box() const;
protected:
shptr<Primitive> add_mesh(const TriangleMesh &mesh);
shptr<Primitive> add_mesh(const TriangleMesh &mesh,
OpenCSG::Operation op,
unsigned covexity);
private:
Collection<wkptr<Display>> m_displays;