Fix resources used in behavior configurations were not exported (#7941)

Author: D8H

Core/GDCore/Project/Behavior.h

@@ -3,11 +3,11 @@
  * Copyright 2008-2016 Florian Rival ([email protected]). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_BEHAVIOR_H
-#define GDCORE_BEHAVIOR_H
+#pragma once
 
 #include "GDCore/String.h"
 #include "GDCore/Project/BehaviorConfigurationContainer.h"
+#include "GDCore/Tools/MakeUnique.h"
 
 namespace gd {
 
@@ -28,7 +28,9 @@ class GD_CORE_API Behavior: public BehaviorConfigurationContainer {
       : BehaviorConfigurationContainer(name_, type_),
       isDefaultBehavior(false) {};
   virtual ~Behavior();
-  virtual Behavior* Clone() const override { return new Behavior(*this); }
+  virtual std::unique_ptr<gd::Behavior> Clone() const {
+    return gd::make_unique<gd::Behavior>(*this);
+  }
 
   bool IsDefaultBehavior() const {
     return isDefaultBehavior;
@@ -43,5 +45,3 @@ class GD_CORE_API Behavior: public BehaviorConfigurationContainer {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_BEHAVIOR_H

Core/GDCore/Project/BehaviorConfigurationContainer.h

@@ -46,9 +46,6 @@ class GD_CORE_API BehaviorConfigurationContainer {
         quickCustomizationVisibility(QuickCustomization::Visibility::Default),
         propertiesQuickCustomizationVisibilities() {};
   virtual ~BehaviorConfigurationContainer();
-  virtual BehaviorConfigurationContainer* Clone() const {
-    return new BehaviorConfigurationContainer(*this);
-  }
 
   /**
    * \brief Return the name identifying the behavior

Core/GDCore/Project/BehaviorsSharedData.h

@@ -4,8 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_BEHAVIORSSHAREDDATA_H
-#define GDCORE_BEHAVIORSSHAREDDATA_H
+#pragma once
 
 #include "GDCore/String.h"
 #include "GDCore/Project/BehaviorConfigurationContainer.h"
@@ -27,9 +26,7 @@ class GD_CORE_API BehaviorsSharedData: public BehaviorConfigurationContainer {
   BehaviorsSharedData(const gd::String& name_, const gd::String& type_)
       : BehaviorConfigurationContainer(name_, type_) {};
   virtual ~BehaviorsSharedData();
-  virtual BehaviorsSharedData* Clone() const override { return new BehaviorsSharedData(*this); }
+  virtual BehaviorsSharedData* Clone() const { return new BehaviorsSharedData(*this); }
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_BEHAVIORSSHAREDDATA_H

Core/GDCore/Project/CustomBehavior.cpp

@@ -17,9 +17,8 @@
 
 using namespace gd;
 
-CustomBehavior *CustomBehavior::Clone() const {
-  CustomBehavior *clone = new CustomBehavior(*this);
-  return clone;
+std::unique_ptr<gd::Behavior> CustomBehavior::Clone() const {
+  return gd::make_unique<gd::CustomBehavior>(*this);
 }
 
 void CustomBehavior::InitializeContent(gd::SerializerElement &behaviorContent) {

Core/GDCore/Project/CustomBehavior.h

@@ -3,8 +3,7 @@
  * Copyright 2008-2016 Florian Rival ([email protected]). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_CUSTOMBEHAVIOR_H
-#define GDCORE_CUSTOMBEHAVIOR_H
+#pragma once
 
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
@@ -26,7 +25,7 @@ class CustomBehavior : public gd::Behavior {
                  const gd::String &fullType)
       : Behavior(name, fullType),
         project(project_) {}
-  CustomBehavior *Clone() const override;
+  std::unique_ptr<gd::Behavior> Clone() const override;
 
   using Behavior::GetProperties;
   using Behavior::InitializeContent;
@@ -44,5 +43,3 @@ class CustomBehavior : public gd::Behavior {
                           ///< EventBasedBehavior from the fullType.
 };
 }  // namespace gd
-
-#endif  // GDCORE_CUSTOMBEHAVIOR_H

Core/GDCore/Project/Object.cpp

@@ -51,11 +51,7 @@ void Object::CopyWithoutConfiguration(const gd::Object& object) {
   assetStoreId = object.assetStoreId;
   objectVariables = object.objectVariables;
   effectsContainer = object.effectsContainer;
-
-  behaviors.clear();
-  for (auto& it : object.behaviors) {
-    behaviors[it.first] = gd::make_unique<gd::Behavior>(*it.second);
-  }
+  behaviors = gd::Clone(object.behaviors);
 }
 
 gd::ObjectConfiguration& Object::GetConfiguration() { return *configuration; }

Core/GDCore/Tools/PolymorphicClone.h

@@ -1,5 +1,4 @@
-#ifndef GD_CORE_POLYMORPHICCLONE_H
-#define GD_CORE_POLYMORPHICCLONE_H
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -20,6 +19,15 @@ std::vector<std::unique_ptr<T>> Clone(
   return copy;
 }
 
-}  // namespace gd
+template <class T>
+std::map<gd::String, std::unique_ptr<T>>
+Clone(const std::map<gd::String, std::unique_ptr<T>> &map) {
+  std::map<gd::String, std::unique_ptr<T>> copy;
+
+  for (const auto &it : map) {
+    copy[it.first] = gd::Clone(it.second);
+  }
+  return copy;
+}
 
-#endif
+}  // namespace gd

Core/tests/BehaviorSerialization.cpp

@@ -140,6 +140,17 @@ TEST_CASE("BehaviorSerialization", "[common]") {
     CheckBehaviorProperty(readProject.GetLayout("Scene").GetObjects());
   }
 
+  SECTION("Copy constructor of Behavior") {
+    gd::Platform platform;
+    gd::Project originalProject;
+    SetupProject(originalProject, platform);
+    CheckBehaviorProperty(originalProject.GetLayout("Scene").GetObjects());
+
+    auto clonedProject = originalProject;
+
+    CheckBehaviorProperty(clonedProject.GetLayout("Scene").GetObjects());
+  }
+
   SECTION("Load a project with a property value on a custom behavior that no longer exists") {
     gd::Platform platform;
     gd::Project writtenProject;

Core/tests/DummyPlatform.cpp

@@ -26,8 +26,8 @@ class BehaviorWithRequiredBehaviorProperty : public gd::Behavior {
       const gd::String& name, const gd::String& type)
       : Behavior(name, type) {};
   virtual ~BehaviorWithRequiredBehaviorProperty(){};
-  virtual Behavior* Clone() const override {
-    return new BehaviorWithRequiredBehaviorProperty(*this);
+  virtual std::unique_ptr<gd::Behavior> Clone() const override {
+    return gd::make_unique<BehaviorWithRequiredBehaviorProperty>(*this);
   }
 
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
@@ -74,8 +74,8 @@ class BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior
       const gd::String& name, const gd::String& type)
       : Behavior(name, type) {};
   virtual ~BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior(){};
-  virtual Behavior* Clone() const override {
-    return new BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior(
+  virtual std::unique_ptr<gd::Behavior> Clone() const override {
+    return gd::make_unique<BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior>(
         *this);
   }
 

Extensions/AnchorBehavior/AnchorBehavior.h

@@ -36,15 +36,15 @@ class GD_EXTENSION_API AnchorBehavior : public gd::Behavior {
 
   AnchorBehavior() {};
   virtual ~AnchorBehavior(){};
-  virtual Behavior* Clone() const override { return new AnchorBehavior(*this); }
+  virtual std::unique_ptr<gd::Behavior> Clone() const override {
+    return gd::make_unique<AnchorBehavior>(*this);
+  }
 
-#if defined(GD_IDE_ONLY)
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
       const gd::SerializerElement& behaviorContent) const override;
   virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
                               const gd::String& name,
                               const gd::String& value) override;
-#endif
 
   virtual void InitializeContent(
       gd::SerializerElement& behaviorContent) override;