Merge branch 'master' into feat/object-panel

CMakeLists.txt

@@ -60,7 +60,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_
 endif()
 
 #Activate C++11
-set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 would need to remove usage of bind2nd (should be easy).
+set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 should be tried.
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Mark some warnings as errors

Core/GDCore/Project/ExternalLayout.h

@@ -96,19 +96,6 @@ class GD_CORE_API ExternalLayout {
   gd::String associatedLayout;
 };
 
-/**
- * \brief Functor testing ExternalLayout' name
- */
-struct ExternalLayoutHasName
-    : public std::binary_function<std::unique_ptr<gd::ExternalLayout>,
-                                  gd::String,
-                                  bool> {
-  bool operator()(const std::unique_ptr<gd::ExternalLayout>& externalLayout,
-                  gd::String name) const {
-    return externalLayout->GetName() == name;
-  }
-};
-
 }  // namespace gd
 
 #endif  // GDCORE_EXTERNALLAYOUT_H

Core/GDCore/Project/InitialInstance.cpp

@@ -27,7 +27,11 @@ InitialInstance::InitialInstance()
       rotationX(0),
       rotationY(0),
       zOrder(0),
+      opacity(255),
       layer(""),
+      flippedX(false),
+      flippedY(false),
+      flippedZ(false),
       customSize(false),
       customDepth(false),
       width(0),
@@ -57,7 +61,11 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
     SetHasCustomDepth(false);
   }
   SetZOrder(element.GetIntAttribute("zOrder", 0, "plan"));
+  SetOpacity(element.GetIntAttribute("opacity", 255));
   SetLayer(element.GetStringAttribute("layer"));
+  SetFlippedX(element.GetBoolAttribute("flippedX", false));
+  SetFlippedY(element.GetBoolAttribute("flippedY", false));
+  SetFlippedZ(element.GetBoolAttribute("flippedZ", false));
   SetLocked(element.GetBoolAttribute("locked", false));
   SetSealed(element.GetBoolAttribute("sealed", false));
   SetShouldKeepRatio(element.GetBoolAttribute("keepRatio", false));
@@ -113,6 +121,10 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("y", GetY());
   if (GetZ() != 0) element.SetAttribute("z", GetZ());
   element.SetAttribute("zOrder", GetZOrder());
+  if (GetOpacity() != 255) element.SetAttribute("opacity", GetOpacity());
+  if (IsFlippedX()) element.SetAttribute("flippedX", IsFlippedX());
+  if (IsFlippedY()) element.SetAttribute("flippedY", IsFlippedY());
+  if (IsFlippedZ()) element.SetAttribute("flippedZ", IsFlippedZ());
   element.SetAttribute("layer", GetLayer());
   element.SetAttribute("angle", GetAngle());
   if (GetRotationX() != 0) element.SetAttribute("rotationX", GetRotationX());
