diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-05-03 13:37:43 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-05-03 13:37:43 +0300 |
| commit | 1c6006f657a1baac22a426565463e077707f4385 (patch) | |
| tree | cac34ca38aa62011b7e652a7d65812565423fedd /src/slic3r/GUI/3DScene.hpp | |
| parent | 0ab96ed6b5786eda18b7cceb4f7c695cd61065ee (diff) | |
| parent | d971c821b7ab8899c9a7ca6665c73cf9ba4b4173 (diff) | |
Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation
Diffstat (limited to 'src/slic3r/GUI/3DScene.hpp')
| -rw-r--r-- | src/slic3r/GUI/3DScene.hpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index 191b6a016..fc2126d3e 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -225,7 +225,8 @@ private: class GLVolume { public: static const float SELECTED_COLOR[4]; - static const float HOVER_COLOR[4]; + static const float HOVER_SELECT_COLOR[4]; + static const float HOVER_DESELECT_COLOR[4]; static const float OUTSIDE_COLOR[4]; static const float SELECTED_OUTSIDE_COLOR[4]; static const float DISABLED_COLOR[4]; @@ -233,6 +234,13 @@ public: static const float SLA_SUPPORT_COLOR[4]; static const float SLA_PAD_COLOR[4]; + enum EHoverState : unsigned char + { + HS_None, + HS_Select, + HS_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(); @@ -298,8 +306,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? - bool hover; + // 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 |