diff options
author | Enrico Turri <enricoturri@seznam.cz> | 2019-04-12 09:41:59 +0300 |
---|---|---|
committer | Enrico Turri <enricoturri@seznam.cz> | 2019-04-12 09:41:59 +0300 |
commit | 3e902ecfbd2169445f9cdd790e7983b8dbac8f96 (patch) | |
tree | c773c72cd8d660eeb2c66514cf02edbe6d01f348 /src/slic3r/GUI/3DScene.hpp | |
parent | a8fd1ceca074e05dc6190ff8b6440f37f62fb325 (diff) | |
parent | 59758fea550cd595e5343527201de3a49deacbc0 (diff) |
Fixed conflicts after merge with master
Diffstat (limited to 'src/slic3r/GUI/3DScene.hpp')
-rw-r--r-- | src/slic3r/GUI/3DScene.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index f8f29d270..88547359e 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -433,6 +433,9 @@ private: // z range for clipping in shaders float z_range[2]; + // plane coeffs for clipping in shaders + float clipping_plane[4]; + public: GLVolumePtrs volumes; @@ -491,6 +494,7 @@ public: } void set_z_range(float min_z, float max_z) { z_range[0] = min_z; z_range[1] = max_z; } + void set_clipping_plane(const double* coeffs) { clipping_plane[0] = coeffs[0]; clipping_plane[1] = coeffs[1]; clipping_plane[2] = coeffs[2]; clipping_plane[3] = coeffs[3]; } // returns true if all the volumes are completely contained in the print volume // returns the containment state in the given out_state, if non-null |