diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2019-04-08 11:50:10 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2019-04-08 11:50:10 +0300 |
| commit | eadf7daa378ff3730c517427192ff977ad3820b2 (patch) | |
| tree | 9e7c84449b4cef1f99f91d4d56058e024804700d /src/slic3r/GUI/3DScene.hpp | |
| parent | 09cf1b9b0070644bf48eb6ef06bfa1f3f59b3995 (diff) | |
| parent | ecbf4b51ebf4f655f99f875ca3e6aa781cd4f576 (diff) | |
Merge branch 'master' into lm_sla_gizmo_clipping_plane
Diffstat (limited to 'src/slic3r/GUI/3DScene.hpp')
| -rw-r--r-- | src/slic3r/GUI/3DScene.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index 0ed8d2e6b..1bb414974 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -19,9 +19,11 @@ extern void glAssertRecentCallImpl(const char *file_name, unsigned int line, const char *function_name); inline void glAssertRecentCall() { glAssertRecentCallImpl(__FILE__, __LINE__, __FUNCTION__); } #define glsafe(cmd) do { cmd; glAssertRecentCallImpl(__FILE__, __LINE__, __FUNCTION__); } while (false) +#define glcheck() do { glAssertRecentCallImpl(__FILE__, __LINE__, __FUNCTION__); } while (false) #else inline void glAssertRecentCall() { } #define glsafe(cmd) cmd +#define glcheck() #endif namespace Slic3r { @@ -466,8 +468,8 @@ public: int obj_idx, float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool use_VBOs, bool size_unknown, float brim_width); // Render the volumes by OpenGL. - void render_VBOs(ERenderType type, bool disable_cullface, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const; - void render_legacy(ERenderType type, bool disable_cullface, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const; + void render_VBOs(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const; + void render_legacy(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const; // Finalize the initialization of the geometry & indices, // upload the geometry and indices to OpenGL VBO objects |