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

Cherry-picking 118f4859c472ccbc30b43101c6674dadc81d7b12

Browse source 
And resolve conflicts
This commit is contained in:
tamasmeszaros 2022-11-04 12:42:02 +01:00
parent ce5d242f76
commit f100a59688
19 changed files with 674 additions and 735 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/slic3r/GUI/3DScene.hpp
View file

@ -658,16 +658,6 @@ public:
int volume_idx,
int instance_idx);
// Load SLA auxiliary GLVolumes (for support trees or pad).
// void load_object_auxiliary(
// const SLAPrintObject* print_object,
// int obj_idx,
// // pairs of <instance_idx, print_instance_idx>
// const std::vector<std::pair<size_t, size_t>>& instances,
// SLAPrintObjectStep milestone,
// // Timestamp of the last change of the milestone
// size_t timestamp);
#if ENABLE_OPENGL_ES
int load_wipe_tower_preview(
float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool size_unknown, float brim_width, TriangleMesh* out_mesh = nullptr);
@ -689,17 +679,6 @@ public:
int instance_idx,
bool opengl_initialized);
// Load SLA auxiliary GLVolumes (for support trees or pad).
void load_object_auxiliary(
const SLAPrintObject *print_object,
int obj_idx,
// pairs of <instance_idx, print_instance_idx>
const std::vector<std::pair<size_t, size_t>>& instances,
SLAPrintObjectStep milestone,
// Timestamp of the last change of the milestone
size_t timestamp,
bool opengl_initialized);
int load_wipe_tower_preview(
float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool size_unknown, float brim_width, bool opengl_initialized);
#endif // ENABLE_LEGACY_OPENGL_REMOVAL