mirror of
https://github.com/QIDITECH/QIDIStudio.git
synced 2026-02-02 09:58:41 +03:00
update slic3r
This commit is contained in:
@@ -165,7 +165,7 @@ namespace GUI {
|
||||
|
||||
BoundingBoxf3 m_bounding_box;
|
||||
std::string m_filename;
|
||||
|
||||
bool m_visible = true;
|
||||
public:
|
||||
GLModel() = default;
|
||||
virtual ~GLModel();
|
||||
@@ -179,8 +179,8 @@ namespace GUI {
|
||||
void init_from(const InitializationData& data);
|
||||
void init_from(const indexed_triangle_set& its, const BoundingBoxf3& bbox);
|
||||
void init_from(const indexed_triangle_set& its);
|
||||
void init_from(const Polygons& polygons, float z);
|
||||
bool init_from_file(const std::string& filename);
|
||||
void init_model_from_polygon(const Polygons &polygons, float z);
|
||||
bool init_model_from_poly(const std::vector<Vec2f> &triangles, float z, bool generate_mesh = false);
|
||||
bool init_model_from_lines(const Lines &lines, float z, bool generate_mesh = false);
|
||||
bool init_model_from_lines(const Lines3 &lines, bool generate_mesh = false);
|
||||
@@ -190,11 +190,10 @@ namespace GUI {
|
||||
void set_color(const ColorRGBA &color);
|
||||
|
||||
void reset();
|
||||
void render() const;
|
||||
void render_geometry();
|
||||
void render_geometry(int i,const std::pair<size_t, size_t> &range);
|
||||
void render_geometry() const;
|
||||
void render_geometry(int i,const std::pair<size_t, size_t> &range) const;
|
||||
static void create_or_update_mats_vbo(unsigned int &vbo, const std::vector<Slic3r::Geometry::Transformation> &mats);
|
||||
void bind_mats_vbo(unsigned int instance_mats_vbo, unsigned int instances_count, int location);
|
||||
void bind_mats_vbo(unsigned int instance_mats_vbo, unsigned int instances_count, const std::vector<int>& locations);
|
||||
void render_geometry_instance(unsigned int instance_mats_vbo, unsigned int instances_count);
|
||||
void render_geometry_instance(unsigned int instance_mats_vbo, unsigned int instances_count, const std::pair<size_t, size_t> &range);
|
||||
void render_instanced(unsigned int instances_vbo, unsigned int instances_count) const;
|
||||
@@ -204,6 +203,8 @@ namespace GUI {
|
||||
const BoundingBoxf3& get_bounding_box() const { return m_bounding_box; }
|
||||
const std::string& get_filename() const { return m_filename; }
|
||||
|
||||
void set_visible(bool flag);
|
||||
bool get_visible() const { return m_visible; }
|
||||
private:
|
||||
bool send_to_gpu(Geometry& geometry);
|
||||
bool send_to_gpu(RenderData &data, const std::vector<float> &vertices, const std::vector<unsigned int> &indices) const;
|
||||
|
||||
Reference in New Issue
Block a user