Merge remote-tracking branch 'origin/master' into ys_buttons

src/slic3r/GUI/GLCanvas3D.hpp

@@ -375,6 +375,59 @@ class GLCanvas3D
     };
 
 public:
+    class TransformationType
+    {
+	public:
+		enum Enum {
+			// Transforming in a world coordinate system
+			World = 0,
+			// Transforming in a local coordinate system
+			Local = 1,
+			// Absolute transformations, allowed in local coordinate system only.
+			Absolute = 0,
+			// Relative transformations, allowed in both local and world coordinate system.
+			Relative = 2,
+			// For group selection, the transformation is performed as if the group made a single solid body.
+			Joint = 0,
+			// For group selection, the transformation is performed on each object independently.
+			Independent = 4,
+
+			World_Relative_Joint = World | Relative | Joint,
+			World_Relative_Independent = World | Relative | Independent,
+			Local_Absolute_Joint = Local | Absolute | Joint,
+			Local_Absolute_Independent = Local | Absolute | Independent,
+			Local_Relative_Joint = Local | Relative | Joint,
+			Local_Relative_Independent = Local | Relative | Independent,
+		};
+		
+		TransformationType() : m_value(World) {}
+        TransformationType(Enum value) : m_value(value) {}
+        TransformationType& operator=(Enum value) { m_value = value; return *this; }
+
+        Enum operator()() const { return m_value; }
+        bool has(Enum v) const { return ((unsigned int)m_value & (unsigned int)v) != 0; }
+
+        void set_world()        { this->remove(Local); }
+        void set_local()        { this->add(Local); }
+        void set_absolute()     { this->remove(Relative); }
+        void set_relative()     { this->add(Relative); }
+        void set_joint()        { this->remove(Independent); }
+        void set_independent()  { this->add(Independent); }
+
+        bool world()        const { return ! this->has(Local); }
+		bool local()        const { return this->has(Local); }
+		bool absolute()     const { return ! this->has(Relative); }
+		bool relative()     const { return this->has(Relative); }
+		bool joint()        const { return ! this->has(Independent); }
+		bool independent()  const { return this->has(Independent); }
+
+    private:
+        void add(Enum v) { m_value = Enum((unsigned int)m_value | (unsigned int)v); }
+        void remove(Enum v) { m_value = Enum((unsigned int)m_value & (~(unsigned int)v)); }
+
+        Enum    m_value;
+    };
+
     class Selection
     {
     public:
@@ -553,7 +606,7 @@ public:
         void start_dragging();
 
         void translate(const Vec3d& displacement, bool local = false);
-        void rotate(const Vec3d& rotation, bool local);
+        void rotate(const Vec3d& rotation, TransformationType transformation_type);
         void flattening_rotate(const Vec3d& normal);
         void scale(const Vec3d& scale, bool local);
         void mirror(Axis axis);