diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-04-25 11:21:24 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-04-25 11:21:24 +0300 |
| commit | d2d06c9f73b7885acf43ba59d4c508cc498faf4e (patch) | |
| tree | 3be5b44c020ad80ddeb695dc80559ab52f75d179 /src/slic3r/GUI/3DScene.hpp | |
| parent | 51e1f5cd9775f0a701089bc1df2fda5980bdbd66 (diff) | |
Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering
Diffstat (limited to 'src/slic3r/GUI/3DScene.hpp')
| -rw-r--r-- | src/slic3r/GUI/3DScene.hpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index fa7d6f7d1..8ed8da43f 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -234,6 +234,13 @@ public: static const float SLA_SUPPORT_COLOR[4]; static const float SLA_PAD_COLOR[4]; + enum EHoverState : unsigned char + { + None, + Select, + Deselect + }; + GLVolume(float r = 1.f, float g = 1.f, float b = 1.f, float a = 1.f); GLVolume(const float *rgba) : GLVolume(rgba[0], rgba[1], rgba[2], rgba[3]) {} ~GLVolume(); @@ -297,10 +304,8 @@ public: bool shader_outside_printer_detection_enabled; // Wheter or not this volume is outside print volume. bool is_outside; - // Boolean: Is mouse over this object to select it ? - bool hover_select; - // Boolean: Is mouse over this object to deselect it ? - bool hover_deselect; + // Is mouse or rectangle selection over this object to select/deselect it ? + EHoverState hover; // Wheter or not this volume has been generated from a modifier bool is_modifier; // Wheter or not this volume has been generated from the wipe tower |