@@ -155,8 +167,8 @@ InitialInstance& InitialInstance::ResetPersistentUuid() {
 
 std::map<gd::String, gd::PropertyDescriptor>
 InitialInstance::GetCustomProperties(
-    gd::ObjectsContainer &globalObjectsContainer,
-    gd::ObjectsContainer &objectsContainer) {
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::ObjectsContainer& objectsContainer) {
   // Find an object
   if (objectsContainer.HasObjectNamed(GetObjectName()))
     return objectsContainer.GetObject(GetObjectName())
@@ -172,9 +184,10 @@ InitialInstance::GetCustomProperties(
 }
 
 bool InitialInstance::UpdateCustomProperty(
-    const gd::String &name, const gd::String &value,
-    gd::ObjectsContainer &globalObjectsContainer,
-    gd::ObjectsContainer &objectsContainer) {
+    const gd::String& name,
+    const gd::String& value,
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::ObjectsContainer& objectsContainer) {
   if (objectsContainer.HasObjectNamed(GetObjectName()))
     return objectsContainer.GetObject(GetObjectName())
         .GetConfiguration()

Core/GDCore/Project/InitialInstance.h

@@ -29,7 +29,7 @@ class GD_CORE_API InitialInstance {
    * \brief Create an initial instance pointing to no object, at position (0,0).
    */
   InitialInstance();
-  virtual ~InitialInstance(){};
+  virtual ~InitialInstance() {};
 
   /**
    * Must return a pointer to a copy of the object. A such method is needed to
@@ -123,6 +123,46 @@ class GD_CORE_API InitialInstance {
    */
   void SetZOrder(int zOrder_) { zOrder = zOrder_; }
 
+  /**
+   * \brief Get Opacity.
+   */
+  int GetOpacity() const { return opacity; }
+
+  /**
+   * \brief Set the opacity of the instance.
+   */
+  void SetOpacity(int opacity_) { opacity = opacity_; }
+
+  /**
+   * \brief Return true if the instance is flipped on X axis.
+   */
+  bool IsFlippedX() const { return flippedX; }
+
+  /**
+   * \brief Set whether the instance is flipped on X axis.
+   */
+  void SetFlippedX(bool flippedX_) { flippedX = flippedX_; }
+
+  /**
+   * \brief Return true if the instance is flipped on Y axis.
+   */
+  bool IsFlippedY() const { return flippedY; }
+
+  /**
+   * \brief Set whether the instance is flipped on Y axis.
+   */
+  void SetFlippedY(bool flippedY_) { flippedY = flippedY_; }
+
+  /**
+   * \brief Return true if the instance is flipped on Z axis.
+   */
+  bool IsFlippedZ() const { return flippedZ; }
+
+  /**
+   * \brief Set whether the instance is flipped on Z axis.
+   */
+  void SetFlippedZ(bool flippedZ_) { flippedZ = flippedZ_; }
+
   /**
    * \brief Get the layer the instance belongs to.
    */
@@ -134,8 +174,9 @@ class GD_CORE_API InitialInstance {
   void SetLayer(const gd::String& layer_) { layer = layer_; }
 
   /**
-   * \brief Return true if the instance has a width/height which is different from its
-   * object default width/height. This is independent from `HasCustomDepth`.
+   * \brief Return true if the instance has a width/height which is different
+   * from its object default width/height. This is independent from
+   * `HasCustomDepth`.
    *
    * \see gd::Object
    */
@@ -150,15 +191,13 @@ class GD_CORE_API InitialInstance {
   bool HasCustomDepth() const { return customDepth; }
 
   /**
-   * \brief Set whether the instance has a width/height which is different from its
-   * object default width/height or not.
-   * This is independent from `SetHasCustomDepth`.
+   * \brief Set whether the instance has a width/height which is different from
+   * its object default width/height or not. This is independent from
+   * `SetHasCustomDepth`.
    *
    * \see gd::Object
    */
-  void SetHasCustomSize(bool hasCustomSize_) {
-    customSize = hasCustomSize_;
-  }
+  void SetHasCustomSize(bool hasCustomSize_) { customSize = hasCustomSize_; }
 
   /**
    * \brief Set whether the instance has a depth which is different from its
@@ -264,18 +303,19 @@ class GD_CORE_API InitialInstance {
    * \note Common properties ( name, position... ) do not need to be
    * inserted in this map
    */
-  std::map<gd::String, gd::PropertyDescriptor>
-  GetCustomProperties(gd::ObjectsContainer &globalObjectsContainer,
-                      gd::ObjectsContainer &objectsContainer);
+  std::map<gd::String, gd::PropertyDescriptor> GetCustomProperties(
+      gd::ObjectsContainer& globalObjectsContainer,
+      gd::ObjectsContainer& objectsContainer);
 
   /**
    * \brief Update the property called \a name with the new \a value.
    *
    * \return false if the property could not be updated.
    */
-  bool UpdateCustomProperty(const gd::String &name, const gd::String &value,
-                            gd::ObjectsContainer &globalObjectsContainer,
-                            gd::ObjectsContainer &objectsContainer);
+  bool UpdateCustomProperty(const gd::String& name,
+                            const gd::String& value,
+                            gd::ObjectsContainer& globalObjectsContainer,
+                            gd::ObjectsContainer& objectsContainer);
 
   /**
    * \brief Get the value of a double property stored in the instance.
@@ -343,6 +383,10 @@ class GD_CORE_API InitialInstance {
   double rotationX;       ///< Instance angle on X axis (for a 3D object)
   double rotationY;       ///< Instance angle on Y axis (for a 3D object)
   int zOrder;             ///< Instance Z order (for a 2D object)
+  int opacity;            ///< Instance opacity
+  bool flippedX;          ///< True if the instance is flipped on X axis
+  bool flippedY;          ///< True if the instance is flipped on Y axis
+  bool flippedZ;          ///< True if the instance is flipped on Z axis
   gd::String layer;       ///< Instance layer
   bool customSize;        ///< True if object has a custom width and height
   bool customDepth;       ///< True if object has a custom depth
@@ -352,13 +396,13 @@ class GD_CORE_API InitialInstance {
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
   bool sealed;                              ///< True if the instance is sealed
-  bool keepRatio;                           ///< True if the instance's dimensions
-                                            ///  should keep the same ratio.
+  bool keepRatio;                     ///< True if the instance's dimensions
+                                      ///  should keep the same ratio.
   mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,
                                       ///  useful for hot reloading.
 
-  static gd::String*
-      badStringPropertyValue;  ///< Empty string returned by GetRawStringProperty
+  static gd::String* badStringPropertyValue;  ///< Empty string returned by
+                                              ///< GetRawStringProperty
 };
 
 }  // namespace gd

Core/GDCore/Project/Layout.h

@@ -405,18 +405,6 @@ class GD_CORE_API Layout {
       const gd::String& behaviorsType);
 };
 
-/**
- * \brief Functor testing layout name.
- * \see gd::Layout
- */
-struct LayoutHasName
-    : public std::binary_function<std::unique_ptr<Layout>, gd::String, bool> {
-  bool operator()(const std::unique_ptr<Layout>& layout,
-                  gd::String name) const {
-    return layout->GetName() == name;
-  }
-};
-
 /**
  * \brief Get the names of all layers from the given layout
  * that are invisible.