3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-25 17:51:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

3DScene bed variables moved to c++

Browse source
This commit is contained in:
Enrico Turri 2018-05-15 15:38:25 +02:00
parent 43784f3409
commit 2b4829a4b9
12 changed files with 425 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

34
xs/src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -12,9 +12,22 @@ class wxIdleEvent;
namespace Slic3r {
class GLVolumeCollection;
class ExPolygon;
namespace GUI {
class GeometryBuffer
{
std::vector<float> m_data;
public:
bool set_from_triangles(const Polygons& triangles, float z);
bool set_from_lines(const Lines& lines, float z);
const float* get_data() const;
unsigned int get_data_size() const;
};
class GLCanvas3D
{
public:
@ -65,6 +78,9 @@ public:
Pointfs m_shape;
BoundingBoxf3 m_bounding_box;
Pointf m_origin;
Polygon m_polygon;
GeometryBuffer m_triangles;
GeometryBuffer m_gridlines;
public:
const Pointfs& get_shape() const;
@ -75,8 +91,12 @@ public:
const Pointf& get_origin() const;
void set_origin(const Pointf& origin);
void render();
private:
void _calc_bounding_box();
void _calc_triangles(const ExPolygon& poly);
void _calc_gridlines(const ExPolygon& poly, const BoundingBox& bed_bbox);
};
private:
@ -98,6 +118,9 @@ public:
void set_current();
bool is_dirty() const;
void set_dirty(bool dirty);
bool is_shown_on_screen() const;
void resize(unsigned int w, unsigned int h);
@ -105,14 +128,17 @@ public:
GLVolumeCollection* get_volumes();
void set_volumes(GLVolumeCollection* volumes);
// Set the bed shape to a single closed 2D polygon(array of two element arrays),
// triangulate the bed and store the triangles into m_bed.m_triangles,
// fills the m_bed.m_grid_lines and sets m_bed.m_origin.
// Sets m_bed.m_polygon to limit the object placement.
void set_bed_shape(const Pointfs& shape);
// Used by ObjectCutDialog and ObjectPartsPanel to generate a rectangular ground plane to support the scene objects.
void set_auto_bed_shape();
const Pointf& get_bed_origin() const;
void set_bed_origin(const Pointf& origin);
bool is_dirty() const;
void set_dirty(bool dirty);
Camera::EType get_camera_type() const;
void set_camera_type(Camera::EType type);
std::string get_camera_type_as_string() const;
@ -140,6 +166,8 @@ public:
void zoom_to_volumes();
void select_view(const std::string& direction);
void render();
void register_on_viewport_changed_callback(void* callback);
void on_size(wxSizeEvent& evt);