Add infinite button for particle tank

Don't show in changelog

.circleci/config.yml

@@ -176,7 +176,6 @@ jobs:
 
   # Build the WebAssembly library only (so that it's cached on a S3 and easy to re-use).
   build-gdevelop_js-wasm-only:
-    resource_class: medium+ # Compilation time decrease linearly with the number of CPUs, but not linking (so "large" does not speedup total build time).
     docker:
       - image: cimg/node:16.13
 
@@ -233,83 +232,10 @@ jobs:
           name: Deploy to S3 (latest)
           command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/latest/
 
-  # Build the WebAssembly library with clang-tidy and memory sanitizers.
-  build-gdevelop_js-debug-sanitizers-and-extra-checks:
-    resource_class: xlarge # Total time decrease linearly with the number of CPUs.
-    docker:
-      - image: cimg/node:16.13
-
-    working_directory: ~/GDevelop
-
-    steps:
-      - checkout
-      - aws-cli/setup
-
-      # System dependencies (for Emscripten)
-      - run:
-          name: Install dependencies for Emscripten
-          command: sudo apt-get update && sudo apt install cmake
-
-      - run:
-          name: Install dependencies for clang-tidy v19
-          command: wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 19 && sudo apt install clang-tidy-19
-
-      - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
-
-      - run:
-          name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-
-      # GDevelop.js dependencies
-      - restore_cache:
-          keys:
-            - gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - gdevelop.js-linux-nodejs-dependencies-
-
-      - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
-
-      # Build GDevelop.js
-      - run:
-          name: Build GDevelop.js ('debug-sanitizers' variant)
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build -- --variant=debug-sanitizers
-
-      - run:
-          name: Run clang-tidy
-          command: cd GDevelop.js && npm run lint
-
-      - run:
-          name: Run tests
-          command: cd GDevelop.js && npm run test -- --maxWorkers=4
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: Binaries/embuild/GDevelop.js
-
-      # Upload artifacts (AWS)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/variant/debug-sanitizers/commit/$(git rev-parse HEAD)/
-
 workflows:
-  gdevelop_js-wasm:
-    jobs:
-      - build-gdevelop_js-wasm-only
-  gdevelop_js-wasm-extra-checks:
-    jobs:
-      - build-gdevelop_js-debug-sanitizers-and-extra-checks:
-          # Extra checks are resource intensive so don't all run them.
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
   builds:
     jobs:
+      - build-gdevelop_js-wasm-only
       - build-macos:
           filters:
             branches:

.clang-tidy

@@ -1,4 +0,0 @@
-Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,-cppcoreguidelines-explicit-virtual-functions,-cppcoreguidelines-avoid-const-or-ref-data-members,-cppcoreguidelines-special-member-functions,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-virtual-class-destructor,-clang-analyzer-optin.performance.Padding,-cppcoreguidelines-narrowing-conversions'
-WarningsAsErrors: 'cppcoreguidelines-pro-type-member-init, clang-analyzer-optin.cplusplus.UninitializedObject'
-HeaderFilterRegex: '.*'
-FormatStyle: none

.github/workflows/gdcore-tools-hook.yml

@@ -1,22 +0,0 @@
-# This worflow notifies arthuro555's gdcore-tools repository when a new release is published.
-#
-# This is used to allow gdcore-tools, a library to use GDCore outside of GDevelop,
-# to attempt to automatically build, test, and publish a release for the new
-# GDevelop version.
-name: Trigger gdcore-tools pipeline
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  dispatch-event:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.GDCORE_TOOLS_PAT }}
-          repository: arthuro555/gdcore-tools
-          event-type: gdevelop-release
-          client-payload: '{"release": ${{ toJson(github.event.release) }}}'

CMakeLists.txt

@@ -69,18 +69,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# uninitialized variables or other hard to debug bugs.
 	add_compile_options(
 		-Wall
-		-Wextra
-		-Wuninitialized
-		-Wconditional-uninitialized
 		-Wno-unknown-warning-option
 		-Wno-reorder-ctor
 		-Wno-reorder
-		-Wno-unused-parameter
 		-Wno-pessimizing-move
-		-Wno-unused-variable # Not a good style, but not a risk
+		-Wno-unused-variable
 		-Wno-unused-private-field
-		-Wno-ignored-qualifiers # Not a risk
-		-Wno-sign-compare # Not a big risk
 
 		# Make as much warnings considered as errors as possible (only one for now).
 		-Werror=return-stack-address

Core/GDCore/Events/Builtin/WhileEvent.h

@@ -72,6 +72,8 @@ class GD_CORE_API WhileEvent : public gd::BaseEvent {
                               ///< de/activate infinite loop warning when the
                               ///< user create the event
 
+  mutable unsigned int whileConditionsHeight;
+
   int GetConditionsHeight() const;
   int GetActionsHeight() const;
   int GetWhileConditionsHeight() const;

Core/GDCore/Events/CodeGeneration/DiagnosticReport.h

@@ -14,10 +14,10 @@
 namespace gd {
 
 /**
- * \brief
+ * \brief 
  */
 class GD_CORE_API ProjectDiagnostic {
- public:
+public:
   enum ErrorType {
     UndeclaredVariable,
     MissingBehavior,
@@ -25,17 +25,12 @@ class GD_CORE_API ProjectDiagnostic {
     MismatchedObjectType,
   };
 
-  ProjectDiagnostic(ErrorType type_,
-                    const gd::String &message_,
+  ProjectDiagnostic(ErrorType type_, const gd::String &message_,
                     const gd::String &actualValue_,
-                    const gd::String &expectedValue_,
-                    const gd::String &objectName_ = "")
-      : type(type_),
-        message(message_),
-        actualValue(actualValue_),
-        expectedValue(expectedValue_),
-        objectName(objectName_) {};
-  virtual ~ProjectDiagnostic() {};
+                    const gd::String &expectedValue_, const gd::String &objectName_ = "")
+      : type(type_), message(message_), actualValue(actualValue_), expectedValue(expectedValue_),
+        objectName(objectName_){};
+  virtual ~ProjectDiagnostic(){};
 
   ErrorType GetType() const { return type; };
   const gd::String &GetMessage() const { return message; }
@@ -43,7 +38,7 @@ class GD_CORE_API ProjectDiagnostic {
   const gd::String &GetActualValue() const { return actualValue; }
   const gd::String &GetExpectedValue() const { return expectedValue; }
 
- private:
+private:
   ErrorType type;
   gd::String message;
   gd::String objectName;
@@ -52,12 +47,12 @@ class GD_CORE_API ProjectDiagnostic {
 };
 
 /**
- * \brief
+ * \brief 
  */
 class GD_CORE_API DiagnosticReport {
- public:
-  DiagnosticReport() {};
-  virtual ~DiagnosticReport() {};
+public:
+  DiagnosticReport(){};
+  virtual ~DiagnosticReport(){};
 
   void Add(const gd::ProjectDiagnostic &projectDiagnostic) {
     projectDiagnostics.push_back(
@@ -72,39 +67,32 @@ class GD_CORE_API DiagnosticReport {
 
   const gd::String &GetSceneName() const { return sceneName; }
 
-  void SetSceneName(const gd::String &sceneName_) { sceneName = sceneName_; }
-
-  void LogAllDiagnostics() {
-    for (auto &diagnostic : projectDiagnostics) {
-      std::cout << diagnostic->GetMessage()
-                << "(object: " << diagnostic->GetObjectName()
-                << ", actual value: " << diagnostic->GetActualValue()
-                << ", expected value: " << diagnostic->GetExpectedValue() << ")"
-                << std::endl;
-    }
+  void SetSceneName(const gd::String &sceneName_) {
+    sceneName = sceneName_;
   }
 
- private:
+private:
   std::vector<std::unique_ptr<gd::ProjectDiagnostic>> projectDiagnostics;
   gd::String sceneName;
 };
 
 /**
- * \brief
+ * \brief 
  */
 class GD_CORE_API WholeProjectDiagnosticReport {
- public:
-  WholeProjectDiagnosticReport() {};
-  virtual ~WholeProjectDiagnosticReport() {};
+public:
+  WholeProjectDiagnosticReport(){};
+  virtual ~WholeProjectDiagnosticReport(){};
 
   const DiagnosticReport &Get(std::size_t index) const {
     return *diagnosticReports[index].get();
   };
 
-  void Clear() { diagnosticReports.clear(); };
+  void Clear() {
+    diagnosticReports.clear();
+  };
 
-  DiagnosticReport &AddNewDiagnosticReportForScene(
-      const gd::String &sceneName) {
+  DiagnosticReport& AddNewDiagnosticReportForScene(const gd::String &sceneName) {
     auto diagnosticReport = gd::make_unique<gd::DiagnosticReport>();
     diagnosticReport->SetSceneName(sceneName);
     diagnosticReports.push_back(std::move(diagnosticReport));
@@ -114,7 +102,7 @@ class GD_CORE_API WholeProjectDiagnosticReport {
   std::size_t Count() const { return diagnosticReports.size(); };
 
   bool HasAnyIssue() {
-    for (auto &diagnosticReport : diagnosticReports) {
+    for (auto& diagnosticReport : diagnosticReports) {
       if (diagnosticReport->Count() > 0) {
         return true;
       }
@@ -122,8 +110,8 @@ class GD_CORE_API WholeProjectDiagnosticReport {
     return false;
   }
 
- private:
+private:
   std::vector<std::unique_ptr<gd::DiagnosticReport>> diagnosticReports;
 };
 
-}  // namespace gd
+} // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -345,14 +345,14 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
             objectInParameter, "");
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
       } else if (!expectedObjectType.empty() &&
                  actualObjectType != expectedObjectType) {
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
             actualObjectType, expectedObjectType, objectInParameter);
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -509,7 +509,7 @@ void EventsCodeGenerator::CheckBehaviorParameters(
             gd::ProjectDiagnostic projectDiagnostic(
                 gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
                 actualBehaviorType, expectedBehaviorType, lastObjectName);
-            if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+            diagnosticReport->Add(projectDiagnostic);
           }
         }
       });
@@ -567,14 +567,14 @@ gd::String EventsCodeGenerator::GenerateActionCode(
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
             objectInParameter, "");
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
       } else if (!expectedObjectType.empty() &&
                  actualObjectType != expectedObjectType) {
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
             actualObjectType, expectedObjectType, objectInParameter);
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -36,8 +36,8 @@ struct GD_CORE_API ExpressionParserLocation {
 
  private:
   bool isValid;
-  size_t startPosition = 0;
-  size_t endPosition = 0;
+  size_t startPosition;
+  size_t endPosition;
 };
 
 /**

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -1768,22 +1768,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression",
                     _("Angle of tolerance, in degrees (0: minimum tolerance)"))
       .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("IsTurnedTowardObject",
-                    _("An object is turned toward another"),
-                    _("Check if an object is turned toward another"),
-                    _("_PARAM0_ is turned toward _PARAM1_ ± _PARAM2_°"),
-                    _("Angle"),
-                    "res/conditions/estTourne24.png",
-                    "res/conditions/estTourne.png")
-      .AddParameter("objectList", _("Name of the object"))
-      .AddParameter("objectList", _("Name of the second object"))
-      .AddParameter("expression",
-                    _("Angle of tolerance, in degrees (0: minimum tolerance)"))
-      .AddCodeOnlyParameter("conditionInverted", "")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -338,7 +338,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  // Deprecated
   extension
       .AddCondition(
           "PopStartedTouch",
@@ -355,7 +354,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .SetHidden();
 
-  // Deprecated
   extension
       .AddCondition(
           "PopEndedTouch",
@@ -372,7 +370,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .SetHidden();
 
-  // Deprecated
   extension
       .AddCondition(
           "HasAnyTouchStarted",

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -37,7 +37,8 @@ BehaviorMetadata::BehaviorMetadata(
       className(className_),
       iconFilename(icon24x24),
       instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_) {
+      sharedDatasInstance(sharedDatasInstance_),
+      quickCustomizationVisibility(QuickCustomization::Visibility::Default) {
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
   SetDefaultName(gd::String(defaultName_));

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -394,7 +394,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   bool isPrivate = false;
   bool isHidden = false;
   gd::String openFullEditorLabel;
-  QuickCustomization::Visibility quickCustomizationVisibility = QuickCustomization::Visibility::Default;
+  QuickCustomization::Visibility quickCustomizationVisibility;
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -185,10 +185,10 @@ class GD_CORE_API EffectMetadata {
   gd::String fullname;
   gd::String description;
   std::vector<gd::String> includeFiles;
-  bool isMarkedAsNotWorkingForObjects = false;
-  bool isMarkedAsOnlyWorkingFor2D = false;
-  bool isMarkedAsOnlyWorkingFor3D = false;
-  bool isMarkedAsUnique = false;
+  bool isMarkedAsNotWorkingForObjects;
+  bool isMarkedAsOnlyWorkingFor2D;
+  bool isMarkedAsOnlyWorkingFor3D;
+  bool isMarkedAsUnique;
   std::map<gd::String, gd::PropertyDescriptor> properties;
 };
 

Core/GDCore/Extensions/Metadata/EventMetadata.cpp

@@ -19,8 +19,7 @@ EventMetadata::EventMetadata(const gd::String &name_,
     : fullname(fullname_),
       description(description_),
       group(group_),
-      instance(instance_),
-      hasCustomCodeGenerator(false) {
+      instance(instance_) {
   ClearCodeGenerationAndPreprocessing();
   if (instance) instance->SetType(name_);
 }

Core/GDCore/Extensions/Metadata/EventMetadata.h

@@ -83,7 +83,7 @@ class GD_CORE_API EventMetadata {
   gd::String group;
 
   std::shared_ptr<gd::BaseEvent> instance;
-  bool hasCustomCodeGenerator = false;
+  bool hasCustomCodeGenerator;
   std::function<gd::String(gd::BaseEvent& event,
                            gd::EventsCodeGenerator& codeGenerator,
                            gd::EventsCodeGenerationContext& context)>

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -288,8 +288,8 @@ class GD_CORE_API MetadataProvider {
   static EffectMetadata badEffectMetadata;
   static gd::InstructionMetadata badInstructionMetadata;
   static gd::ExpressionMetadata badExpressionMetadata;
-  int useless = 0;  // Useless member to avoid emscripten "must have a positive
-                    // integer typeid pointer" runtime error.
+  int useless;  // Useless member to avoid emscripten "must have a positive
+                // integer typeid pointer" runtime error.
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -246,11 +246,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
     return *this;
   }
 
-  ObjectMetadata& ResetDefaultBehaviorsJustForTesting() {
-    defaultBehaviorTypes.clear();
-    return *this;
-  }
-
   const gd::String& GetName() const override { return name; }
   const gd::String& GetFullName() const override { return fullname; }
   const gd::String& GetCategoryFullName() const { return categoryFullName; }

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -6,8 +6,6 @@
 #include "ParameterMetadataTools.h"
 
 #include "GDCore/Events/Expression.h"
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
@@ -15,6 +13,8 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 
 namespace gd {
 const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
@@ -23,10 +23,7 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
     const gd::Project& project,
     const ParameterMetadataContainer& parameters,
     gd::ObjectsContainer& outputObjectsContainer) {
-  // Keep track of all objects and their behaviors names, so we can remove
-  // those who are in the container but not in the parameters anymore.
-  std::set<gd::String> allObjectNames;
-  std::map<gd::String, std::set<gd::String>> allObjectNonDefaultBehaviorNames;
+  outputObjectsContainer.GetObjects().clear();
 
   gd::String lastObjectName;
   for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
@@ -34,97 +31,34 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
     if (parameter.GetName().empty()) continue;
 
     if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
-      const gd::String& objectName = parameter.GetName();
-      const gd::String& objectType = parameter.GetExtraInfo();
-      allObjectNames.insert(objectName);
-
-      // Check if we can keep the existing object.
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        const gd::Object& object = outputObjectsContainer.GetObject(objectName);
-
-        if (object.GetType() != objectType) {
-          // Object type has changed, remove it so it is re-created.
-          outputObjectsContainer.RemoveObject(objectName);
-        }
-      }
-
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        // Keep the existing object, ensure the default behaviors
-        // are all present (and no more than required by the object type).
-        // Non default behaviors coming from parameters will be added or removed later.
-        project.EnsureObjectDefaultBehaviors(outputObjectsContainer.GetObject(objectName));
-      } else {
-        // Create a new object (and its default behaviors) if needed.
-        outputObjectsContainer.InsertNewObject(
-            project,
-            objectType,
-            objectName,
-            outputObjectsContainer.GetObjectsCount());
-      }
+      outputObjectsContainer.InsertNewObject(
+          project,
+          parameter.GetExtraInfo(),
+          parameter.GetName(),
+          outputObjectsContainer.GetObjectsCount());
 
       // Memorize the last object name. By convention, parameters that require
       // an object (mainly, "objectvar" and "behavior") should be placed after
       // the object in the list of parameters (if possible, just after).
       // Search "lastObjectName" in the codebase for other place where this
       // convention is enforced.
-      lastObjectName = objectName;
+      lastObjectName = parameter.GetName();
     } else if (gd::ParameterMetadata::IsBehavior(parameter.GetType())) {
       if (!lastObjectName.empty()) {
         if (outputObjectsContainer.HasObjectNamed(lastObjectName)) {
-          const gd::String& behaviorName = parameter.GetName();
-          const gd::String& behaviorType = parameter.GetExtraInfo();
-
-          gd::Object& object = outputObjectsContainer.GetObject(lastObjectName);
-          allObjectNonDefaultBehaviorNames[lastObjectName].insert(behaviorName);
-
-          // Check if we can keep the existing behavior.
-          if (object.HasBehaviorNamed(behaviorName)) {
-            if (object.GetBehavior(behaviorName).GetTypeName() !=
-                behaviorType) {
-              // Behavior type has changed, remove it so it is re-created.
-              object.RemoveBehavior(behaviorName);
-            }
-          }
+          const gd::Object& object =
+              outputObjectsContainer.GetObject(lastObjectName);
+          gd::String behaviorName = parameter.GetName();
 
           if (!object.HasBehaviorNamed(behaviorName)) {
-            object.AddNewBehavior(
-                project, parameter.GetExtraInfo(), behaviorName);
+            outputObjectsContainer.GetObject(lastObjectName)
+                .AddNewBehavior(
+                    project, parameter.GetExtraInfo(), behaviorName);
           }
         }
       }
     }
   }
-
-  // Remove objects that are not in the parameters anymore.
-  std::set<gd::String> objectNamesInContainer =
-      outputObjectsContainer.GetAllObjectNames();
-  for (const auto& objectName : objectNamesInContainer) {
-    if (allObjectNames.find(objectName) == allObjectNames.end()) {
-      outputObjectsContainer.RemoveObject(objectName);
-    }
-  }
-
-  // Remove behaviors of objects that are not in the parameters anymore.
-  for (const auto& objectName : allObjectNames) {
-    if (!outputObjectsContainer.HasObjectNamed(objectName)) {
-      // Should not happen.
-      continue;
-    }
-
-    auto& object = outputObjectsContainer.GetObject(objectName);
-    const auto& allBehaviorNames = allObjectNonDefaultBehaviorNames[objectName];
-    for (const auto& behaviorName : object.GetAllBehaviorNames()) {
-      if (object.GetBehavior(behaviorName).IsDefaultBehavior()) {
-        // Default behaviors are already ensured to be all present
-        // (and no more than required by the object type).
-        continue;
-      }
-
-      if (allBehaviorNames.find(behaviorName) == allBehaviorNames.end()) {
-        object.RemoveBehavior(behaviorName);
-      }
-    }
-  }
 }
 
 void ParameterMetadataTools::ForEachParameterMatchingSearch(

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -53,32 +53,27 @@ const gd::String &ValueTypeMetadata::GetExpressionPrimitiveValueType(
 
 const gd::String &
 ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
-  if (parameterType == "number" ||
-      gd::ValueTypeMetadata::IsTypeValue("number", parameterType)) {
-    return ValueTypeMetadata::numberType;
-  }
-  if (parameterType == "string" ||
-      gd::ValueTypeMetadata::IsTypeValue("string", parameterType)) {
-    return ValueTypeMetadata::stringType;
-  }
   if (parameterType == "variable" ||
-      gd::ValueTypeMetadata::IsTypeValue("variable", parameterType)) {
+      gd::ValueTypeMetadata::IsTypeExpression("variable", parameterType)) {
     return ValueTypeMetadata::variableType;
   }
-  if (parameterType == "boolean" ||
-      gd::ValueTypeMetadata::IsTypeValue("boolean", parameterType)) {
+  if (parameterType == "boolean" || parameterType == "yesorno" ||
+      parameterType == "trueorfalse") {
     return ValueTypeMetadata::booleanType;
   }
-  return parameterType;
+  // These 2 types are not strings from the code generator point of view,
+  // but it is for event-based extensions.
+  if (parameterType == "key" || parameterType == "mouse") {
+    return ValueTypeMetadata::stringType;
+  }
+  return GetExpressionPrimitiveValueType(parameterType);
 }
 
 const gd::String ValueTypeMetadata::numberValueType = "number";
 const gd::String ValueTypeMetadata::booleanValueType = "boolean";
-const gd::String ValueTypeMetadata::stringValueType = "string";
 const gd::String ValueTypeMetadata::colorValueType = "color";
 const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
-const gd::String ValueTypeMetadata::behaviorValueType = "behavior";
-const gd::String ValueTypeMetadata::leaderboardIdValueType = "leaderboardId";
+const gd::String ValueTypeMetadata::stringValueType = "string";
 
 const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     const gd::String &propertyType) {
@@ -90,10 +85,6 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     return colorValueType;
   } else if (propertyType == "Choice") {
     return choiceValueType;
-  } else if (propertyType == "Behavior") {
-    return behaviorValueType;
-  } else if (propertyType == "LeaderboardId") {
-    return leaderboardIdValueType;
   }
   // For "String" or default
   return stringValueType;

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -111,21 +111,21 @@ class GD_CORE_API ValueTypeMetadata {
    * given type.
    */
   bool IsNumber() const {
-    return gd::ValueTypeMetadata::IsTypeValue("number", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("number", name);
   }
 
   /**
    * \brief Return true if the type is a string.
    */
   bool IsString() const {
-    return gd::ValueTypeMetadata::IsTypeValue("string", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("string", name);
   }
 
   /**
    * \brief Return true if the type is a boolean.
    */
   bool IsBoolean() const {
-    return gd::ValueTypeMetadata::IsTypeValue("boolean", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("boolean", name);
   }
 
   /**
@@ -135,7 +135,7 @@ class GD_CORE_API ValueTypeMetadata {
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
    */
   bool IsVariable() const {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(name) == "variable";
+    return gd::ValueTypeMetadata::IsTypeExpression("variable", name);
   }
 
   /**
@@ -175,9 +175,7 @@ class GD_CORE_API ValueTypeMetadata {
   }
 
   /**
-   * \brief Return true if the type is an expression of the given type from the
-   * caller point of view.
-   *
+   * \brief Return true if the type is an expression of the given type.
    * \note If you are adding a new type of parameter, also add it in the IDE (
    * see EventsFunctionParametersEditor, ParameterRenderingService
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
@@ -188,7 +186,6 @@ class GD_CORE_API ValueTypeMetadata {
       return parameterType == "number" || parameterType == "expression" ||
              parameterType == "camera" || parameterType == "forceMultiplier";
     } else if (type == "string") {
-      // "key" and "mouse" are not mapped her, see GetPrimitiveValueType.
       return parameterType == "string" || parameterType == "layer" ||
              parameterType == "color" || parameterType == "file" ||
              parameterType == "stringWithSelector" ||
@@ -230,26 +227,6 @@ class GD_CORE_API ValueTypeMetadata {
     return false;
   }
 
-  /**
-   * \brief Return true if the type is a value of the given primitive type from
-   * the function events point of view
-   */
-  static bool IsTypeValue(const gd::String &type,
-                           const gd::String &parameterType) {
-    if (gd::ValueTypeMetadata::IsTypeExpression(type, parameterType)) {
-      return true;
-    }
-    // These 2 parameter types are not strings from the outside of a function as
-    // the generator add quote around a text, but from the events inside of the
-    // function the parameter is a string.
-    //
-    // See EventsCodeGenerator::GenerateParameterCodes
-    if (type == "string") {
-      return parameterType == "key" || parameterType == "mouse";
-    }
-    return false;
-  }
-
   /**
    * \brief Return the expression type from the parameter type.
    * Declinations of "number" and "string" types (like "forceMultiplier" or
@@ -301,11 +278,9 @@ class GD_CORE_API ValueTypeMetadata {
 
   static const gd::String numberValueType;
   static const gd::String booleanValueType;
-  static const gd::String stringValueType;
   static const gd::String colorValueType;
   static const gd::String choiceValueType;
-  static const gd::String behaviorValueType;
-  static const gd::String leaderboardIdValueType;
+  static const gd::String stringValueType;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -808,24 +808,6 @@ gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
   return extensionName + separator + objectName;
 }
 
-gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(0, separatorIndex);
-}
-
-gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(separatorIndex + 2);
-}
-
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}
 

Core/GDCore/Extensions/PlatformExtension.h

@@ -40,7 +40,8 @@ class Object;
 class ObjectConfiguration;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()> CreateFunPtr;
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+    CreateFunPtr;
 
 namespace gd {
 
@@ -50,25 +51,25 @@ namespace gd {
  */
 class GD_CORE_API CompilationInfo {
  public:
-  CompilationInfo() {};
-  virtual ~CompilationInfo() {};
+  CompilationInfo() : informationCompleted(false){};
+  virtual ~CompilationInfo(){};
 
-  bool informationCompleted = false;
+  bool informationCompleted;
 
-  bool runtimeOnly = false;  ///< True if the extension was compiled for a
-                             ///< runtime use only
+  bool runtimeOnly;  ///< True if the extension was compiled for a runtime use
+                     ///< only
 
 #if defined(__GNUC__)
-  int gccMajorVersion = 0;
-  int gccMinorVersion = 0;
-  int gccPatchLevel = 0;
+  int gccMajorVersion;
+  int gccMinorVersion;
+  int gccPatchLevel;
 #endif
 
-  int sfmlMajorVersion = 0;
-  int sfmlMinorVersion = 0;
+  int sfmlMajorVersion;
+  int sfmlMinorVersion;
 
   gd::String gdCoreVersion;
-  int sizeOfpInt = 0;
+  int sizeOfpInt;
 };
 
 struct GD_CORE_API DuplicatedInstructionOptions {
@@ -238,12 +239,11 @@ class GD_CORE_API PlatformExtension {
    * \param instance The "blueprint" object to be copied when a new object is
    asked for.
    */
-  gd::ObjectMetadata& AddObject(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& icon_,
-      std::shared_ptr<gd::ObjectConfiguration> instance);
+  gd::ObjectMetadata& AddObject(const gd::String& name_,
+                                const gd::String& fullname_,
+                                const gd::String& description_,
+                                const gd::String& icon_,
+                                std::shared_ptr<gd::ObjectConfiguration> instance);
 
   /**
    * \brief Declare a new events based object as being part of the extension.
@@ -253,10 +253,11 @@ class GD_CORE_API PlatformExtension {
    * \param description The user friendly description of the object
    * \param icon The icon of the object.
    */
-  gd::ObjectMetadata& AddEventsBasedObject(const gd::String& name_,
-                                           const gd::String& fullname_,
-                                           const gd::String& description_,
-                                           const gd::String& icon_);
+  gd::ObjectMetadata& AddEventsBasedObject(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& icon_);
 
   /**
    * \brief Declare a new behavior as being part of the extension.
@@ -419,7 +420,8 @@ class GD_CORE_API PlatformExtension {
   PlatformExtension& SetTags(const gd::String& csvTags) {
     tags.clear();
     tags = csvTags.Split(',');
-    for (size_t i = 0; i < tags.size(); i++) {
+    for (size_t i = 0; i < tags.size(); i++)
+    {
       tags[i] = tags[i].Trim().LowerCase();
     }
     return *this;
@@ -632,30 +634,26 @@ class GD_CORE_API PlatformExtension {
    */
   static gd::String GetNamespaceSeparator() { return "::"; }
 
-  static gd::String GetEventsFunctionFullType(const gd::String& extensionName,
-                                              const gd::String& functionName);
+  static gd::String GetEventsFunctionFullType(const gd::String &extensionName,
+                                              const gd::String &functionName);
 
-  static gd::String GetBehaviorEventsFunctionFullType(
-      const gd::String& extensionName,
-      const gd::String& behaviorName,
-      const gd::String& functionName);
+  static gd::String
+  GetBehaviorEventsFunctionFullType(const gd::String &extensionName,
+                                    const gd::String &behaviorName,
+                                    const gd::String &functionName);
 
-  static gd::String GetBehaviorFullType(const gd::String& extensionName,
-                                        const gd::String& behaviorName);
+  static gd::String GetBehaviorFullType(const gd::String &extensionName,
+                                        const gd::String &behaviorName);
 
-  static gd::String GetObjectEventsFunctionFullType(
-      const gd::String& extensionName,
-      const gd::String& objectName,
-      const gd::String& functionName);
+  static gd::String
+  GetObjectEventsFunctionFullType(const gd::String &extensionName,
+                                  const gd::String &objectName,
+                                  const gd::String &functionName);
 
-  static gd::String GetObjectFullType(const gd::String& extensionName,
-                                      const gd::String& objectName);
+  static gd::String GetObjectFullType(const gd::String &extensionName,
+                                      const gd::String &objectName);
 
-  static gd::String GetExtensionFromFullObjectType(const gd::String& type);
-
-  static gd::String GetObjectNameFromFullObjectType(const gd::String& type);
-
- private:
+private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start
    * with).
@@ -670,10 +668,10 @@ class GD_CORE_API PlatformExtension {
   gd::String fullname;      ///< Name displayed to users in the editor.
   gd::String informations;  ///< Description displayed to users in the editor.
   gd::String category;
-  gd::String author;   ///< Author displayed to users in the editor.
-  gd::String license;  ///< License name displayed to users in the editor.
-  bool deprecated;     ///< true if the extension is deprecated and shouldn't be
-                       ///< shown in IDE.
+  gd::String author;        ///< Author displayed to users in the editor.
+  gd::String license;       ///< License name displayed to users in the editor.
+  bool deprecated;  ///< true if the extension is deprecated and shouldn't be
+                    ///< shown in IDE.
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation.
   gd::String iconUrl;   ///< The URL to the icon to be shown for this extension.

Core/GDCore/Extensions/PlatformExtension.inl

@@ -5,8 +5,6 @@
  * project is released under the MIT License.
  */
 
-// NOLINTBEGIN
-
 #ifndef GDCORE_PLATFORMEXTENSION_INL
 #define GDCORE_PLATFORMEXTENSION_INL
 
@@ -38,5 +36,3 @@ gd::ObjectMetadata& PlatformExtension::AddObject(const gd::String& name,
 }  // namespace gd
 
 #endif
-
-// NOLINTEND

Core/GDCore/IDE/CaptureOptions.cpp

@@ -1,18 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/CaptureOptions.h"
-
-#include "GDCore/String.h"
-
-using namespace std;
-
-namespace gd {
-
-Screenshot::Screenshot() {}
-
-CaptureOptions::CaptureOptions() {}
-
-}  // namespace gd

Core/GDCore/IDE/CaptureOptions.h

@@ -1,50 +0,0 @@
-#pragma once
-#include <memory>
-#include <vector>
-
-#include "GDCore/String.h"
-
-namespace gd {
-
-class GD_CORE_API Screenshot {
- public:
-  Screenshot();
-  virtual ~Screenshot() {};
-
-  void SetDelayTimeInSeconds(int delayTimeInMs_) {
-    delayTimeInMs = delayTimeInMs_;
-  }
-  int GetDelayTimeInSeconds() const { return delayTimeInMs; }
-
-  void SetSignedUrl(const gd::String& signedUrl_) { signedUrl = signedUrl_; }
-  const gd::String& GetSignedUrl() const { return signedUrl; }
-
-  void SetPublicUrl(const gd::String& publicUrl_) { publicUrl = publicUrl_; }
-  const gd::String& GetPublicUrl() const { return publicUrl; }
-
- private:
-  int delayTimeInMs = 0;
-  gd::String signedUrl;
-  gd::String publicUrl;
-};
-
-class GD_CORE_API CaptureOptions {
- public:
-  CaptureOptions();
-  virtual ~CaptureOptions() {};
-
-  bool IsEmpty() const { return screenshots.empty(); }
-
-  void AddScreenshot(const Screenshot& screenshot) {
-    screenshots.push_back(screenshot);
-  }
-
-  const std::vector<Screenshot>& GetScreenshots() const { return screenshots; }
-
-  void ClearScreenshots() { screenshots.clear(); }
-
- private:
-  std::vector<Screenshot> screenshots;
-};
-
-}  // namespace gd

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

@@ -29,6 +29,9 @@ void EventBasedBehaviorBrowser::ExposeEvents(
       project, eventsFunctionsExtension, eventsBasedBehavior, worker);
 }
 
+void EventBasedBehaviorBrowser::ExposeObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) const {}
+
 void EventBasedBehaviorBrowser::ExposeFunctions(
     gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
   worker.Launch(eventsBasedBehavior.GetEventsFunctions());
@@ -40,4 +43,7 @@ void EventBasedBehaviorBrowser::ExposeEventBasedBehaviors(
   worker.Launch(eventsBasedBehavior);
 }
 
+void EventBasedBehaviorBrowser::ExposeBehaviorSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) const {}
+
 } // namespace gd

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

@@ -67,7 +67,7 @@ public:
    * \brief Do nothing.
    */
   void ExposeObjects(gd::Project &project,
-                     gd::ArbitraryObjectsWorker &worker) const override {};
+                     gd::ArbitraryObjectsWorker &worker) const override;
 
   /**
    * \brief Call the specified worker on the event-based behavior.
@@ -80,7 +80,7 @@ public:
    * \brief Do nothing.
    */
   void ExposeBehaviorSharedDatas(gd::Project &project,
-                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override {};
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
 
 private:
   const gd::EventsFunctionsExtension &eventsFunctionsExtension;

Core/GDCore/IDE/EventBasedObjectBrowser.cpp

@@ -1,37 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventBasedObjectBrowser.h"
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void EventBasedObjectBrowser::ExposeEvents(
-    gd::Project &project, gd::ArbitraryEventsWorker &worker) const {
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsBasedObject, worker);
-}
-
-void EventBasedObjectBrowser::ExposeEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject, worker);
-}
-
-void EventBasedObjectBrowser::ExposeFunctions(
-    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
-  worker.Launch(eventsBasedObject.GetEventsFunctions());
-}
-
-} // namespace gd

Core/GDCore/IDE/EventBasedObjectBrowser.h

@@ -1,90 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/ProjectBrowser.h"
-
-namespace gd {
-class Project;
-class String;
-class EventsFunctionsExtension;
-class EventsFunction;
-class EventsBasedBehavior;
-class EventsBasedObject;
-class ArbitraryEventsWorker;
-class ArbitraryEventsWorkerWithContext;
-class ArbitraryEventsFunctionsWorker;
-class ArbitraryObjectsWorker;
-class ArbitraryEventBasedBehaviorsWorker;
-class ArbitraryBehaviorSharedDataWorker;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Expose event-based object contents to workers.
- */
-class GD_CORE_API EventBasedObjectBrowser : public ProjectBrowser {
-public:
-  EventBasedObjectBrowser(
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension_,
-      gd::EventsBasedObject &eventsBasedObject_)
-      : eventsFunctionsExtension(eventsFunctionsExtension_),
-        eventsBasedObject(eventsBasedObject_) {}
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an event-based object.
-   */
-  void ExposeEvents(gd::Project &project,
-                    gd::ArbitraryEventsWorker &worker) const override;
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an event-based object.
-   */
-  void
-  ExposeEvents(gd::Project &project, 
-               gd::ArbitraryEventsWorkerWithContext &worker) const override;
-
-  /**
-   * \brief Call the specified worker on all functions of the event-based object
-   *
-   * This should be the preferred way to traverse all the function signatures
-   * of an event-based object.
-   */
-  void ExposeFunctions(gd::Project &project,
-                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
-
-  /**
-   * \brief Do nothing.
-   */
-  void ExposeObjects(gd::Project &project,
-                     gd::ArbitraryObjectsWorker &worker) const override {};
-
-  /**
-   * @brief Do nothing.
-   */
-  void ExposeEventBasedBehaviors(
-      gd::Project &project,
-      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override {};
-
-  /**
-   * \brief Do nothing.
-   */
-  void ExposeBehaviorSharedDatas(gd::Project &project,
-                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override {};
-
-private:
-  const gd::EventsFunctionsExtension &eventsFunctionsExtension;
-  gd::EventsBasedObject &eventsBasedObject;
-};
-
-} // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp

@@ -0,0 +1,41 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/EventsLeaderboardsLister.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+bool EventsLeaderboardsLister::DoVisitInstruction(gd::Instruction& instruction,
+                                                  bool isCondition) {
+  const gd::InstructionMetadata& instrInfo =
+      isCondition ? MetadataProvider::GetConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : MetadataProvider::GetActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+
+  for (int i = 0; i < instruction.GetParametersCount() &&
+                  i < instrInfo.GetParametersCount();
+       ++i)
+    if (instrInfo.GetParameter(i).GetType() == "leaderboardId") {
+      leaderboardIds.insert(instruction.GetParameter(i).GetPlainString());
+    }
+  return false;
+}
+
+EventsLeaderboardsLister::~EventsLeaderboardsLister() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsLister.h

@@ -0,0 +1,48 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EventsLeaderboardsLister_H
+#define EventsLeaderboardsLister_H
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}
+
+namespace gd {
+
+/**
+ * \brief List the leaderboard ids in the instructions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsLeaderboardsLister : public ArbitraryEventsWorker {
+ public:
+  EventsLeaderboardsLister(gd::Project& project_) : project(project_){};
+  virtual ~EventsLeaderboardsLister();
+
+  /**
+   * Return the values of all leaderboardIds found in the events.
+   */
+  const std::set<gd::String>& GetLeaderboardIds() { return leaderboardIds; }
+
+ private:
+  virtual bool DoVisitInstruction(gd::Instruction& instruction,
+                                  bool isCondition);
+
+  std::set<gd::String> leaderboardIds;
+  gd::Project& project;
+};
+
+}  // namespace gd
+
+#endif  // EventsLeaderboardsLister_H

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp

@@ -0,0 +1,49 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/EventsLeaderboardsRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+bool EventsLeaderboardsRenamer::DoVisitInstruction(gd::Instruction& instruction,
+                                                   bool isCondition) {
+  const gd::InstructionMetadata& instrInfo =
+      isCondition ? MetadataProvider::GetConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : MetadataProvider::GetActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+
+  for (int i = 0; i < instruction.GetParametersCount() &&
+                  i < instrInfo.GetParametersCount();
+       ++i) {
+    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
+
+    if (parameter.GetType() == "leaderboardId") {
+      const gd::String leaderboardId =
+          instruction.GetParameter(i).GetPlainString();
+
+      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
+        instruction.SetParameter(i, leaderboardIdMap[leaderboardId]);
+      }
+    }
+  }
+  return false;
+}
+
+EventsLeaderboardsRenamer::~EventsLeaderboardsRenamer() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.h

@@ -0,0 +1,46 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EventsLeaderboardsRenamer_H
+#define EventsLeaderboardsRenamer_H
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}
+
+namespace gd {
+
+/**
+ * \brief Replace the leaderboard ids in the instructions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsLeaderboardsRenamer : public ArbitraryEventsWorker {
+ public:
+  EventsLeaderboardsRenamer(
+      gd::Project& project_,
+      const std::map<gd::String, gd::String>& leaderboardIdMap_)
+      : project(project_), leaderboardIdMap(leaderboardIdMap_){};
+  virtual ~EventsLeaderboardsRenamer();
+
+ private:
+  virtual bool DoVisitInstruction(gd::Instruction& instruction,
+                                  bool isCondition);
+
+  std::map<gd::String, gd::String> leaderboardIdMap;
+  gd::Project& project;
+};
+
+}  // namespace gd
+
+#endif  // EventsLeaderboardsRenamer_H

Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp

@@ -41,7 +41,6 @@ class GD_CORE_API ExpressionPropertyReplacer
       const gd::Platform& platform_,
       const gd::ProjectScopedContainers& projectScopedContainers_,
       const gd::PropertiesContainer& targetPropertiesContainer_,
-      bool isParentTypeAVariable_,
       const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_,
       const std::unordered_set<gd::String>& removedPropertyNames_)
       : hasDoneRenaming(false),
@@ -49,7 +48,6 @@ class GD_CORE_API ExpressionPropertyReplacer
         platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         targetPropertiesContainer(targetPropertiesContainer_),
-        isParentTypeAVariable(isParentTypeAVariable_),
         oldToNewPropertyNames(oldToNewPropertyNames_),
         removedPropertyNames(removedPropertyNames_){};
   virtual ~ExpressionPropertyReplacer(){};
@@ -71,21 +69,16 @@ class GD_CORE_API ExpressionPropertyReplacer
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
     auto& propertiesContainersList =
         projectScopedContainers.GetPropertiesContainersList();
 
     // The node represents a variable or an object name on which a variable
     // will be accessed, or a property with a child.
 
+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
+      GetPotentialNewName(node.name),
       [&]() {
         // Do nothing, it's an object variable.
         if (node.child) node.child->Visit(*this);
@@ -107,7 +100,16 @@ class GD_CORE_API ExpressionPropertyReplacer
         // Do nothing, it's a parameter.
         if (node.child) node.child->Visit(*this);
       }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.name);
+        }
+
         if (node.child) node.child->Visit(*this);
       });
   }
@@ -116,24 +118,17 @@ class GD_CORE_API ExpressionPropertyReplacer
   }
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
     node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-
     auto& propertiesContainersList =
         projectScopedContainers.GetPropertiesContainersList();
 
+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
+      GetPotentialNewName(node.identifierName),
       [&]() {
         // Do nothing, it's an object variable.
       }, [&]() {
@@ -150,29 +145,22 @@ class GD_CORE_API ExpressionPropertyReplacer
       }, [&]() {
         // Do nothing, it's a parameter.
       }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.identifierName);
+        }
       });
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsPropertyReplacer::CanContainProperty(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariable();
-        parameter->Visit(*this);
-      }
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    for (auto& parameter : node.parameters) {
+      parameter->Visit(*this);
     }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
   }
   void OnVisitEmptyNode(EmptyNode& node) override {}
 
@@ -180,6 +168,12 @@ class GD_CORE_API ExpressionPropertyReplacer
   bool hasDoneRenaming;
   bool removedPropertyUsed;
 
+  const gd::String& GetPotentialNewName(const gd::String& oldName) {
+    return oldToNewPropertyNames.count(oldName) >= 1
+            ? oldToNewPropertyNames.find(oldName)->second
+            : oldName;
+  }
+
   bool RenameOrRemovePropertyOfTargetPropertyContainer(
       gd::String& propertyName) {
     if (oldToNewPropertyNames.count(propertyName) >= 1) {
@@ -204,7 +198,6 @@ class GD_CORE_API ExpressionPropertyReplacer
   const std::unordered_set<gd::String>& removedPropertyNames;
 
   gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
 };
 
 bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
@@ -223,16 +216,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
           const gd::Expression& parameterValue,
           size_t parameterIndex,
           const gd::String& lastObjectName) {
-        if (!gd::EventsPropertyReplacer::CanContainProperty(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
+        const gd::String& type = parameterMetadata.GetType();
+
+        if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+            !gd::ParameterMetadata::IsExpression("number", type) &&
+            !gd::ParameterMetadata::IsExpression("string", type))
+          return;  // Not an expression that can contain properties.
+
         auto node = parameterValue.GetRootNode();
         if (node) {
-          ExpressionPropertyReplacer renamer(
-              platform, GetProjectScopedContainers(), targetPropertiesContainer,
-              parameterMetadata.GetValueTypeMetadata().IsVariable(),
-              oldToNewPropertyNames, removedPropertyNames);
+          ExpressionPropertyReplacer renamer(platform,
+                                             GetProjectScopedContainers(),
+                                             targetPropertiesContainer,
+                                             oldToNewPropertyNames,
+                                             removedPropertyNames);
           node->Visit(renamer);
 
           if (renamer.IsRemovedPropertyUsed()) {
@@ -249,16 +246,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
 
 bool EventsPropertyReplacer::DoVisitEventExpression(
     gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsPropertyReplacer::CanContainProperty(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
+  const gd::String& type = metadata.GetType();
+
+  if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+      !gd::ParameterMetadata::IsExpression("number", type) &&
+      !gd::ParameterMetadata::IsExpression("string", type))
+    return false;  // Not an expression that can contain properties.
+
   auto node = expression.GetRootNode();
   if (node) {
-    ExpressionPropertyReplacer renamer(
-        platform, GetProjectScopedContainers(), targetPropertiesContainer,
-        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames,
-        removedPropertyNames);
+    ExpressionPropertyReplacer renamer(platform,
+                                       GetProjectScopedContainers(),
+                                       targetPropertiesContainer,
+                                       oldToNewPropertyNames,
+                                       removedPropertyNames);
     node->Visit(renamer);
 
     if (renamer.IsRemovedPropertyUsed()) {
@@ -271,12 +272,6 @@ bool EventsPropertyReplacer::DoVisitEventExpression(
   return false;
 }
 
-bool EventsPropertyReplacer::CanContainProperty(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
 EventsPropertyReplacer::~EventsPropertyReplacer() {}
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsPropertyReplacer.h

@@ -41,8 +41,6 @@ class GD_CORE_API EventsPropertyReplacer
         removedPropertyNames(removedPropertyNames_){};
   virtual ~EventsPropertyReplacer();
 
-  static bool CanContainProperty(const gd::ValueTypeMetadata &valueTypeMetadata);
-
  private:
   bool DoVisitInstruction(gd::Instruction &instruction,
                           bool isCondition) override;

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -337,19 +337,19 @@ struct GD_CORE_API ExpressionCompletionDescription {
 
  private:
   CompletionKind completionKind;
-  gd::Variable::Type variableType = gd::Variable::Unknown;
-  gd::VariablesContainer::SourceType variableScope = gd::VariablesContainer::Unknown;
+  gd::Variable::Type variableType;
+  gd::VariablesContainer::SourceType variableScope;
   gd::String type;
   gd::String prefix;
   gd::String completion;
-  size_t replacementStartPosition = 0;
-  size_t replacementEndPosition = 0;
+  size_t replacementStartPosition;
+  size_t replacementEndPosition;
   gd::String objectName;
   gd::String behaviorName;
-  bool isExact = false;
-  bool isLastParameter = false;
-  const gd::ParameterMetadata* parameterMetadata = &badParameterMetadata;
-  const gd::ObjectConfiguration* objectConfiguration = &badObjectConfiguration;
+  bool isExact;
+  bool isLastParameter;
+  const gd::ParameterMetadata* parameterMetadata;
+  const gd::ObjectConfiguration* objectConfiguration;
 
   static const gd::ParameterMetadata badParameterMetadata;
   static const gd::ObjectConfiguration badObjectConfiguration;
@@ -1066,8 +1066,8 @@ class GD_CORE_API ExpressionCompletionFinder
       bool eagerlyCompleteIfExactMatch = false) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
-        [&](const gd::String &objectName,
-            const ObjectConfiguration *objectConfiguration) {
+        [&](const gd::String& objectName,
+            const ObjectConfiguration* objectConfiguration) {
           ExpressionCompletionDescription description(
               ExpressionCompletionDescription::Object,
               location.GetStartPosition(),
@@ -1077,7 +1077,7 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetType(type);
           completions.push_back(description);
         },
-        [&](const gd::String &variableName, const gd::Variable &variable) {
+        [&](const gd::String& variableName, const gd::Variable& variable) {
           ExpressionCompletionDescription description(
               ExpressionCompletionDescription::Variable,
               location.GetStartPosition(),
@@ -1095,29 +1095,23 @@ class GD_CORE_API ExpressionCompletionFinder
                 variable, variableName, location);
           }
         },
-        [&](const gd::NamedPropertyDescriptor &property) {
-          auto propertyType = gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-              property.GetType());
-          if (gd::ValueTypeMetadata::IsTypeValue("number", propertyType) ||
-              gd::ValueTypeMetadata::IsTypeValue("string", propertyType)) {
-            ExpressionCompletionDescription description(
-                ExpressionCompletionDescription::Property,
-                location.GetStartPosition(), location.GetEndPosition());
-            description.SetCompletion(property.GetName());
-            description.SetType(property.GetType());
-            completions.push_back(description);
-          }
+        [&](const gd::NamedPropertyDescriptor& property) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Property,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetCompletion(property.GetName());
+          description.SetType(property.GetType());
+          completions.push_back(description);
         },
-        [&](const gd::ParameterMetadata &parameter) {
-          if (parameter.GetValueTypeMetadata().IsNumber() ||
-              parameter.GetValueTypeMetadata().IsString()) {
-            ExpressionCompletionDescription description(
-                ExpressionCompletionDescription::Parameter,
-                location.GetStartPosition(), location.GetEndPosition());
-            description.SetCompletion(parameter.GetName());
-            description.SetType(parameter.GetType());
-            completions.push_back(description);
-          }
+        [&](const gd::ParameterMetadata& parameter) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Parameter,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetCompletion(parameter.GetName());
+          description.SetType(parameter.GetType());
+          completions.push_back(description);
         });
   }
 

Core/GDCore/IDE/Events/ExpressionNodeLocationFinder.h

@@ -33,10 +33,8 @@ class GD_CORE_API ExpressionNodeLocationFinder
    * \brief Initialize the finder to search at the specified position.
    */
   ExpressionNodeLocationFinder(size_t searchedPosition_)
-      : searchedPosition(searchedPosition_),
-        foundNode(nullptr),
-        parentNode(nullptr) {};
-  virtual ~ExpressionNodeLocationFinder() {};
+      : searchedPosition(searchedPosition_), foundNode(nullptr){};
+  virtual ~ExpressionNodeLocationFinder(){};
 
   /**
    * \brief Helper function to find the deepest node at the search position, if

Core/GDCore/IDE/Events/ExpressionTypeFinder.h

@@ -72,7 +72,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
         child(nullptr) {};
 
   const gd::String &GetType() {
-    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(type);
+    return gd::ParameterMetadata::GetExpressionValueType(type);
   };
 
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -68,26 +68,19 @@ size_t GetMaximumParametersNumber(
 
 bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
     const gd::IdentifierNode& identifier) {
-  return ValidateObjectVariableOrVariableOrProperty(identifier.identifierName, identifier.identifierNameLocation, identifier.childIdentifierName, identifier.childIdentifierNameLocation);
-}
-
-bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
-    const gd::String &identifierName,
-    const gd::ExpressionParserLocation identifierNameLocation,
-    const gd::String &childIdentifierName,
-    const gd::ExpressionParserLocation childIdentifierNameLocation) {
   auto validateVariableTypeForExpression =
-      [this, &identifierNameLocation](gd::Variable::Type type) {
+      [this, &identifier](gd::Variable::Type type) {
         // Collections type can't be used directly in expressions, a child
         // must be accessed.
         if (type == Variable::Structure) {
           RaiseTypeError(_("You need to specify the name of the child variable "
                            "to access. For example: `MyVariable.child`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
         } else if (type == Variable::Array) {
           RaiseTypeError(_("You need to specify the name of the child variable "
                            "to access. For example: `MyVariable[0]`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
+
         } else {
           // Number, string or boolean variables can be used in expressions.
           return;
@@ -103,41 +96,38 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
   // we consider this node will be of the type required by the parent.
   childType = parentType;
 
-  return projectScopedContainers.MatchIdentifierWithName<bool>(identifierName,
+  return projectScopedContainers.MatchIdentifierWithName<bool>(identifier.identifierName,
     [&]() {
       // This represents an object.
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("An object variable or expression should be entered."),
-                        identifierNameLocation);
+                        identifier.identifierNameLocation);
 
         return true; // We should have found a variable.
       }
 
-      auto variableExistence =
-          objectsContainersList.HasObjectOrGroupWithVariableNamed(
-              identifierName, childIdentifierName);
+      auto variableExistence = objectsContainersList.HasObjectOrGroupWithVariableNamed(identifier.identifierName, identifier.childIdentifierName);
 
       if (variableExistence == gd::ObjectsContainersList::DoesNotExist) {
         RaiseUndeclaredVariableError(_("This variable does not exist on this object or group."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::ExistsOnlyOnSomeObjectsOfTheGroup) {
         RaiseUndeclaredVariableError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::GroupIsEmpty) {
         RaiseUndeclaredVariableError(_("This group is empty. Add an object to this group first."),
-                        identifierNameLocation, childIdentifierName, identifierName);
+                        identifier.identifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
 
-      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(
-          identifierName, childIdentifierName);
+      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(identifier.identifierName, identifier.childIdentifierName);
       ReadChildTypeFromVariable(variableType);
 
       return true; // We found a variable.
@@ -147,9 +137,9 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       // Try to identify a declared variable with the name (and maybe the child
       // variable).
       const gd::Variable& variable =
-          variablesContainersList.Get(identifierName);
+          variablesContainersList.Get(identifier.identifierName);
 
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
         // Just the root variable is accessed, check it can be used in an
         // expression.
         validateVariableTypeForExpression(variable.GetType());
@@ -158,38 +148,33 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         return true; // We found a variable.
       } else {
         // A child variable is accessed, check it can be used in an expression.
-        if (!variable.HasChild(childIdentifierName)) {
+        if (!variable.HasChild(identifier.childIdentifierName)) {
           RaiseTypeError(_("No child variable with this name found."),
-                        childIdentifierNameLocation);
+                        identifier.childIdentifierNameLocation);
 
           return true; // We should have found a variable.
         }
 
         const gd::Variable& childVariable =
-            variable.GetChild(childIdentifierName);
+            variable.GetChild(identifier.childIdentifierName);
         ReadChildTypeFromVariable(childVariable.GetType());
         return true; // We found a variable.
       }
     }, [&]() {
       // This is a property.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("Accessing a child variable of a property is not possible - just write the property name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);
 
         return true; // We found a property, even if the child is not allowed.
       }
 
-      const gd::NamedPropertyDescriptor &property =
-          propertiesContainersList.Get(identifierName).second;
+      const gd::NamedPropertyDescriptor& property = propertiesContainersList.Get(identifier.identifierName).second;
 
       if (property.GetType() == "Number") {
-        childType = Type::Number;
+       childType = Type::Number;
       } else if (property.GetType() == "Boolean") {
-        // Nothing - we don't know the precise type (this could be used a string
-        // or as a number)
-      } else if (property.GetType() == "Behavior") {
-        RaiseTypeError(_("Behaviors can't be used as a value in expressions."),
-                       identifierNameLocation);
+        // Nothing - we don't know the precise type (this could be used a string or as a number)
       } else {
         // Assume type is String or equivalent.
         childType = Type::String;
@@ -198,14 +183,14 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       return true; // We found a property.
     }, [&]() {
       // This is a parameter.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("Accessing a child variable of a parameter is not possible - just write the parameter name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);
 
         return true; // We found a parameter, even if the child is not allowed.
       }
 
-      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifierName);
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifier.identifierName);
       const auto& valueTypeMetadata = parameter.GetValueTypeMetadata();
       if (valueTypeMetadata.IsNumber()) {
         childType = Type::Number;
@@ -215,7 +200,7 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         // Nothing - we don't know the precise type (this could be used as a string or as a number).
       } else {
         RaiseTypeError(_("This parameter is not a string, number or boolean - it can't be used in an expression."),
-            identifierNameLocation);
+            identifier.identifierNameLocation);
 
         return true; // We found a parameter, even though the type is incompatible.
       }

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -14,7 +14,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/VariablesContainersList.h"
-#include "GDCore/Project/VariablesContainer.h"
 
 namespace gd {
 class Expression;
@@ -43,12 +42,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                       const gd::String &extraInfo_ = "")
       : platform(platform_),
         projectScopedContainers(projectScopedContainers_),
-        parentType(StringToType(gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(rootType_))),
+        parentType(StringToType(gd::ParameterMetadata::GetExpressionValueType(rootType_))),
         childType(Type::Unknown),
         forbidsUsageOfBracketsBecauseParentIsObject(false),
-        currentParameterExtraInfo(&extraInfo_),
-        variableObjectName(),
-        variableObjectNameLocation() {};
+        currentParameterExtraInfo(&extraInfo_) {};
   virtual ~ExpressionValidator(){};
 
   /**
@@ -228,8 +225,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       projectScopedContainers.MatchIdentifierWithName<void>(node.name,
         [&]() {
           // This represents an object.
-          variableObjectName = node.name;
-          variableObjectNameLocation = node.nameLocation;
+
           // While understood by the parser, it's forbidden to use the bracket notation just after
           // an object name (`MyObject["MyVariable"]`).
           forbidsUsageOfBracketsBecauseParentIsObject = true;
@@ -268,13 +264,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
-    // TODO Also check child-variables existence on a path with only VariableAccessor to raise non-fatal errors.
-    if (!variableObjectName.empty()) {
-      ValidateObjectVariableOrVariableOrProperty(variableObjectName,
-                                                 variableObjectNameLocation,
-                                                 node.name, node.nameLocation);
-      variableObjectName = "";
-    }
+
     // In the case we accessed an object variable (`MyObject.MyVariable`),
     // brackets can now be used (`MyObject.MyVariable["MyChildVariable"]` is now valid).
     forbidsUsageOfBracketsBecauseParentIsObject = false;
@@ -287,7 +277,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       VariableBracketAccessorNode& node) override {
     ReportAnyError(node);
 
-    variableObjectName = "";
     if (forbidsUsageOfBracketsBecauseParentIsObject) {
       RaiseError(gd::ExpressionParserError::ErrorType::BracketsNotAllowedForObjects,
                  _("You can't use the brackets to access an object variable. "
@@ -380,11 +369,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   enum Type {Unknown = 0, Number, String, NumberOrString, Variable, LegacyVariable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
   bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
-  bool ValidateObjectVariableOrVariableOrProperty(
-      const gd::String &identifierName,
-      const gd::ExpressionParserLocation identifierNameLocation,
-      const gd::String &childIdentifierName,
-      const gd::ExpressionParserLocation childIdentifierNameLocation);
 
   void CheckVariableExistence(const ExpressionParserLocation &location, const gd::String& name) {
     if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
@@ -521,8 +505,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   Type childType; ///< The type "discovered" down the tree and passed up.
   Type parentType; ///< The type "required" by the top of the tree.
   bool forbidsUsageOfBracketsBecauseParentIsObject;
-  gd::String variableObjectName;
-  gd::ExpressionParserLocation variableObjectNameLocation;
   const gd::String *currentParameterExtraInfo;
   const gd::Platform &platform;
   const gd::ProjectScopedContainers &projectScopedContainers;

Core/GDCore/IDE/Events/ExpressionsParameterMover.h

@@ -74,8 +74,8 @@ class GD_CORE_API ExpressionsParameterMover
 
   const gd::Platform &platform;
   gd::String functionName;
-  std::size_t oldIndex = 0;
-  std::size_t newIndex = 0;
+  std::size_t oldIndex;
+  std::size_t newIndex;
   gd::String behaviorType;
   gd::String objectType;
 };

Core/GDCore/IDE/Events/LeaderboardIdRenamer.cpp

@@ -1,76 +0,0 @@
-#include "LeaderboardIdRenamer.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void LeaderboardIdRenamer::DoVisitObject(gd::Object &object) {
-  for (auto &pair : object.GetConfiguration().GetProperties()) {
-    auto &propertyName = pair.first;
-    auto &property = pair.second;
-    if (property.GetType() == "LeaderboardId") {
-      auto &leaderboardId = property.GetValue();
-
-      allLeaderboardIds.insert(leaderboardId);
-
-      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-        object.GetConfiguration().UpdateProperty(
-            propertyName, leaderboardIdMap[leaderboardId]);
-      }
-    }
-  }
-};
-
-void LeaderboardIdRenamer::DoVisitBehavior(gd::Behavior &behavior) {};
-
-bool LeaderboardIdRenamer::DoVisitInstruction(gd::Instruction &instruction,
-                                              bool isCondition) {
-  const gd::InstructionMetadata &instrInfo =
-      isCondition ? MetadataProvider::GetConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : MetadataProvider::GetActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-
-  for (int i = 0; i < instruction.GetParametersCount() &&
-                  i < instrInfo.GetParametersCount();
-       ++i) {
-    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
-
-    if (parameter.GetType() != "leaderboardId") {
-      continue;
-    }
-    const gd::String leaderboardIdExpression =
-        instruction.GetParameter(i).GetPlainString();
-    if (leaderboardIdExpression[0] != '"' ||
-        leaderboardIdExpression[leaderboardIdExpression.size() - 1] != '"') {
-      continue;
-    }
-    const gd::String leaderboardId =
-        leaderboardIdExpression.substr(1, leaderboardIdExpression.size() - 2);
-
-    allLeaderboardIds.insert(leaderboardId);
-
-    if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-      instruction.SetParameter(i,
-                               "\"" + leaderboardIdMap[leaderboardId] + "\"");
-    }
-  }
-  return false;
-}
-
-LeaderboardIdRenamer::~LeaderboardIdRenamer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/LeaderboardIdRenamer.h

@@ -1,50 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-#include <map>
-
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Object;
-class Behavior;
-}  // namespace gd
-
-namespace gd {
-
-class GD_CORE_API LeaderboardIdRenamer : public ArbitraryObjectsWorker, public ArbitraryEventsWorker {
- public:
-  LeaderboardIdRenamer(gd::Project& project_): project(project_) {};
-  virtual ~LeaderboardIdRenamer();
-
-  /**
-   * Set the leaderboard identifiers to be replaced.
-   */
-  void SetLeaderboardIdsToReplace(const std::map<gd::String, gd::String>& leaderboardIdMap_) {
-    leaderboardIdMap = leaderboardIdMap_;
-  }
-
-  /**
-   * Return the all the leaderboard identifiers found in the project.
-   */
-  const std::set<gd::String>& GetAllLeaderboardIds() const {
-    return allLeaderboardIds;
-  }
-
- private:
-  bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) override;
-  void DoVisitObject(gd::Object& object) override;
-  void DoVisitBehavior(gd::Behavior& behavior) override;
-
-  std::map<gd::String, gd::String> leaderboardIdMap;
-  std::set<gd::String> allLeaderboardIds;
-  gd::Project& project;
-};
-
-};  // namespace gd

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -24,16 +24,15 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputObjectsContainer) {
   // Functions scope for objects is defined according
-  // to parameters.
+  // to parameters
+  outputObjectsContainer.GetObjects().clear();
+  outputObjectsContainer.GetObjectGroups().Clear();
+
   auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
   gd::ParameterMetadataTools::ParametersToObjectsContainer(
       project,
       parameters,
       outputObjectsContainer);
-
-  // TODO: in theory we should ensure stability of the groups across calls
-  // to this function. BUT groups in functions should probably have never been
-  // supported, so we're phasing this out in the UI.
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
@@ -98,6 +97,26 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
                   "for the parent. ");
     return;
   }
+
+  gd::EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+      eventsBasedObject, outputObjectsContainer);
+}
+
+void EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+    const gd::EventsBasedObject& eventsBasedObject,
+    gd::ObjectsContainer& outputObjectsContainer) {
+  auto &children = eventsBasedObject.GetObjects().GetObjects();
+  for (auto &childObject : children) {
+    auto child = childObject.get();
+    outputObjectsContainer.InsertObject(
+        *child, outputObjectsContainer.GetObjectsCount());
+  }
+  auto &childrenGroups = eventsBasedObject.GetObjects().GetObjectGroups();
+  for (size_t index = 0; index < childrenGroups.Count(); ++index) {
+    auto &childGroup = childrenGroups.Get(index);
+    outputObjectsContainer.GetObjectGroups().Insert(
+        childGroup, outputObjectsContainer.GetObjectGroups().Count());
+  }
 }
 
 }  // namespace gd

Core/GDCore/IDE/EventsFunctionTools.h

@@ -68,5 +68,9 @@ class GD_CORE_API EventsFunctionTools {
       const gd::EventsBasedObject& eventsBasedObject,
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputObjectsContainer);
+
+  static void CopyEventsBasedObjectChildrenToObjectsContainer(
+      const gd::EventsBasedObject &eventsBasedObject,
+      gd::ObjectsContainer &outputObjectsContainer);
 };
 }  // namespace gd

Core/GDCore/IDE/ExportedDependencyResolver.h

@@ -4,7 +4,6 @@
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Extensions/Platform.h"
 
 namespace gd {
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -293,7 +293,7 @@ void ResourceWorkerInObjectsWorker::DoVisitObject(gd::Object &object) {
 };
 
 void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
-  behavior.ExposeResources(worker);
+    // TODO Allow behaviors to expose resources
 };
 
 gd::ResourceWorkerInObjectsWorker

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -170,8 +170,7 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
     gd::ArbitraryEventsWorkerWithContext &worker) {
     // Add (free) events functions
     for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      gd::ObjectsContainer parameterObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parameterObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForFreeEventsFunction(
               project, eventsFunctionsExtension, *eventsFunction,
@@ -210,8 +209,7 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
   auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
   for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
 
-    gd::ObjectsContainer parameterObjectsContainers(
-        gd::ObjectsContainer::SourceType::Function);
+    gd::ObjectsContainer parameterObjectsContainers;
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForBehaviorEventsFunction(
             project, eventsFunctionsExtension, eventsBasedBehavior,
@@ -238,8 +236,7 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
   auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
   for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
 
-    gd::ObjectsContainer parameterObjectsContainers(
-        gd::ObjectsContainer::SourceType::Function);
+    gd::ObjectsContainer parameterObjectsContainers;
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForObjectEventsFunction(
             project, eventsFunctionsExtension, eventsBasedObject,

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -247,7 +247,7 @@ bool PropertyFunctionGenerator::CanGenerateGetterAndSetter(
     const gd::NamedPropertyDescriptor &property) {
   auto &type = property.GetType();
   if (type != "Boolean" && type != "Number" && type != "String" &&
-      type != "Choice" && type != "Color" && type != "LeaderboardId") {
+      type != "Choice" && type != "Color") {
     return false;
   }
 

Core/GDCore/IDE/ResourceExposer.cpp

@@ -6,9 +6,17 @@
 #include "ResourceExposer.h"
 
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/Effect.h"
@@ -16,6 +24,7 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
+#include "GDCore/IDE/Events/UsedExtensionsFinder.h"
 
 namespace gd {
 

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -13,7 +13,6 @@
 #include "GDCore/IDE/DependenciesAnalyzer.h"
 #include "GDCore/IDE/GroupVariableHelper.h"
 #include "GDCore/IDE/EventBasedBehaviorBrowser.h"
-#include "GDCore/IDE/EventBasedObjectBrowser.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Events/BehaviorParametersFiller.h"
 #include "GDCore/IDE/Events/BehaviorTypeRenamer.h"
@@ -28,8 +27,12 @@
 #include "GDCore/IDE/Events/InstructionsParameterMover.h"
 #include "GDCore/IDE/Events/InstructionsTypeRenamer.h"
 #include "GDCore/IDE/Events/LinkEventTargetRenamer.h"
-#include "GDCore/IDE/Events/LeaderboardIdRenamer.h"
 #include "GDCore/IDE/Events/ProjectElementRenamer.h"
+#include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/IDE/Project/BehaviorObjectTypeRenamer.h"
 #include "GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.h"
 #include "GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.h"
@@ -412,32 +415,20 @@ void WholeProjectRefactorer::UpdateExtensionNameInEventsBasedBehavior(
     const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     gd::EventsBasedBehavior &eventsBasedBehavior,
     const gd::String &sourceExtensionName) {
-  const EventBasedBehaviorBrowser eventBasedBehaviorBrowser(
+  const EventBasedBehaviorBrowser eventBasedBehaviorExposer(
       eventsFunctionsExtension, eventsBasedBehavior);
   WholeProjectRefactorer::RenameEventsFunctionsExtension(
       project, eventsFunctionsExtension, sourceExtensionName,
-      eventsFunctionsExtension.GetName(), eventBasedBehaviorBrowser);
-}
-
-void WholeProjectRefactorer::UpdateExtensionNameInEventsBasedObject(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    gd::EventsBasedObject &eventsBasedObject,
-    const gd::String &sourceExtensionName) {
-  const EventBasedObjectBrowser eventBasedObjectBrowser(
-      eventsFunctionsExtension, eventsBasedObject);
-  WholeProjectRefactorer::RenameEventsFunctionsExtension(
-      project, eventsFunctionsExtension, sourceExtensionName,
-      eventsFunctionsExtension.GetName(), eventBasedObjectBrowser);
+      eventsFunctionsExtension.GetName(), eventBasedBehaviorExposer);
 }
 
 void WholeProjectRefactorer::RenameEventsFunctionsExtension(
     gd::Project &project,
     const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     const gd::String &oldName, const gd::String &newName) {
-  const WholeProjectBrowser wholeProjectBrowser;
+  const WholeProjectBrowser wholeProjectExposer;
   RenameEventsFunctionsExtension(project, eventsFunctionsExtension, oldName,
-                                 newName, wholeProjectBrowser);
+                                 newName, wholeProjectExposer);
 }
 
 void WholeProjectRefactorer::RenameEventsFunctionsExtension(
@@ -950,8 +941,6 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
     // Order is important: we first rename the expressions then the
     // instructions, to avoid being unable to fetch the metadata (the types of
     // parameters) of instructions after they are renamed.
-
-    // Rename legacy expressions like: Object.Behavior::PropertyMyPropertyName()
     gd::ExpressionsRenamer expressionRenamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     expressionRenamer.SetReplacedBehaviorExpression(
@@ -961,16 +950,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
         EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
     gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-    // Rename property names directly used as an identifier.
     std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
         {oldPropertyName, newPropertyName}};
     std::unordered_set<gd::String> removedPropertyNames;
     gd::EventsPropertyReplacer eventsPropertyReplacer(
         project.GetCurrentPlatform(), properties, oldToNewPropertyNames,
         removedPropertyNames);
-    gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-        project, eventsFunctionsExtension, eventsBasedBehavior,
-        eventsPropertyReplacer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                  eventsPropertyReplacer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1025,8 +1012,6 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
     // Order is important: we first rename the expressions then the
     // instructions, to avoid being unable to fetch the metadata (the types of
     // parameters) of instructions after they are renamed.
-
-    // Rename legacy expressions like: Object.Behavior::SharedPropertyMyPropertyName()
     gd::ExpressionsRenamer expressionRenamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     expressionRenamer.SetReplacedBehaviorExpression(
@@ -1036,16 +1021,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
         EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName));
     gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-    // Rename property names directly used as an identifier.
     std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
         {oldPropertyName, newPropertyName}};
     std::unordered_set<gd::String> removedPropertyNames;
     gd::EventsPropertyReplacer eventsPropertyReplacer(
         project.GetCurrentPlatform(), properties, oldToNewPropertyNames,
         removedPropertyNames);
-    gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-        project, eventsFunctionsExtension, eventsBasedBehavior,
-        eventsPropertyReplacer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                  eventsPropertyReplacer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1086,8 +1069,6 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
   // Order is important: we first rename the expressions then the
   // instructions, to avoid being unable to fetch the metadata (the types of
   // parameters) of instructions after they are renamed.
-
-  // Rename legacy expressions like: Object.PropertyMyPropertyName()
   gd::ExpressionsRenamer expressionRenamer =
       gd::ExpressionsRenamer(project.GetCurrentPlatform());
   expressionRenamer.SetReplacedObjectExpression(
@@ -1097,16 +1078,14 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
       EventsBasedObject::GetPropertyExpressionName(newPropertyName));
   gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-  // Rename property names directly used as an identifier.
   std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
       {oldPropertyName, newPropertyName}};
   std::unordered_set<gd::String> removedPropertyNames;
   gd::EventsPropertyReplacer eventsPropertyReplacer(
       project.GetCurrentPlatform(), properties, oldToNewPropertyNames,
       removedPropertyNames);
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject,
-      eventsPropertyReplacer);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                eventsPropertyReplacer);
 
   gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
       project,
@@ -1333,19 +1312,6 @@ bool WholeProjectRefactorer::FixInvalidRequiredBehaviorProperties(
   return !invalidRequiredBehaviorProblems.empty();
 }
 
-void WholeProjectRefactorer::UpdateBehaviorNameInEventsBasedBehavior(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::String &sourceBehaviorName) {
-  const EventBasedBehaviorBrowser eventBasedBehaviorExposer(
-      eventsFunctionsExtension, eventsBasedBehavior);
-  WholeProjectRefactorer::RenameEventsBasedBehavior(
-      project, eventsFunctionsExtension, eventsBasedBehavior,
-      sourceBehaviorName, eventsBasedBehavior.GetName(),
-      eventBasedBehaviorExposer);
-}
-
 void WholeProjectRefactorer::RenameEventsBasedBehavior(
     gd::Project &project,
     const gd::EventsFunctionsExtension &eventsFunctionsExtension,
@@ -1358,22 +1324,10 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
     return;
   }
   auto &eventsBasedBehavior = eventsBasedBehaviors.Get(oldBehaviorName);
-  const WholeProjectBrowser projectBrowser;
-  WholeProjectRefactorer::RenameEventsBasedBehavior(
-      project, eventsFunctionsExtension, eventsBasedBehavior, oldBehaviorName,
-      newBehaviorName, projectBrowser);
-}
 
-void WholeProjectRefactorer::RenameEventsBasedBehavior(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::String &oldBehaviorName,
-    const gd::String &newBehaviorName,
-    const gd::ProjectBrowser &projectBrowser) {
   auto renameBehaviorEventsFunction =
       [&project, &eventsFunctionsExtension, &oldBehaviorName,
-       &newBehaviorName, &projectBrowser](const gd::EventsFunction &eventsFunction) {
+       &newBehaviorName](const gd::EventsFunction &eventsFunction) {
         if (eventsFunction.IsExpression()) {
           // Nothing to do, expressions are not including the name of the
           // behavior
@@ -1387,12 +1341,12 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
               gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(), newBehaviorName,
                   eventsFunction.GetName()));
-          projectBrowser.ExposeEvents(project, renamer);
+          gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
         }
       };
 
   auto renameBehaviorProperty = [&project, &eventsFunctionsExtension,
-                                 &oldBehaviorName, &newBehaviorName, &projectBrowser](
+                                 &oldBehaviorName, &newBehaviorName](
                                     const gd::NamedPropertyDescriptor
                                         &property) {
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
@@ -1403,7 +1357,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
         gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(), newBehaviorName,
             EventsBasedBehavior::GetPropertyActionName(property.GetName())));
-    projectBrowser.ExposeEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1413,7 +1367,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
         gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(), newBehaviorName,
             EventsBasedBehavior::GetPropertyConditionName(property.GetName())));
-    projectBrowser.ExposeEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 
     // Nothing to do for expression, expressions are not including the name of
     // the behavior
@@ -1421,7 +1375,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
 
   auto renameBehaviorSharedProperty =
       [&project, &eventsFunctionsExtension, &oldBehaviorName,
-       &newBehaviorName, &projectBrowser](const gd::NamedPropertyDescriptor &property) {
+       &newBehaviorName](const gd::NamedPropertyDescriptor &property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
             project,
             gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
@@ -1432,7 +1386,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
                 eventsFunctionsExtension.GetName(), newBehaviorName,
                 EventsBasedBehavior::GetSharedPropertyActionName(
                     property.GetName())));
-        projectBrowser.ExposeEvents(project, actionRenamer);
+        gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
@@ -1445,7 +1399,8 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
                     eventsFunctionsExtension.GetName(), newBehaviorName,
                     EventsBasedBehavior::GetSharedPropertyConditionName(
                         property.GetName())));
-        projectBrowser.ExposeEvents(project, conditionRenamer);
+        gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                      conditionRenamer);
 
         // Nothing to do for expression, expressions are not including the name
         // of the behavior
@@ -1480,25 +1435,13 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
     renameBehaviorSharedProperty(*property);
   }
 
+  const WholeProjectBrowser wholeProjectExposer;
   DoRenameBehavior(project,
                    gd::PlatformExtension::GetBehaviorFullType(
                        eventsFunctionsExtension.GetName(), oldBehaviorName),
                    gd::PlatformExtension::GetBehaviorFullType(
                        eventsFunctionsExtension.GetName(), newBehaviorName),
-                   projectBrowser);
-}
-
-void WholeProjectRefactorer::UpdateObjectNameInEventsBasedObject(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    gd::EventsBasedObject &eventsBasedObject,
-    const gd::String &sourceObjectName) {
-  const EventBasedObjectBrowser eventBasedObjectBrowser(
-      eventsFunctionsExtension, eventsBasedObject);
-  WholeProjectRefactorer::RenameEventsBasedObject(
-      project, eventsFunctionsExtension, eventsBasedObject,
-      sourceObjectName, eventsBasedObject.GetName(),
-      eventBasedObjectBrowser);
+                   wholeProjectExposer);
 }
 
 void WholeProjectRefactorer::RenameEventsBasedObject(
@@ -1512,21 +1455,10 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
     return;
   }
   auto &eventsBasedObject = eventsBasedObjects.Get(oldObjectName);
-  const WholeProjectBrowser projectBrowser;
-  WholeProjectRefactorer::RenameEventsBasedObject(
-      project, eventsFunctionsExtension, eventsBasedObject, oldObjectName,
-      newObjectName, projectBrowser);
-}
 
-void WholeProjectRefactorer::RenameEventsBasedObject(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    const gd::String &oldObjectName, const gd::String &newObjectName,
-    const gd::ProjectBrowser &projectBrowser) {
   auto renameObjectEventsFunction =
-      [&project, &eventsFunctionsExtension, &oldObjectName, &newObjectName,
-       &projectBrowser](const gd::EventsFunction &eventsFunction) {
+      [&project, &eventsFunctionsExtension, &oldObjectName,
+       &newObjectName](const gd::EventsFunction &eventsFunction) {
         if (eventsFunction.IsExpression()) {
           // Nothing to do, expressions are not including the name of the
           // object
@@ -1540,12 +1472,12 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
               gd::PlatformExtension::GetObjectEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(), newObjectName,
                   eventsFunction.GetName()));
-          projectBrowser.ExposeEvents(project, renamer);
+          gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
         }
       };
 
   auto renameObjectProperty = [&project, &eventsFunctionsExtension,
-                               &oldObjectName, &newObjectName, &projectBrowser](
+                               &oldObjectName, &newObjectName](
                                   const gd::NamedPropertyDescriptor &property) {
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1555,7 +1487,7 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
         gd::PlatformExtension::GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(), newObjectName,
             EventsBasedObject::GetPropertyActionName(property.GetName())));
-    projectBrowser.ExposeEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1565,7 +1497,7 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
         gd::PlatformExtension::GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(), newObjectName,
             EventsBasedObject::GetPropertyConditionName(property.GetName())));
-    projectBrowser.ExposeEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 
     // Nothing to do for expression, expressions are not including the name of
     // the object
@@ -1596,12 +1528,13 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
     renameObjectProperty(*property);
   }
 
+  const WholeProjectBrowser wholeProjectExposer;
   DoRenameObject(project,
                  gd::PlatformExtension::GetObjectFullType(
                      eventsFunctionsExtension.GetName(), oldObjectName),
                  gd::PlatformExtension::GetObjectFullType(
                      eventsFunctionsExtension.GetName(), newObjectName),
-                 projectBrowser);
+                 wholeProjectExposer);
 }
 
 void WholeProjectRefactorer::DoRenameEventsFunction(
@@ -2157,23 +2090,4 @@ std::vector<gd::String> WholeProjectRefactorer::GetAssociatedExternalEvents(
   return results;
 }
 
-void WholeProjectRefactorer::RenameLeaderboards(
-    gd::Project &project,
-    const std::map<gd::String, gd::String> &leaderboardIdMap) {
-  gd::LeaderboardIdRenamer leaderboardIdRenamer(project);
-  leaderboardIdRenamer.SetLeaderboardIdsToReplace(leaderboardIdMap);
-
-  gd::ProjectBrowserHelper::ExposeProjectEvents(project, leaderboardIdRenamer);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, leaderboardIdRenamer);
-}
-
-std::set<gd::String> WholeProjectRefactorer::FindAllLeaderboardIds(gd::Project &project) {
-  gd::LeaderboardIdRenamer leaderboardIdRenamer(project);
-
-  gd::ProjectBrowserHelper::ExposeProjectEvents(project, leaderboardIdRenamer);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, leaderboardIdRenamer);
-
-  return leaderboardIdRenamer.GetAllLeaderboardIds();
-}
-
 } // namespace gd

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -27,7 +27,14 @@ class ObjectsContainer;
 class VariablesContainer;
 class EventsBasedBehavior;
 class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
 class Behavior;
+class BehaviorMetadata;
 class UnfilledRequiredBehaviorPropertyProblem;
 class ProjectBrowser;
 class SerializerElement;
@@ -114,24 +121,14 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& newName);
 
   /**
-   * \brief Refactor behavior events after the behavior has been placed in a new
+   * \brief Refactor behavior events after the extension was placed in a new
    * extension.
    */
   static void UpdateExtensionNameInEventsBasedBehavior(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::String &sourceExtensionName);
-
-  /**
-   * \brief Refactor object events after the object has been placed in a new
-   * extension.
-   */
-  static void UpdateExtensionNameInEventsBasedObject(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      gd::EventsBasedObject &eventsBasedObject,
-      const gd::String &sourceExtensionName);
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      gd::EventsBasedBehavior& eventsBasedBehavior,
+      const gd::String& sourceExtensionName);
 
   /**
    * \brief Refactor the project **before** an events function is renamed.
@@ -327,16 +324,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldBehaviorName,
       const gd::String& newBehaviorName);
 
-  /**
-   * \brief Refactor events-based behavior events after the events-based
-   * behavior has been duplicated.
-   */
-  static void UpdateBehaviorNameInEventsBasedBehavior(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::String &sourceBehaviorName);
-
   /**
    * \brief Refactor the project **before** an object is renamed.
    *
@@ -350,16 +337,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldObjectName,
       const gd::String& newObjectName);
 
-  /**
-   * \brief Refactor events-based object events after the events-based object
-   * has been duplicated.
-   */
-  static void UpdateObjectNameInEventsBasedObject(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      gd::EventsBasedObject &eventsBasedObject,
-      const gd::String &sourceObjectName);
-
   /**
    * \brief Refactor the project after a layout is renamed.
    */
@@ -627,18 +604,6 @@ class GD_CORE_API WholeProjectRefactorer {
                                  const gd::String &originLayerName,
                                  const gd::String &targetLayerName);
 
-  /**
-   * \brief Replace the leaderboard ids in the whole project.
-   */
-  static void
-  RenameLeaderboards(gd::Project &project,
-                     const std::map<gd::String, gd::String> &leaderboardIdMap);
-
-  /**
-   * \brief Find all the leaderboard identifiers in the whole project.
-   */
-  static std::set<gd::String> FindAllLeaderboardIds(gd::Project &project);
-
   /**
    * \brief Return the number of instances on the layer named \a layerName and
    * all its associated layouts.
@@ -689,35 +654,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& newName,
       const gd::ProjectBrowser& projectBrowser);
 
-  /**
-   * \brief Refactor the project **before** a behavior is renamed.
-   *
-   * \warning Do the renaming of the specified behavior after calling this.
-   * This is because the behavior is expected to have its old name for the
-   * refactoring.
-   */
-  static void RenameEventsBasedBehavior(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::String &oldBehaviorName,
-      const gd::String &newBehaviorName,
-      const gd::ProjectBrowser &projectBrowser);
-
-  /**
-   * \brief Refactor the project **before** an object is renamed.
-   *
-   * \warning Do the renaming of the specified object after calling this.
-   * This is because the object is expected to have its old name for the
-   * refactoring.
-   */
-  static void RenameEventsBasedObject(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::String &oldObjectName, const gd::String &newObjectName,
-      const gd::ProjectBrowser &projectBrowser);
-
   static void FindDependentBehaviorNames(
       const gd::Project& project,
       const gd::Object& object,

Core/GDCore/Project/BehaviorConfigurationContainer.cpp

@@ -6,7 +6,6 @@
 #include "GDCore/Project/BehaviorConfigurationContainer.h"
 #include <iostream>
 #include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 
 namespace gd {
 
@@ -23,48 +22,4 @@ std::map<gd::String, gd::PropertyDescriptor> BehaviorConfigurationContainer::Get
   return nothing;
 }
 
-void BehaviorConfigurationContainer::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
-
-  for (auto& property : properties) {
-    const String& propertyName = property.first;
-    const gd::PropertyDescriptor& propertyDescriptor = property.second;
-
-    if (propertyDescriptor.GetType().LowerCase() == "resource") {
-      auto& extraInfo = propertyDescriptor.GetExtraInfo();
-      const gd::String& resourceType = extraInfo.empty() ? "" : extraInfo[0];
-      const gd::String& oldPropertyValue = propertyDescriptor.GetValue();
-
-      gd::String newPropertyValue = oldPropertyValue;
-      if (resourceType == "image") {
-        worker.ExposeImage(newPropertyValue);
-      } else if (resourceType == "audio") {
-        worker.ExposeAudio(newPropertyValue);
-      } else if (resourceType == "font") {
-        worker.ExposeFont(newPropertyValue);
-      } else if (resourceType == "video") {
-        worker.ExposeVideo(newPropertyValue);
-      } else if (resourceType == "json") {
-        worker.ExposeJson(newPropertyValue);
-      } else if (resourceType == "tilemap") {
-        worker.ExposeTilemap(newPropertyValue);
-      } else if (resourceType == "tileset") {
-        worker.ExposeTileset(newPropertyValue);
-      } else if (resourceType == "bitmapFont") {
-        worker.ExposeBitmapFont(newPropertyValue);
-      } else if (resourceType == "model3D") {
-        worker.ExposeModel3D(newPropertyValue);
-      } else if (resourceType == "atlas") {
-        worker.ExposeAtlas(newPropertyValue);
-      } else if (resourceType == "spine") {
-        worker.ExposeSpine(newPropertyValue);
-      }
-
-      if (newPropertyValue != oldPropertyValue) {
-        UpdateProperty(propertyName, newPropertyValue);
-      }
-    }
-  }
-}
-
 }  // namespace gd

Core/GDCore/Project/BehaviorConfigurationContainer.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
+#define GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
 
 #include <map>
 #include <memory>
@@ -18,7 +19,6 @@ class PropertyDescriptor;
 class SerializerElement;
 class Project;
 class Layout;
-class ArbitraryResourceWorker;
 }  // namespace gd
 
 namespace gd {
@@ -158,18 +158,6 @@ class GD_CORE_API BehaviorConfigurationContainer {
     return propertiesQuickCustomizationVisibilities;
   }
 
-  /**
-   * \brief Called ( e.g. during compilation ) so as to inventory internal
-   * resources and sometimes update their filename. Implementation example:
-   * \code
-   * worker.ExposeImage(myImage);
-   * worker.ExposeFile(myResourceFile);
-   * \endcode
-   *
-   * \see ArbitraryResourceWorker
-   */
-  void ExposeResources(gd::ArbitraryResourceWorker& worker);
-
  protected:
   /**
    * \brief Called when the IDE wants to know about the custom properties of the
@@ -221,3 +209,5 @@ class GD_CORE_API BehaviorConfigurationContainer {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -26,7 +26,7 @@ void CustomConfigurationHelper::InitializeContent(
 
     if (propertyType == "String" || propertyType == "Choice" ||
         propertyType == "Color" || propertyType == "Behavior" ||
-        propertyType == "Resource" || propertyType == "LeaderboardId") {
+        propertyType == "Resource") {
       element.SetStringValue(property->GetValue());
     } else if (propertyType == "Number") {
       element.SetDoubleValue(property->GetValue().To<double>());
@@ -53,7 +53,7 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
     if (configurationContent.HasChild(propertyName)) {
       if (propertyType == "String" || propertyType == "Choice" ||
           propertyType == "Color" || propertyType == "Behavior" ||
-          propertyType == "Resource" || propertyType == "LeaderboardId") {
+          propertyType == "Resource") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
       } else if (propertyType == "Number") {
@@ -89,7 +89,7 @@ bool CustomConfigurationHelper::UpdateProperty(
 
   if (propertyType == "String" || propertyType == "Choice" ||
       propertyType == "Color" || propertyType == "Behavior" ||
-      propertyType == "Resource" || propertyType == "LeaderboardId") {
+      propertyType == "Resource") {
     element.SetStringValue(newValue);
   } else if (propertyType == "Number") {
     element.SetDoubleValue(newValue.To<double>());

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -72,7 +72,7 @@ gd::ObjectConfiguration &CustomObjectConfiguration::GetChildObjectConfiguration(
   }
 
   if (!eventsBasedObject->GetObjects().HasObjectNamed(objectName)) {
-    gd::LogError("Tried to get the configuration of a child-object: " + objectName
+    gd::LogError("Tried to get the configuration of a child-object:" + objectName
                 + " that doesn't exist in the event-based object: " + GetType());
     return badObjectConfiguration;
   }
@@ -158,9 +158,7 @@ bool CustomObjectConfiguration::UpdateInitialInstanceProperty(
 void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const {
   element.AddChild("content") = objectContent;
 
-  const auto *eventsBasedObject = GetEventsBasedObject();
-  if (!animations.HasNoAnimations() ||
-      (eventsBasedObject && eventsBasedObject->IsAnimatable())) {
+  if (!animations.HasNoAnimations()) {
     auto &animatableElement = element.AddChild("animatable");
     animations.SerializeTo(animatableElement);
   }
@@ -204,8 +202,8 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
 
   for (auto& property : properties) {
     const String& propertyName = property.first;
-    const gd::PropertyDescriptor &propertyDescriptor = property.second;
-    if (propertyDescriptor.GetType().LowerCase() == "resource") {
+    const gd::PropertyDescriptor& propertyDescriptor = property.second;
+    if (propertyDescriptor.GetType() == "resource") {
       auto& extraInfo = propertyDescriptor.GetExtraInfo();
       const gd::String& resourceType = extraInfo.empty() ? "" : extraInfo[0];
       const gd::String& oldPropertyValue = propertyDescriptor.GetValue();

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -140,12 +140,12 @@ protected:
 
   bool IsOverridingEventsBasedObjectChildrenConfiguration() const;
 
-  const Project* project = nullptr; ///< The project is used to get the
-                                    ///< EventBasedObject from the fullType.
+  const Project* project; ///< The project is used to get the
+                          ///< EventBasedObject from the fullType.
   gd::SerializerElement objectContent;
   std::unordered_set<gd::String> unfoldedChildren;
 
-  bool isMarkedAsOverridingEventsBasedObjectChildrenConfiguration = false;
+  bool isMarkedAsOverridingEventsBasedObjectChildrenConfiguration;
   mutable std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;
 
   static gd::ObjectConfiguration badObjectConfiguration;

Core/GDCore/Project/EventsBasedObject.cpp

@@ -23,8 +23,7 @@ EventsBasedObject::EventsBasedObject()
     areaMinZ(0),
     areaMaxX(64),
     areaMaxY(64),
-    areaMaxZ(64),
-    objectsContainer(gd::ObjectsContainer::SourceType::Object) {
+    areaMaxZ(64) {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
@@ -91,7 +90,7 @@ void EventsBasedObject::UnserializeFrom(gd::Project& project,
   }
 
   initialInstances.UnserializeFrom(element.GetChild("instances"));
-  if (element.HasChild("isUsingLegacyInstancesRenderer")) {
+  if (element.HasAttribute("isUsingLegacyInstancesRenderer")) {
     isUsingLegacyInstancesRenderer =
         element.GetBoolAttribute("isUsingLegacyInstancesRenderer", false);
   }

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -10,7 +10,6 @@
 #include "EventsFunction.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/MakeUnique.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 
 namespace gd {
 
@@ -99,11 +98,8 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
 
 void EventsFunctionsExtension::UnserializeFrom(
     gd::Project& project, const SerializerElement& element) {
-  // Unserialize first the "declaration" (everything but objects content)
-  // so that objects can be then unserialized in proper order (they can depend
-  // on each others)
-  UnserializeExtensionDeclarationFrom(project, element);
-  UnserializeExtensionImplementationFrom(project, element);
+      UnserializeExtensionDeclarationFrom(project, element);
+      UnserializeExtensionImplementationFrom(project, element);
 }
 
 void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
@@ -166,7 +162,6 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
   // As event based objects can contains objects using CustomBehavior and/or
   // CustomObject, this allows them to reference EventBasedBehavior and
   // EventBasedObject respectively.
-  eventsBasedBehaviors.Clear();
   auto &behaviorsElement = element.GetChild("eventsBasedBehaviors");
   behaviorsElement.ConsiderAsArrayOf("eventsBasedBehavior");
   for (std::size_t i = 0; i < behaviorsElement.GetChildrenCount(); ++i) {
@@ -174,7 +169,6 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
         behaviorsElement.GetChild(i).GetStringAttribute("name");
     eventsBasedBehaviors.InsertNew(behaviorName, eventsBasedBehaviors.GetCount());
   }
-  eventsBasedObjects.Clear();
   auto &objectsElement = element.GetChild("eventsBasedObjects");
   objectsElement.ConsiderAsArrayOf("eventsBasedObject");
   for (std::size_t i = 0; i < objectsElement.GetChildrenCount(); ++i) {
@@ -191,93 +185,11 @@ void EventsFunctionsExtension::UnserializeExtensionImplementationFrom(
   eventsBasedBehaviors.UnserializeElementsFrom(
       "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));
 
-  auto &eventsBasedObjectsElement = element.GetChild("eventsBasedObjects");
-  eventsBasedObjectsElement.ConsiderAsArrayOf("eventsBasedObject");
-  for (gd::String &eventsBasedObjectName :
-       GetUnserializingOrderEventsBasedObjectNames(eventsBasedObjectsElement)) {
-    size_t extensionIndex = eventsBasedObjects.GetPosition(
-        eventsBasedObjects.Get(eventsBasedObjectName));
-    const SerializerElement &eventsBasedObjectElement =
-        eventsBasedObjectsElement.GetChild(extensionIndex);
-
-    eventsBasedObjects.at(extensionIndex)
-        .UnserializeFrom(project, eventsBasedObjectElement);
-  }
-}
-
-std::vector<gd::String>
-EventsFunctionsExtension::GetUnserializingOrderEventsBasedObjectNames(
-    const gd::SerializerElement &eventsBasedObjectsElement) {
-
-  // Child-objects need the event-based objects they use to be loaded completely
-  // before they are unserialized.
-
-  // At the beginning, everything is yet to be loaded.
-  std::vector<gd::String> remainingEventsBasedObjectNames(
-      eventsBasedObjects.size());
-  for (std::size_t i = 0; i < eventsBasedObjects.size(); ++i) {
-    remainingEventsBasedObjectNames[i] = eventsBasedObjects.at(i).GetName();
-  }
-
-  // Helper allowing to find if an object depends on at least one other object from
-  // the extension that is not loaded yet.
-  auto &extensionName = name;
-  auto isDependentFromRemainingEventsBasedObjects =
-      [&remainingEventsBasedObjectNames,
-       &extensionName](const gd::SerializerElement &eventsBasedObjectElement) {
-        auto &objectsElement = eventsBasedObjectElement.GetChild("objects");
-        objectsElement.ConsiderAsArrayOf("object");
-
-        for (std::size_t objectIndex = 0;
-             objectIndex < objectsElement.GetChildrenCount(); ++objectIndex) {
-          const gd::String &objectType =
-              objectsElement.GetChild(objectIndex).GetStringAttribute("type");
-
-          gd::String usedExtensionName =
-              PlatformExtension::GetExtensionFromFullObjectType(objectType);
-          if (usedExtensionName != extensionName) {
-            // The object comes from another extension: the project is already responsible
-            // for loading extensions in the proper order.
-            continue;
-          }
-          gd::String eventsBasedObjectName =
-              gd::PlatformExtension::GetObjectNameFromFullObjectType(
-                  objectType);
-
-          if (std::find(remainingEventsBasedObjectNames.begin(),
-                        remainingEventsBasedObjectNames.end(),
-                        eventsBasedObjectName) !=
-              remainingEventsBasedObjectNames.end()) {
-            return true;
-          }
-        }
-        return false;
-      };
-
-  // Find the order of loading so that the objects are loaded when all the objects
-  // they depend on are already loaded.
-  std::vector<gd::String> loadOrderEventsBasedObjectNames;
-  bool foundAnyEventsBasedObject = true;
-  while (foundAnyEventsBasedObject) {
-    foundAnyEventsBasedObject = false;
-    for (std::size_t i = 0; i < remainingEventsBasedObjectNames.size(); ++i) {
-      auto eventsBasedObjectName = remainingEventsBasedObjectNames[i];
-      size_t extensionIndex = eventsBasedObjects.GetPosition(
-          eventsBasedObjects.Get(eventsBasedObjectName));
-      const SerializerElement &eventsBasedObjectElement =
-          eventsBasedObjectsElement.GetChild(extensionIndex);
-
-      if (!isDependentFromRemainingEventsBasedObjects(
-              eventsBasedObjectElement)) {
-        loadOrderEventsBasedObjectNames.push_back(eventsBasedObjectName);
-        remainingEventsBasedObjectNames.erase(
-            remainingEventsBasedObjectNames.begin() + i);
-        i--;
-        foundAnyEventsBasedObject = true;
-      }
-    }
-  }
-  return loadOrderEventsBasedObjectNames;
+  // It's important to load the objects without erasing them first as each object
+  // might reference other objects, and so need to know if a custom object exists
+  // in the project or not.
+  eventsBasedObjects.ProgressivelyUnserializeElementsFrom(
+      "eventsBasedObject", project, element.GetChild("eventsBasedObjects"));
 }
 
 bool EventsFunctionsExtension::IsExtensionLifecycleEventsFunction(

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -314,9 +314,6 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
     return dependency;
   }
 
-  std::vector<gd::String> GetUnserializingOrderEventsBasedObjectNames(
-    const gd::SerializerElement &eventsBasedObjectsElement);
-
   gd::String version;
   gd::String extensionNamespace;
   gd::String shortDescription;

Core/GDCore/Project/ExternalEvents.cpp

@@ -7,7 +7,7 @@
 
 namespace gd {
 
-ExternalEvents::ExternalEvents() {
+ExternalEvents::ExternalEvents() : lastChangeTimeStamp(0) {
   // ctor
 }
 
@@ -24,12 +24,14 @@ ExternalEvents& ExternalEvents::operator=(const ExternalEvents& rhs) {
 void ExternalEvents::Init(const ExternalEvents& externalEvents) {
   name = externalEvents.GetName();
   associatedScene = externalEvents.GetAssociatedLayout();
+  lastChangeTimeStamp = externalEvents.GetLastChangeTimeStamp();
   events = externalEvents.events;
 }
 
 void ExternalEvents::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("associatedLayout", associatedScene);
+  element.SetAttribute("lastChangeTimeStamp", (int)lastChangeTimeStamp);
   gd::EventsListSerialization::SerializeEventsTo(events,
                                                  element.AddChild("events"));
 }
@@ -39,6 +41,8 @@ void ExternalEvents::UnserializeFrom(gd::Project& project,
   name = element.GetStringAttribute("name", "", "Name");
   associatedScene =
       element.GetStringAttribute("associatedLayout", "", "AssociatedScene");
+  lastChangeTimeStamp =
+      element.GetIntAttribute("lastChangeTimeStamp", 0, "LastChangeTimeStamp");
   gd::EventsListSerialization::UnserializeEventsFrom(
       project, events, element.GetChild("events", 0, "Events"));
 }

Core/GDCore/Project/ExternalEvents.h

@@ -67,6 +67,24 @@ class GD_CORE_API ExternalEvents {
     associatedScene = name_;
   };
 
+  /**
+   * Get the latest time of the build.
+   * Used when the IDE found that the external events can be compiled separately
+   * from scene's events.
+   *
+   * \todo This is specific to GD C++ Platform
+   */
+  time_t GetLastChangeTimeStamp() const { return lastChangeTimeStamp; };
+
+  /**
+   * Change the latest time of the build of the external events.
+   *
+   * \todo This is specific to GD C++ Platform
+   */
+  void SetLastChangeTimeStamp(time_t newTimeStamp) {
+    lastChangeTimeStamp = newTimeStamp;
+  };
+
   /**
    * \brief Get the events.
    */
@@ -91,6 +109,7 @@ class GD_CORE_API ExternalEvents {
  private:
   gd::String name;
   gd::String associatedScene;
+  time_t lastChangeTimeStamp;  ///< Time of the last build
   gd::EventsList events;       ///< List of events
 
   /**
@@ -100,6 +119,19 @@ class GD_CORE_API ExternalEvents {
   void Init(const ExternalEvents& externalEvents);
 };
 
+/**
+ * \brief Functor testing ExternalEvents' name
+ */
+struct ExternalEventsHasName
+    : public std::binary_function<std::unique_ptr<gd::ExternalEvents>,
+                                  gd::String,
+                                  bool> {
+  bool operator()(const std::unique_ptr<gd::ExternalEvents>& externalEvents,
+                  gd::String name) const {
+    return externalEvents->GetName() == name;
+  }
+};
+
 }  // namespace gd
 
 #endif  // GDCORE_EXTERNALEVENTS_H

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -163,20 +163,6 @@ bool InitialInstancesContainer::HasInstancesOfObject(
                      });
 }
 
-bool InitialInstancesContainer::IsInstancesCountOfObjectGreaterThan(
-    const gd::String &objectName, const std::size_t minInstanceCount) const {
-  std::size_t count = 0;
-  for (const gd::InitialInstance &instance : initialInstances) {
-    if (instance.GetObjectName() == objectName) {
-      count++;
-      if (count > minInstanceCount) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
 void InitialInstancesContainer::Create(
     const InitialInstancesContainer& source) {
   try {

Core/GDCore/Project/InitialInstancesContainer.h

@@ -153,13 +153,6 @@ class GD_CORE_API InitialInstancesContainer {
    */
   bool HasInstancesOfObject(const gd::String &objectName) const;
 
-  /**
-   * \brief Return true if there is at least N instances of the given object.
-   */
-  bool
-  IsInstancesCountOfObjectGreaterThan(const gd::String &objectName,
-                                      const std::size_t minInstanceCount) const;
-
   /**
    * \brief Remove all instances
    */

Core/GDCore/Project/Layer.cpp

@@ -15,7 +15,6 @@ Camera Layer::badCamera;
 
 Layer::Layer()
     : renderingType(""),
-      defaultCameraBehavior("top-left-anchored-if-never-moved"),
       isVisible(true),
       isLocked(false),
       isLightingLayer(false),
@@ -41,9 +40,6 @@ void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("renderingType", GetRenderingType());
   element.SetAttribute("cameraType", GetCameraType());
-  if (GetDefaultCameraBehavior() != "top-left-anchored-if-never-moved") {
-    element.SetAttribute("defaultCameraBehavior", GetDefaultCameraBehavior());
-  }
   element.SetAttribute("visibility", GetVisibility());
   element.SetAttribute("isLocked", IsLocked());
   element.SetAttribute("isLightingLayer", IsLightingLayer());
@@ -84,7 +80,6 @@ void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
   SetRenderingType(element.GetStringAttribute("renderingType", ""));
   SetCameraType(element.GetStringAttribute("cameraType", "perspective"));
-  SetDefaultCameraBehavior(element.GetStringAttribute("defaultCameraBehavior", "top-left-anchored-if-never-moved"));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
   SetLocked(element.GetBoolAttribute("isLocked", false));
   SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));

Core/GDCore/Project/Layer.h

@@ -109,12 +109,6 @@ class GD_CORE_API Layer {
     renderingType = renderingType_;
   }
 
-  const gd::String& GetDefaultCameraBehavior() const { return defaultCameraBehavior; }
-
-  void SetDefaultCameraBehavior(const gd::String& defaultCameraBehavior_) {
-    defaultCameraBehavior = defaultCameraBehavior_;
-  }
-
   const gd::String& GetCameraType() const { return cameraType; }
 
   void SetCameraType(const gd::String& cameraType_) {
@@ -281,7 +275,6 @@ class GD_CORE_API Layer {
   gd::String name;           ///< The name of the layer
   gd::String renderingType;  ///< The rendering type: "" (empty), "2d", "3d" or
                              ///< "2d+3d".
-  gd::String defaultCameraBehavior;
   gd::String cameraType;
   bool isVisible;            ///< True if the layer is visible
   bool isLocked;             ///< True if the layer is locked

Core/GDCore/Project/Layout.cpp

@@ -36,10 +36,7 @@ namespace gd {
 
 gd::BehaviorsSharedData Layout::badBehaviorSharedData("", "");
 
-Layout::Layout(const Layout &other)
-    : objectsContainer(gd::ObjectsContainer::SourceType::Scene) {
-  Init(other);
-}
+Layout::Layout(const Layout& other) { Init(other); }
 
 Layout& Layout::operator=(const Layout& other) {
   if (this != &other) Init(other);
@@ -56,8 +53,7 @@ Layout::Layout()
       stopSoundsOnStartup(true),
       standardSortMethod(true),
       disableInputWhenNotFocused(true),
-      variables(gd::VariablesContainer::SourceType::Scene),
-      objectsContainer(gd::ObjectsContainer::SourceType::Scene) {}
+      variables(gd::VariablesContainer::SourceType::Scene) {}
 
 void Layout::SetName(const gd::String& name_) {
   name = name_;

Core/GDCore/Project/Layout.h

@@ -369,9 +369,9 @@ class GD_CORE_API Layout {
  private:
   gd::String name;         ///< Scene name
   gd::String mangledName;  ///< The scene name mangled by SceneNameMangler
-  unsigned int backgroundColorR = 0;     ///< Background color Red component
-  unsigned int backgroundColorG = 0;     ///< Background color Green component
-  unsigned int backgroundColorB = 0;     ///< Background color Blue component
+  unsigned int backgroundColorR;     ///< Background color Red component
+  unsigned int backgroundColorG;     ///< Background color Green component
+  unsigned int backgroundColorB;     ///< Background color Blue component
   gd::String title;                  ///< Title displayed in the window
   gd::VariablesContainer variables;  ///< Variables list
   gd::ObjectsContainer objectsContainer;
@@ -379,12 +379,12 @@ class GD_CORE_API Layout {
   gd::LayersContainer layers;
   std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>
       behaviorsSharedData;   ///< Initial shared datas of behaviors
-  bool stopSoundsOnStartup = true;  ///< True to make the scene stop all sounds at
-                                    ///< startup.
-  bool standardSortMethod = true;   ///< True to sort objects using standard sort.
-  bool disableInputWhenNotFocused = true;  /// If set to true, the input must be
-                                           /// disabled when the window do not have the
-                                           /// focus.
+  bool stopSoundsOnStartup;  ///< True to make the scene stop all sounds at
+                             ///< startup.
+  bool standardSortMethod;   ///< True to sort objects using standard sort.
+  bool disableInputWhenNotFocused;  /// If set to true, the input must be
+                                    /// disabled when the window do not have the
+                                    /// focus.
   static gd::BehaviorsSharedData
       badBehaviorSharedData;  ///< Null object, returned when
                               ///< GetBehaviorSharedData can not find the

Core/GDCore/Project/ObjectFolderOrObject.h

@@ -193,7 +193,7 @@ class GD_CORE_API ObjectFolderOrObject {
   static gd::ObjectFolderOrObject badObjectFolderOrObject;
 
   gd::ObjectFolderOrObject*
-      parent = nullptr;  // nullptr if root folder, points to the parent folder otherwise.
+      parent;  // nullptr if root folder, points to the parent folder otherwise.
   QuickCustomization::Visibility quickCustomizationVisibility;
 
   // Representing an object:

Core/GDCore/Project/ObjectGroup.h

@@ -20,8 +20,8 @@ namespace gd {
 /**
  * \brief Represents an object group.
  *
- * Objects groups do not really contains objects: they are just used in events,
- * to create events which can be applied to several objects.
+ * Objects groups do not really contains objects : They are just used in events,
+ * so as to create events which can be applied to several objects.
  *
  * \ingroup PlatformDefinition
  */

Core/GDCore/Project/ObjectsContainer.cpp

@@ -16,9 +16,7 @@
 
 namespace gd {
 
-ObjectsContainer::ObjectsContainer(
-    const ObjectsContainer::SourceType sourceType_)
-    : sourceType(sourceType_) {
+ObjectsContainer::ObjectsContainer() {
   rootFolder = gd::make_unique<gd::ObjectFolderOrObject>("__ROOT");
 }
 
@@ -36,7 +34,6 @@ ObjectsContainer& ObjectsContainer::operator=(
 }
 
 void ObjectsContainer::Init(const gd::ObjectsContainer& other) {
-  sourceType = other.sourceType;
   initialObjects = gd::Clone(other.initialObjects);
   objectGroups = other.objectGroups;
   // The objects folders are not copied.
@@ -208,14 +205,6 @@ void ObjectsContainer::MoveObjectFolderOrObjectToAnotherContainerInFolder(
       objectFolderOrObject, newParentFolder, newPosition);
 }
 
-std::set<gd::String> ObjectsContainer::GetAllObjectNames() const {
-  std::set<gd::String> names;
-  for (const auto& object : initialObjects) {
-    names.insert(object->GetName());
-  }
-  return names;
-}
-
 std::vector<const ObjectFolderOrObject*>
 ObjectsContainer::GetAllObjectFolderOrObjects() const {
   std::vector<const ObjectFolderOrObject*> results;

Core/GDCore/Project/ObjectsContainer.h

@@ -3,11 +3,10 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef GDCORE_OBJECTSCONTAINER_H
+#define GDCORE_OBJECTSCONTAINER_H
 #include <memory>
 #include <vector>
-#include <set>
 #include "GDCore/String.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectFolderOrObject.h"
@@ -36,25 +35,15 @@ namespace gd {
  */
 class GD_CORE_API ObjectsContainer {
  public:
-  enum SourceType {
-      Unknown,
-      Global,
-      Scene,
-      Object,
-      Function,
-  };
-
   /**
-   * \brief Constructor creating a container without any objects.
+   * \brief Default constructor creating a container without any objects.
    */
-  ObjectsContainer(const SourceType sourceType);
+  ObjectsContainer();
   virtual ~ObjectsContainer();
-
+  
   ObjectsContainer(const ObjectsContainer&);
   ObjectsContainer& operator=(const ObjectsContainer& rhs);
 
-  SourceType GetSourceType() const { return sourceType; }
-
   /** \name Objects management
    * Members functions related to objects management.
    */
@@ -68,7 +57,7 @@ class GD_CORE_API ObjectsContainer {
   /**
    * \brief Return a reference to the object called \a name.
    */
-  gd::Object& GetObject(const gd::String& name);
+  Object& GetObject(const gd::String& name);
 
   /**
    * \brief Return a reference to the object called \a name.
@@ -79,7 +68,7 @@ class GD_CORE_API ObjectsContainer {
    * \brief Return a reference to the object at position \a index in the objects
    * list
    */
-  gd::Object& GetObject(std::size_t index);
+  Object& GetObject(std::size_t index);
 
   /**
    * \brief Return a reference to the object at position \a index in the objects
@@ -179,8 +168,6 @@ class GD_CORE_API ObjectsContainer {
   const std::vector<std::unique_ptr<gd::Object> >& GetObjects() const {
     return initialObjects;
   }
-
-  std::set<gd::String> GetAllObjectNames() const;
   ///@}
 
   /**
@@ -245,7 +232,6 @@ class GD_CORE_API ObjectsContainer {
   gd::ObjectGroupsContainer objectGroups;
 
  private:
-  SourceType sourceType = Unknown;
   std::unique_ptr<gd::ObjectFolderOrObject> rootFolder;
 
   /**
@@ -256,3 +242,5 @@ class GD_CORE_API ObjectsContainer {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_OBJECTSCONTAINER_H

Core/GDCore/Project/ObjectsContainersList.cpp

@@ -416,8 +416,7 @@ gd::String ObjectsContainersList::GetTypeOfObject(
     return "";
   }
   if (objectsContainers.size() == 1) {
-    gd::ObjectsContainer emptyObjectsContainer(
-        gd::ObjectsContainer::SourceType::Unknown);
+    gd::ObjectsContainer emptyObjectsContainer;
     return gd::GetTypeOfObject(emptyObjectsContainer, *objectsContainers[0],
                                objectName, true);
   }
@@ -440,8 +439,7 @@ bool ObjectsContainersList::HasBehaviorInObjectOrGroup(
     return false;
   }
   if (objectsContainers.size() == 1) {
-    gd::ObjectsContainer emptyObjectsContainer(
-        gd::ObjectsContainer::SourceType::Unknown);
+    gd::ObjectsContainer emptyObjectsContainer;
     return gd::HasBehaviorInObjectOrGroup(
         emptyObjectsContainer, *objectsContainers[0], objectOrGroupName,
         behaviorName, true);
@@ -470,8 +468,7 @@ gd::String ObjectsContainersList::GetTypeOfBehaviorInObjectOrGroup(
     return "";
   }
   if (objectsContainers.size() == 1) {
-    gd::ObjectsContainer emptyObjectsContainer(
-        gd::ObjectsContainer::SourceType::Unknown);
+    gd::ObjectsContainer emptyObjectsContainer;
     return gd::GetTypeOfBehaviorInObjectOrGroup(
         emptyObjectsContainer, *objectsContainers[0], objectOrGroupName,
         behaviorName, searchInGroups);
@@ -498,8 +495,7 @@ gd::String ObjectsContainersList::GetTypeOfBehavior(
     return "";
   }
   if (objectsContainers.size() == 1) {
-    gd::ObjectsContainer emptyObjectsContainer(
-        gd::ObjectsContainer::SourceType::Unknown);
+    gd::ObjectsContainer emptyObjectsContainer;
     return gd::GetTypeOfBehavior(emptyObjectsContainer, *objectsContainers[0],
                                  behaviorName, searchInGroups);
   }
@@ -525,8 +521,7 @@ std::vector<gd::String> ObjectsContainersList::GetBehaviorsOfObject(
     return behaviors;
   }
   if (objectsContainers.size() == 1) {
-    gd::ObjectsContainer emptyObjectsContainer(
-        gd::ObjectsContainer::SourceType::Unknown);
+    gd::ObjectsContainer emptyObjectsContainer;
     return gd::GetBehaviorsOfObject(emptyObjectsContainer,
                                     *objectsContainers[0], objectName,
                                     searchInGroups);
@@ -535,33 +530,6 @@ std::vector<gd::String> ObjectsContainersList::GetBehaviorsOfObject(
       *objectsContainers[0], *objectsContainers[1], objectName, searchInGroups);
 }
 
-std::vector<gd::String> ObjectsContainersList::GetBehaviorNamesInObjectOrGroup(
-    const gd::String &objectOrGroupName, const gd::String &behaviorType, bool searchInGroups) const {
-  if (objectsContainers.size() > 2) {
-    // TODO: rework forwarded methods so they can work with any number of
-    // containers.
-    gd::LogFatalError(
-        "ObjectsContainersList::GetBehaviorNamesInObjectOrGroup called with objectsContainers "
-        "not being exactly 2. This is a logical error and will crash.");
-  }
-  if (objectsContainers.size() == 0) {
-    gd::LogWarning("ObjectsContainersList::GetBehaviorNamesInObjectOrGroup called without any "
-                   "objectsContainer");
-    std::vector<gd::String> behaviors;
-    return behaviors;
-  }
-  if (objectsContainers.size() == 1) {
-    gd::ObjectsContainer emptyObjectsContainer(
-        gd::ObjectsContainer::SourceType::Unknown);
-    return gd::GetBehaviorNamesInObjectOrGroup(emptyObjectsContainer,
-                                    *objectsContainers[0], objectOrGroupName, behaviorType,
-                                    searchInGroups);
-  }
-  return gd::GetBehaviorNamesInObjectOrGroup(
-      *objectsContainers[0], *objectsContainers[1], objectOrGroupName, behaviorType, searchInGroups);
-}
-
-
 std::vector<gd::String> ObjectsContainersList::GetAnimationNamesOfObject(
     const gd::String &objectOrGroupName) const {
   std::vector<gd::String> animationNames;
@@ -621,28 +589,6 @@ std::vector<gd::String> ObjectsContainersList::GetAnimationNamesOfObject(
   return animationNames;
 }
 
-const ObjectsContainer *
-ObjectsContainersList::GetObjectsContainerFromObjectName(
-    const gd::String &objectOrGroupName) const {
-  for (auto it = objectsContainers.rbegin(); it != objectsContainers.rend();
-       ++it) {
-    if ((*it)->HasObjectNamed(objectOrGroupName) ||
-        (*it)->GetObjectGroups().Has(objectOrGroupName)) {
-      return *it;
-    }
-  }
-  return nullptr;
-}
-
-const gd::ObjectsContainer::SourceType
-ObjectsContainersList::GetObjectsContainerSourceType(
-    const gd::String &objectOrGroupName) const {
-  const auto *objectsContainer =
-      GetObjectsContainerFromObjectName(objectOrGroupName);
-  return objectsContainer ? objectsContainer->GetSourceType()
-                          : gd::ObjectsContainer::SourceType::Unknown;
-}
-
 const gd::ObjectsContainer &
 ObjectsContainersList::GetObjectsContainer(std::size_t index) const {
   return *objectsContainers[index];

Core/GDCore/Project/ObjectsContainersList.h

@@ -2,12 +2,12 @@
 #include <vector>
 
 #include "Variable.h"
-#include "GDCore/Project/ObjectsContainer.h"
 
 namespace gd {
 class String;
 class Project;
 class Layout;
+class ObjectsContainer;
 class VariablesContainer;
 class Object;
 class ObjectConfiguration;
@@ -50,11 +50,6 @@ class GD_CORE_API ObjectsContainersList {
    */
   bool HasObjectOrGroupNamed(const gd::String& name) const;
 
-  /**
-   * \brief Check if the specified object exists ignoring groups.
-   */
-  bool HasObjectNamed(const gd::String& name) const;
-
   enum VariableExistence {
     DoesNotExist,
     Exists,
@@ -133,18 +128,6 @@ class GD_CORE_API ObjectsContainersList {
   std::vector<gd::String> GetBehaviorsOfObject(
       const gd::String& objectName, bool searchInGroups = true) const;
 
-  /**
-   * \brief Get behaviors of an object/group of a given behavior type.
-   * \note The behaviors of a group are the behaviors which are found in common
-   * when looking all the objects of the group.
-   *
-   * @return Vector containing names of behaviors
-   */
-  std::vector<gd::String>
-  GetBehaviorNamesInObjectOrGroup(const gd::String &objectOrGroupName,
-                       const gd::String &behaviorType,
-                       bool searchInGroups = true) const;
-
   /**
    * \brief Get the animation names of an object/group.
    * \note The animation names of a group are the animation names common to
@@ -190,28 +173,8 @@ class GD_CORE_API ObjectsContainersList {
       std::function<void(const gd::String& variableName,
                          const gd::Variable& variable)> fn) const;
 
-  /**
-   * \brief Return the source type of the container for the specified object or
-   * group of objects.
-   */
-  const gd::ObjectsContainer::SourceType GetObjectsContainerSourceType(
-      const gd::String& objectOrGroupName) const;
-
-  /**
-   * Get the objects container for for the specified object or group of objects.
-   */
-  const ObjectsContainer *
-  GetObjectsContainerFromObjectName(const gd::String &objectOrGroupName) const;
-
   /**
    * \brief Return a the objects container at position \a index.
-   *
-   * \warning The returned `ObjectsContainer` may contain cloned objects (in the case of
-   * `ProjectScopedContainers::MakeNewProjectScopedContainersForEventsBasedObject`)
-   * or "fake" objects used by events like parameters. They must not be used to
-   * edit the objects.
-   * Search for "ProjectScopedContainers wrongly containing temporary objects containers or objects"
-   * in the codebase.
    */
   const gd::ObjectsContainer &GetObjectsContainer(std::size_t index) const;
 
@@ -225,6 +188,8 @@ class GD_CORE_API ObjectsContainersList {
   ObjectsContainersList(){};
 
  private:
+  bool HasObjectNamed(const gd::String& name) const;
+
   const gd::Object* GetObject(const gd::String& name) const;
 
   bool HasObjectWithVariableNamed(const gd::String& objectName,

Core/GDCore/Project/Project.cpp

@@ -71,22 +71,23 @@ Project::Project()
       isPlayableWithKeyboard(false),
       isPlayableWithGamepad(false),
       isPlayableWithMobile(false),
-      currentPlatform(nullptr),
+      currentPlatform(NULL),
       gdMajorVersion(gd::VersionWrapper::Major()),
       gdMinorVersion(gd::VersionWrapper::Minor()),
       gdBuildVersion(gd::VersionWrapper::Build()),
-      variables(gd::VariablesContainer::SourceType::Global),
-      objectsContainer(gd::ObjectsContainer::SourceType::Global) {}
+      variables(gd::VariablesContainer::SourceType::Global) {}
 
 Project::~Project() {}
 
 void Project::ResetProjectUuid() { projectUuid = UUID::MakeUuid4(); }
 
-void Project::EnsureObjectDefaultBehaviors(gd::Object& object) const {
+std::unique_ptr<gd::Object> Project::CreateObject(
+    const gd::String& objectType, const gd::String& name) const {
+  std::unique_ptr<gd::Object> object = gd::make_unique<Object>(
+      name, objectType, CreateObjectConfiguration(objectType));
+
   auto& platform = GetCurrentPlatform();
   auto& project = *this;
-  auto& objectType = object.GetType();
-
   auto addDefaultBehavior = [&platform, &project, &object, &objectType](
                                 const gd::String& behaviorType) {
     auto& behaviorMetadata =
@@ -96,47 +97,17 @@ void Project::EnsureObjectDefaultBehaviors(gd::Object& object) const {
                      " has an unknown default behavior: " + behaviorType);
       return;
     }
-
-    const gd::String& behaviorName = behaviorMetadata.GetDefaultName();
-
-    // Check if we can keep a behavior that would have been already set up on the object.
-    if (object.HasBehaviorNamed(behaviorName)) {
-      const auto& behavior = object.GetBehavior(behaviorName);
-
-      if (!behavior.IsDefaultBehavior() || behavior.GetTypeName() != behaviorType) {
-        // Behavior type has changed, remove it so it is re-created.
-        object.RemoveBehavior(behaviorName);
-      }
-    }
-
-    if (!object.HasBehaviorNamed(behaviorName)) {
-      auto* behavior = object.AddNewBehavior(
-          project, behaviorType, behaviorName);
-      behavior->SetDefaultBehavior(true);
-    }
+    auto* behavior = object->AddNewBehavior(
+        project, behaviorType, behaviorMetadata.GetDefaultName());
+    behavior->SetDefaultBehavior(true);
   };
 
   auto &objectMetadata =
       gd::MetadataProvider::GetObjectMetadata(platform, objectType);
   if (!MetadataProvider::IsBadObjectMetadata(objectMetadata)) {
-    // Add all default behaviors.
-    const auto& defaultBehaviorTypes = objectMetadata.GetDefaultBehaviors();
-    for (auto &behaviorType : defaultBehaviorTypes) {
+    for (auto &behaviorType : objectMetadata.GetDefaultBehaviors()) {
       addDefaultBehavior(behaviorType);
     }
-
-    // Ensure there are no default behaviors that would not be required left on the object.
-    for (const auto& behaviorName : object.GetAllBehaviorNames()) {
-      auto& behavior = object.GetBehavior(behaviorName);
-      if (!behavior.IsDefaultBehavior()) {
-        // Non default behaviors are not handled by this function.
-        continue;
-      }
-
-      if (defaultBehaviorTypes.find(behavior.GetTypeName()) == defaultBehaviorTypes.end()) {
-        object.RemoveBehavior(behaviorName);
-      }
-    }
   }
   // During project deserialization, event-based object metadata are not yet
   // generated. Default behaviors will be added by
@@ -144,14 +115,6 @@ void Project::EnsureObjectDefaultBehaviors(gd::Object& object) const {
   else if (!project.HasEventsBasedObject(objectType)) {
     gd::LogWarning("Object: " + name + " has an unknown type: " + objectType);
   }
-}
-
-std::unique_ptr<gd::Object> Project::CreateObject(
-    const gd::String& objectType, const gd::String& name) const {
-  std::unique_ptr<gd::Object> object = gd::make_unique<Object>(
-      name, objectType, CreateObjectConfiguration(objectType));
-
-  EnsureObjectDefaultBehaviors(*object);
 
   return std::move(object);
 }
@@ -867,7 +830,7 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   eventsFunctionsExtensionsElement.ConsiderAsArrayOf(
       "eventsFunctionsExtension");
   // First, only unserialize behaviors and objects names.
-  // As event based objects can contains custom behaviors and custom objects,
+  // As event based objects can contains CustomObject and Custom Object,
   // this allows them to reference EventBasedBehavior and EventBasedObject
   // respectively.
   for (std::size_t i = 0;
@@ -882,17 +845,15 @@ void Project::UnserializeFrom(const SerializerElement& element) {
     newEventsFunctionsExtension.UnserializeExtensionDeclarationFrom(
         *this, eventsFunctionsExtensionElement);
   }
-
   // Then unserialize functions, behaviors and objects content.
-  for (gd::String &extensionName :
-       GetUnserializingOrderExtensionNames(eventsFunctionsExtensionsElement)) {
-    size_t extensionIndex = GetEventsFunctionsExtensionPosition(extensionName);
-    const SerializerElement &eventsFunctionsExtensionElement =
-        eventsFunctionsExtensionsElement.GetChild(extensionIndex);
+  for (std::size_t i = 0;
+       i < eventsFunctionsExtensionsElement.GetChildrenCount();
+       ++i) {
+    const SerializerElement& eventsFunctionsExtensionElement =
+        eventsFunctionsExtensionsElement.GetChild(i);
 
-    eventsFunctionsExtensions.at(extensionIndex)
-        ->UnserializeExtensionImplementationFrom(
-            *this, eventsFunctionsExtensionElement);
+    eventsFunctionsExtensions.at(i)->UnserializeExtensionImplementationFrom(
+        *this, eventsFunctionsExtensionElement);
   }
 
   objectsContainer.GetObjectGroups().UnserializeFrom(
@@ -961,83 +922,6 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   }
 }
 
-std::vector<gd::String> Project::GetUnserializingOrderExtensionNames(
-    const gd::SerializerElement &eventsFunctionsExtensionsElement) {
-
-  // Some extension have custom objects, which have child objects coming from other extension.
-  // These child objects must be loaded completely before the parent custom obejct can be unserialized.
-  // This implies: an order on the extension unserialization (and no cycles).
-
-  // At the beginning, everything is yet to be loaded.
-  std::vector<gd::String> remainingExtensionNames(
-      eventsFunctionsExtensions.size());
-  for (std::size_t i = 0; i < eventsFunctionsExtensions.size(); ++i) {
-    remainingExtensionNames[i] = eventsFunctionsExtensions.at(i)->GetName();
-  }
-
-  // Helper allowing to find if an extension has an object that depends on
-  // at least one other object from another extension that is not loaded yet.
-  auto isDependentFromRemainingExtensions =
-      [&remainingExtensionNames](
-          const gd::SerializerElement &eventsFunctionsExtensionElement) {
-        auto &eventsBasedObjectsElement =
-            eventsFunctionsExtensionElement.GetChild("eventsBasedObjects");
-        eventsBasedObjectsElement.ConsiderAsArrayOf("eventsBasedObject");
-        for (std::size_t eventsBasedObjectsIndex = 0;
-             eventsBasedObjectsIndex <
-             eventsBasedObjectsElement.GetChildrenCount();
-             ++eventsBasedObjectsIndex) {
-          auto &objectsElement =
-              eventsBasedObjectsElement.GetChild(eventsBasedObjectsIndex)
-                  .GetChild("objects");
-          objectsElement.ConsiderAsArrayOf("object");
-
-          for (std::size_t objectIndex = 0;
-               objectIndex < objectsElement.GetChildrenCount(); ++objectIndex) {
-            const gd::String &objectType =
-                objectsElement.GetChild(objectIndex).GetStringAttribute("type");
-
-            gd::String extensionName =
-                eventsFunctionsExtensionElement.GetStringAttribute("name");
-            gd::String usedExtensionName =
-                gd::PlatformExtension::GetExtensionFromFullObjectType(objectType);
-
-            if (usedExtensionName != extensionName &&
-                std::find(remainingExtensionNames.begin(),
-                          remainingExtensionNames.end(),
-                          usedExtensionName) != remainingExtensionNames.end()) {
-              return true;
-            }
-          }
-        }
-        return false;
-      };
-
-  // Find the order of loading so that the extensions are loaded when all the other
-  // extensions they depend on are already loaded.
-  std::vector<gd::String> loadOrderExtensionNames;
-  bool foundAnyExtension = true;
-  while (foundAnyExtension) {
-    foundAnyExtension = false;
-    for (std::size_t i = 0; i < remainingExtensionNames.size(); ++i) {
-      auto extensionName = remainingExtensionNames[i];
-      size_t extensionIndex =
-          GetEventsFunctionsExtensionPosition(extensionName);
-      const SerializerElement &eventsFunctionsExtensionElement =
-          eventsFunctionsExtensionsElement.GetChild(extensionIndex);
-
-      if (!isDependentFromRemainingExtensions(
-              eventsFunctionsExtensionElement)) {
-        loadOrderExtensionNames.push_back(extensionName);
-        remainingExtensionNames.erase(remainingExtensionNames.begin() + i);
-        i--;
-        foundAnyExtension = true;
-      }
-    }
-  }
-  return loadOrderExtensionNames;
-}
-
 void Project::SerializeTo(SerializerElement& element) const {
   SerializerElement& versionElement = element.AddChild("gdVersion");
   versionElement.SetAttribute("major", gd::VersionWrapper::Major());
@@ -1267,10 +1151,7 @@ gd::SourceFile& Project::InsertNewSourceFile(const gd::String& name,
   return newlyInsertedSourceFile;
 }
 
-Project::Project(const Project &other)
-    : objectsContainer(gd::ObjectsContainer::SourceType::Global) {
-  Init(other);
-}
+Project::Project(const Project& other) { Init(other); }
 
 Project& Project::operator=(const Project& other) {
   if (this != &other) Init(other);

Core/GDCore/Project/Project.h

@@ -523,7 +523,13 @@ class GD_CORE_API Project {
   std::unique_ptr<gd::Object> CreateObject(const gd::String& type,
                                            const gd::String& name) const;
 
-  void EnsureObjectDefaultBehaviors(gd::Object& object) const;
+  /**
+   * Create an object configuration of the given type.
+   *
+   * \param type The type of the object
+   */
+  std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
+      const gd::String& type) const;
 
   /**
    * Create an event of the given type.
@@ -984,12 +990,16 @@ class GD_CORE_API Project {
   /**
    * \brief return the objects of the project.
    */
-  gd::ObjectsContainer& GetObjects() { return objectsContainer; }
+  gd::ObjectsContainer& GetObjects() {
+    return objectsContainer;
+  }
 
   /**
    * \brief Return the objects of the project.
    */
-  const gd::ObjectsContainer& GetObjects() const { return objectsContainer; }
+  const gd::ObjectsContainer& GetObjects() const {
+    return objectsContainer;
+  }
   ///@}
 
   /** \name Identifier names
@@ -1070,51 +1080,32 @@ class GD_CORE_API Project {
    */
   void Init(const gd::Project& project);
 
-  /**
-   * @brief Get the project extensions names in the order they have to be unserialized.
-   *
-   * Child-objects need the event-based objects they use to be loaded completely
-   * before they are unserialized.
-   */
-  std::vector<gd::String> GetUnserializingOrderExtensionNames(const gd::SerializerElement &eventsFunctionsExtensionsElement);
-
-  /**
-   * Create an object configuration of the given type.
-   *
-   * \param type The type of the object
-   */
-  std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
-      const gd::String& type) const;
-
-  gd::String name;         ///< Game name
-  gd::String description;  ///< Game description
-  gd::String version;      ///< Game version number (used for some exports)
-  unsigned int windowWidth = 0;   ///< Window default width
-  unsigned int windowHeight = 0;  ///< Window default height
-  int maxFPS = 0;           ///< Maximum Frame Per Seconds, -1 for unlimited
-  unsigned int minFPS = 0;  ///< Minimum Frame Per Seconds ( slow down game if
-                            ///< FPS are below this number )
-  bool verticalSync =
-      false;  ///< If true, must activate vertical synchronization.
+  gd::String name;            ///< Game name
+  gd::String description;     ///< Game description
+  gd::String version;         ///< Game version number (used for some exports)
+  unsigned int windowWidth;   ///< Window default width
+  unsigned int windowHeight;  ///< Window default height
+  int maxFPS;                 ///< Maximum Frame Per Seconds, -1 for unlimited
+  unsigned int minFPS;  ///< Minimum Frame Per Seconds ( slow down game if FPS
+                        ///< are below this number )
+  bool verticalSync;    ///< If true, must activate vertical synchronization.
   gd::String scaleMode;
-  bool pixelsRounding = false;  ///< If true, the rendering should stop pixel
-                                ///< interpolation of rendered objects.
-  bool adaptGameResolutionAtRuntime =
-      true;  ///< Should the game resolution be adapted
-             ///< to the window size at runtime
+  bool pixelsRounding;  ///< If true, the rendering should stop pixel
+                        ///< interpolation of rendered objects.
+  bool adaptGameResolutionAtRuntime;  ///< Should the game resolution be adapted
+                                      ///< to the window size at runtime
   gd::String
       sizeOnStartupMode;  ///< How to adapt the game size to the screen. Can be
                           ///< "adaptWidth", "adaptHeight" or empty
   gd::String antialiasingMode;
-  bool isAntialisingEnabledOnMobile = false;
+  bool isAntialisingEnabledOnMobile;
   gd::String projectUuid;  ///< UUID useful to identify the game in online
                            ///< services or database that would require it.
-  bool useDeprecatedZeroAsDefaultZOrder =
-      false;  ///< If true, objects created from
-              ///< events will have 0 as Z order,
-              ///< instead of the highest Z order
-              ///< found on the layer at the scene
-              ///< startup.
+  bool useDeprecatedZeroAsDefaultZOrder;  ///< If true, objects created from
+                                          ///< events will have 0 as Z order,
+                                          ///< instead of the highest Z order
+                                          ///< found on the layer at the scene
+                                          ///< startup.
   std::vector<std::unique_ptr<gd::Layout> > scenes;  ///< List of all scenes
   gd::VariablesContainer variables;  ///< Initial global variables
   gd::ObjectsContainer objectsContainer;
@@ -1127,8 +1118,7 @@ class GD_CORE_API Project {
   std::vector<gd::Platform*>
       platforms;  ///< Pointers to the platforms this project supports.
   gd::String firstLayout;
-  bool useExternalSourceFiles =
-      false;  ///< True if game used external source files.
+  bool useExternalSourceFiles;  ///< True if game used external source files.
   std::vector<std::unique_ptr<gd::SourceFile> >
       externalSourceFiles;  ///< List of external source files used.
   gd::String author;        ///< Game author name, for publishing purpose.
@@ -1137,40 +1127,35 @@ class GD_CORE_API Project {
   std::vector<gd::String>
       authorUsernames;  ///< Game author usernames, from GDevelop users DB.
   std::vector<gd::String> categories;  ///< Game categories
-  bool isPlayableWithKeyboard =
-      false;  ///< The project is playable with a keyboard.
-  bool isPlayableWithGamepad =
-      false;  ///< The project is playable with a gamepad.
-  bool isPlayableWithMobile = false;  ///< The project is playable on a mobile.
-  gd::String packageName;             ///< Game package name
+  bool isPlayableWithKeyboard;  ///< The project is playable with a keyboard.
+  bool isPlayableWithGamepad;   ///< The project is playable with a gamepad.
+  bool isPlayableWithMobile;    ///< The project is playable on a mobile.
+  gd::String packageName;       ///< Game package name
   gd::String templateSlug;  ///< The slug of the template from which the game is
                             ///< created.
   gd::String orientation;   ///< Lock game orientation (on mobile devices).
                             ///< "default", "landscape" or "portrait".
-  bool folderProject =
-      false;  ///< True if folder project, false if single file project.
+  bool
+      folderProject;  ///< True if folder project, false if single file project.
   gd::String
       projectFile;  ///< Path to the project file - when editing a local file.
   gd::String latestCompilationDirectory;
-  gd::Platform* currentPlatform =
-      nullptr;  ///< The platform being used to edit the project.
+  gd::Platform*
+      currentPlatform;  ///< The platform being used to edit the project.
   gd::PlatformSpecificAssets platformSpecificAssets;
   gd::LoadingScreen loadingScreen;
   gd::Watermark watermark;
   std::vector<std::unique_ptr<gd::ExternalEvents> >
       externalEvents;  ///< List of all externals events
   ExtensionProperties
-      extensionProperties;  ///< The properties of the extensions.
+      extensionProperties;              ///< The properties of the extensions.
   gd::WholeProjectDiagnosticReport wholeProjectDiagnosticReport;
-  mutable unsigned int gdMajorVersion =
-      0;  ///< The GD major version used the last
-          ///< time the project was saved.
-  mutable unsigned int gdMinorVersion =
-      0;  ///< The GD minor version used the last
-          ///< time the project was saved.
-  mutable unsigned int gdBuildVersion =
-      0;  ///< The GD build version used the last
-          ///< time the project was saved.
+  mutable unsigned int gdMajorVersion;  ///< The GD major version used the last
+                                        ///< time the project was saved.
+  mutable unsigned int gdMinorVersion;  ///< The GD minor version used the last
+                                        ///< time the project was saved.
+  mutable unsigned int gdBuildVersion;  ///< The GD build version used the last
+                                        ///< time the project was saved.
 };
 
 }  // namespace gd

Core/GDCore/Project/ProjectScopedContainers.cpp

@@ -4,55 +4,12 @@
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/Layout.h"
 #include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/Project.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 
 namespace gd {
 
-ProjectScopedContainers
-ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(
-    const gd::Project &project, const gd::Layout &layout) {
-  ProjectScopedContainers projectScopedContainers(
-      ObjectsContainersList::MakeNewObjectsContainersListForProjectAndLayout(
-          project, layout),
-      VariablesContainersList::
-          MakeNewVariablesContainersListForProjectAndLayout(project, layout),
-      &project.GetVariables(), &layout.GetVariables(),
-      PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
-
-  return projectScopedContainers;
-}
-
-ProjectScopedContainers
-ProjectScopedContainers::MakeNewProjectScopedContainersForProject(
-    const gd::Project &project) {
-  ProjectScopedContainers projectScopedContainers(
-      ObjectsContainersList::MakeNewObjectsContainersListForProject(project),
-      VariablesContainersList::MakeNewVariablesContainersListForProject(
-          project),
-      &project.GetVariables(), nullptr,
-      PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
-
-  return projectScopedContainers;
-}
-
-ProjectScopedContainers
-ProjectScopedContainers::MakeNewProjectScopedContainersFor(
-    const gd::ObjectsContainer &globalObjectsContainers,
-    const gd::ObjectsContainer &objectsContainers) {
-  ProjectScopedContainers projectScopedContainers(
-      ObjectsContainersList::MakeNewObjectsContainersListForContainers(
-          globalObjectsContainers, objectsContainers),
-      VariablesContainersList::MakeNewEmptyVariablesContainersList(),
-      nullptr, nullptr,
-      PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
-
-  return projectScopedContainers;
-};
-
 ProjectScopedContainers
 ProjectScopedContainers::MakeNewProjectScopedContainersForEventsFunctionsExtension(
     const gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension) {
@@ -61,8 +18,6 @@ ProjectScopedContainers::MakeNewProjectScopedContainersForEventsFunctionsExtensi
       ObjectsContainersList::MakeNewEmptyObjectsContainersList(),
       VariablesContainersList::
           MakeNewVariablesContainersListForEventsFunctionsExtension(eventsFunctionsExtension),
-      &eventsFunctionsExtension.GetGlobalVariables(),
-      &eventsFunctionsExtension.GetSceneVariables(),
       PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
 
   return projectScopedContainers;
@@ -82,8 +37,6 @@ ProjectScopedContainers::MakeNewProjectScopedContainersForFreeEventsFunction(
           parameterObjectsContainer),
       VariablesContainersList::
           MakeNewVariablesContainersListForEventsFunctionsExtension(eventsFunctionsExtension),
-      &eventsFunctionsExtension.GetGlobalVariables(),
-      &eventsFunctionsExtension.GetSceneVariables(),
       PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
 
   projectScopedContainers.AddParameters(
@@ -110,8 +63,6 @@ ProjectScopedContainers::MakeNewProjectScopedContainersForBehaviorEventsFunction
           parameterObjectsContainer),
       VariablesContainersList::
           MakeNewVariablesContainersListForEventsFunctionsExtension(eventsFunctionsExtension),
-      &eventsFunctionsExtension.GetGlobalVariables(),
-      &eventsFunctionsExtension.GetSceneVariables(),
       PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
 
   projectScopedContainers.AddPropertiesContainer(
@@ -136,14 +87,11 @@ ProjectScopedContainers::MakeNewProjectScopedContainersForObjectEventsFunction(
       project, eventsBasedObject, eventsFunction, parameterObjectsContainer);
 
   ProjectScopedContainers projectScopedContainers(
-      ObjectsContainersList::MakeNewObjectsContainersListForContainers(
-          eventsBasedObject.GetObjects(),
+      ObjectsContainersList::MakeNewObjectsContainersListForContainer(
           parameterObjectsContainer),
       VariablesContainersList::
           MakeNewVariablesContainersListForEventsFunctionsExtension(
               eventsFunctionsExtension),
-      &eventsFunctionsExtension.GetGlobalVariables(),
-      &eventsFunctionsExtension.GetSceneVariables(),
       PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
 
   projectScopedContainers.AddPropertiesContainer(
@@ -161,34 +109,22 @@ ProjectScopedContainers::MakeNewProjectScopedContainersForEventsBasedObject(
     const gd::EventsBasedObject &eventsBasedObject,
     gd::ObjectsContainer &outputObjectsContainer) {
 
-  // TODO: We should avoid to use a single `outputObjectsContainer` and instead
-  // use multiple, stable objects container pointed by the `ProjectScopedContainers`
-  // created below.
-  // Search for "ProjectScopedContainers wrongly containing temporary objects containers or objects"
-  // in the codebase.
   outputObjectsContainer.GetObjects().clear();
   outputObjectsContainer.GetObjectGroups().Clear();
-
-  // This object named "Object" represents the parent and is used by events.
-  // TODO: Use a dedicated `ObjectsContainer` with only this "Object" and check in
-  // the codebase that this container is not assumed as a
-  // "globalObjectsContainer".
-  // Search for "ProjectScopedContainers wrongly containing temporary objects containers or objects"
-  // in the codebase.
   outputObjectsContainer.InsertNewObject(
       project,
       gd::PlatformExtension::GetObjectFullType(
           eventsFunctionsExtension.GetName(), eventsBasedObject.GetName()),
       "Object", outputObjectsContainer.GetObjectsCount());
+  gd::EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+      eventsBasedObject, outputObjectsContainer);
 
   ProjectScopedContainers projectScopedContainers(
-      ObjectsContainersList::MakeNewObjectsContainersListForContainers(
-          eventsBasedObject.GetObjects(), outputObjectsContainer),
+      ObjectsContainersList::MakeNewObjectsContainersListForContainer(
+          outputObjectsContainer),
       VariablesContainersList::
           MakeNewVariablesContainersListForEventsFunctionsExtension(
               eventsFunctionsExtension),
-      &eventsFunctionsExtension.GetGlobalVariables(),
-      &eventsFunctionsExtension.GetSceneVariables(),
       PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
 
   projectScopedContainers.AddPropertiesContainer(

Core/GDCore/Project/ProjectScopedContainers.h

@@ -5,11 +5,13 @@
 #include "ObjectsContainersList.h"
 #include "PropertiesContainersList.h"
 #include "VariablesContainersList.h"
-#include "VariablesContainer.h"
 
 namespace gd {
 class Project;
 class ObjectsContainer;
+class ObjectsContainersList;
+class VariablesContainersList;
+class PropertiesContainersList;
 class NamedPropertyDescriptor;
 class ParameterMetadataContainer;
 class BaseEvent;
@@ -17,7 +19,7 @@ class EventsFunctionsExtension;
 class EventsFunction;
 class EventsBasedBehavior;
 class EventsBasedObject;
-} // namespace gd
+}  // namespace gd
 
 namespace gd {
 
@@ -36,29 +38,51 @@ class ProjectScopedContainers {
   ProjectScopedContainers(
       const gd::ObjectsContainersList &objectsContainersList_,
       const gd::VariablesContainersList &variablesContainersList_,
-      const gd::VariablesContainer *legacyGlobalVariables_,
-      const gd::VariablesContainer *legacySceneVariables_,
       const gd::PropertiesContainersList &propertiesContainersList_)
       : objectsContainersList(objectsContainersList_),
         variablesContainersList(variablesContainersList_),
-        legacyGlobalVariables(legacyGlobalVariables_),
-        legacySceneVariables(legacySceneVariables_),
         propertiesContainersList(propertiesContainersList_){};
   virtual ~ProjectScopedContainers(){};
 
   static ProjectScopedContainers
   MakeNewProjectScopedContainersForProjectAndLayout(const gd::Project &project,
-                                                    const gd::Layout &layout);
+                                                    const gd::Layout &layout) {
+    ProjectScopedContainers projectScopedContainers(
+        ObjectsContainersList::MakeNewObjectsContainersListForProjectAndLayout(
+            project, layout),
+        VariablesContainersList::
+            MakeNewVariablesContainersListForProjectAndLayout(project, layout),
+        PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
+
+    return projectScopedContainers;
+  }
 
   static ProjectScopedContainers
-  MakeNewProjectScopedContainersForProject(const gd::Project &project);
+  MakeNewProjectScopedContainersForProject(const gd::Project &project) {
+    ProjectScopedContainers projectScopedContainers(
+        ObjectsContainersList::MakeNewObjectsContainersListForProject(
+            project),
+        VariablesContainersList::
+            MakeNewVariablesContainersListForProject(project),
+        PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
+
+    return projectScopedContainers;
+  }
 
   /**
    * @deprecated Use another method for an explicit context instead.
    */
   static ProjectScopedContainers MakeNewProjectScopedContainersFor(
       const gd::ObjectsContainer &globalObjectsContainers,
-      const gd::ObjectsContainer &objectsContainers);
+      const gd::ObjectsContainer &objectsContainers) {
+    ProjectScopedContainers projectScopedContainers(
+        ObjectsContainersList::MakeNewObjectsContainersListForContainers(
+            globalObjectsContainers, objectsContainers),
+        VariablesContainersList::MakeNewEmptyVariablesContainersList(),
+        PropertiesContainersList::MakeNewEmptyPropertiesContainersList());
+
+    return projectScopedContainers;
+  };
 
   static ProjectScopedContainers
   MakeNewProjectScopedContainersForEventsFunctionsExtension(
@@ -197,24 +221,6 @@ class ProjectScopedContainers {
     return variablesContainersList;
   };
 
-  /**
-   * @brief Return the global variables of the current scene or the current
-   * extension. It allows legacy "globalvar" parameters to accept extension
-   * variables.
-   */
-  const gd::VariablesContainer *GetLegacyGlobalVariables() const {
-    return legacyGlobalVariables;
-  };
-
-  /**
-   * @brief Return the scene variables of the current scene or the current
-   * extension. It allows legacy "scenevar" parameters to accept extension
-   * variables.
-   */
-  const gd::VariablesContainer *GetLegacySceneVariables() const {
-    return legacySceneVariables;
-  };
-
   const gd::PropertiesContainersList &GetPropertiesContainersList() const {
     return propertiesContainersList;
   };
@@ -225,14 +231,11 @@ class ProjectScopedContainers {
 
   /** Do not use - should be private but accessible to let Emscripten create a
    * temporary. */
-  ProjectScopedContainers()
-      : legacyGlobalVariables(nullptr), legacySceneVariables(nullptr){};
+  ProjectScopedContainers(){};
 
-private:
+ private:
   gd::ObjectsContainersList objectsContainersList;
   gd::VariablesContainersList variablesContainersList;
-  const gd::VariablesContainer *legacyGlobalVariables;
-  const gd::VariablesContainer *legacySceneVariables;
   gd::PropertiesContainersList propertiesContainersList;
   std::vector<const ParameterMetadataContainer *> parametersVectorsList;
 };

Core/GDCore/Project/ResourcesManager.cpp

@@ -173,6 +173,9 @@ std::map<gd::String, gd::PropertyDescriptor> ImageResource::GetProperties()
   properties[_("Smooth the image")]
       .SetValue(smooth ? "true" : "false")
       .SetType("Boolean");
+  properties[_("Always loaded in memory")]
+      .SetValue(alwaysLoaded ? "true" : "false")
+      .SetType("Boolean");
 
   return properties;
 }
@@ -181,6 +184,8 @@ bool ImageResource::UpdateProperty(const gd::String& name,
                                    const gd::String& value) {
   if (name == _("Smooth the image"))
     smooth = value == "1";
+  else if (name == _("Always loaded in memory"))
+    alwaysLoaded = value == "1";
 
   return true;
 }
@@ -564,12 +569,14 @@ void ImageResource::SetFile(const gd::String& newFile) {
 }
 
 void ImageResource::UnserializeFrom(const SerializerElement& element) {
+  alwaysLoaded = element.GetBoolAttribute("alwaysLoaded");
   smooth = element.GetBoolAttribute("smoothed");
   SetUserAdded(element.GetBoolAttribute("userAdded"));
   SetFile(element.GetStringAttribute("file"));
 }
 
 void ImageResource::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("alwaysLoaded", alwaysLoaded);
   element.SetAttribute("smoothed", smooth);
   element.SetAttribute("userAdded", IsUserAdded());
   element.SetAttribute("file", GetFile());

Core/GDCore/Project/ResourcesManager.h

@@ -152,8 +152,8 @@ class GD_CORE_API Resource {
   gd::String metadata;
   gd::String originName;
   gd::String originIdentifier;
-  bool userAdded = false;  ///< True if the resource was added by the user, and not
-                           ///< automatically by GDevelop.
+  bool userAdded;  ///< True if the resource was added by the user, and not
+                   ///< automatically by GDevelop.
 
   static gd::String badStr;
 };
@@ -166,7 +166,7 @@ class GD_CORE_API Resource {
  */
 class GD_CORE_API ImageResource : public Resource {
  public:
-  ImageResource() : Resource(), smooth(true) {
+  ImageResource() : Resource(), smooth(true), alwaysLoaded(false) {
     SetKind("image");
   };
   virtual ~ImageResource(){};
@@ -210,6 +210,7 @@ class GD_CORE_API ImageResource : public Resource {
   void SetSmooth(bool enable = true) { smooth = enable; }
 
   bool smooth;        ///< True if smoothing filter is applied
+  bool alwaysLoaded;  ///< True if the image must always be loaded in memory.
  private:
   gd::String file;
 };

Core/GDCore/Project/Variable.h

@@ -33,7 +33,7 @@ class GD_CORE_API Variable {
     Unknown,
     /** Used when objects of a group have different types for a variable. */
     MixedTypes,
-
+    
     // Primitive types
     String,
     Number,
@@ -393,11 +393,11 @@ class GD_CORE_API Variable {
    */
   static Type StringAsType(const gd::String& str);
 
-  bool folded = false;
+  bool folded;
   mutable Type type;
   mutable gd::String str;
   mutable double value;
-  mutable bool boolVal = false;
+  mutable bool boolVal;
   mutable bool hasMixedValues;
   mutable std::map<gd::String, std::shared_ptr<Variable>>
       children;  ///< Children, when the variable is considered as a structure.

Core/GDCore/Project/VariablesContainer.h

@@ -187,7 +187,7 @@ class GD_CORE_API VariablesContainer {
   ///@}
 
  private:
-  SourceType sourceType = Unknown;
+  SourceType sourceType;
   std::vector<std::pair<gd::String, std::shared_ptr<gd::Variable>>> variables;
   mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,
                                       ///< useful for computing changesets.

Core/GDCore/Serialization/SerializerElement.h

@@ -456,13 +456,13 @@ class GD_CORE_API SerializerElement {
    */
   void Init(const gd::SerializerElement &other);
 
-  bool valueUndefined = true;  ///< If true, the element does not have a value.
+  bool valueUndefined;  ///< If true, the element does not have a value.
   SerializerValue elementValue;
 
   std::map<gd::String, SerializerValue> attributes;
   std::vector<std::pair<gd::String, std::shared_ptr<SerializerElement> > >
       children;
-  mutable bool isArray = false;  ///< true if element is considered as an array
+  mutable bool isArray;        ///< true if element is considered as an array
   mutable gd::String arrayOf;  ///< The name of the children (was useful for XML
                                ///< parsed elements).
   mutable gd::String deprecatedArrayOf;  ///< Alternate name for children

Core/GDCore/Serialization/rapidjson/.clang-tidy

@@ -1,2 +0,0 @@
-# Disable all checks in this folder.
-Checks: '-*'

Core/GDCore/String.cpp

@@ -4,8 +4,6 @@
  * This project is released under the MIT License.
  */
 
-// NOLINTBEGIN
-
 #include "GDCore/String.h"
 
 #include <algorithm>
@@ -827,5 +825,3 @@ bool GD_CORE_API CaseInsensitiveEquiv( const String &lhs, const String &rhs, boo
 }
 
 }
-
-// NOLINTEND

Core/GDCore/String.h

@@ -4,8 +4,6 @@
  * This project is released under the MIT License.
  */
 
-// NOLINTBEGIN
-
 #ifndef GDCORE_UTF8_STRING_H
 #define GDCORE_UTF8_STRING_H
 
@@ -900,5 +898,3 @@ namespace std
  * In Unicode, uppercasing/lowercasing strings to compare them in a case-insensitive way is not recommended.
  * That's why the function gd::CaseInsensitiveEquiv exists to compare two strings in a case-insensitive way.
  */
-
-// NOLINTEND

Core/GDCore/Tools/PolymorphicClone.h

@@ -2,7 +2,6 @@
 #define GD_CORE_POLYMORPHICCLONE_H
 
 #include <memory>
-#include <vector>
 
 namespace gd {
 

Core/GDCore/Tools/SerializableWithNameList.inl

@@ -3,7 +3,6 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#include <algorithm>
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/MakeUnique.h"

Core/GDCore/Tools/SystemStats.cpp

@@ -3,9 +3,6 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-
-// NOLINTBEGIN
-
 #include "SystemStats.h"
 #include "stdio.h"
 #include "stdlib.h"
@@ -52,5 +49,3 @@ size_t SystemStats::GetUsedVirtualMemory() {
 }
 
 }  // namespace gd
-
-// NOLINTEND

Core/GDCore/Tools/UUID/.clang-tidy

@@ -1,2 +0,0 @@
-# Disable all checks in this folder.
-Checks: '-*'

Core/GDCore/Utf8/.clang-tidy

@@ -1,2 +0,0 @@
-# Disable all checks in this folder.
-Checks: '-*'

Core/tests/ArbitraryResourceWorker.cpp

@@ -151,37 +151,6 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
       REQUIRE(worker.images[0] == "res1");
     }
 
-    SECTION("Can find resource usages in behavior configurations") {
-      gd::Platform platform;
-      gd::Project project;
-      SetupProjectWithDummyPlatform(project, platform);
-
-      project.GetResourcesManager().AddResource(
-          "res1", "path/to/file1.png", "image");
-      project.GetResourcesManager().AddResource(
-          "res2", "path/to/file2.png", "image");
-      project.GetResourcesManager().AddResource(
-          "res3", "path/to/file3.png", "image");
-      project.GetResourcesManager().AddResource(
-          "res4", "path/to/file4.png", "audio");
-      ArbitraryResourceWorkerTest worker(project.GetResourcesManager());
-
-      auto &layout = project.InsertNewLayout("Scene", 0);
-      auto &object = layout.GetObjects().InsertNewObject(
-          project, "MyExtension::Sprite", "MyObject", 0);
-      auto *behavior = object.AddNewBehavior(
-          project, "MyExtension::BehaviorWithRequiredBehaviorProperty",
-          "BehaviorWithResource");
-      behavior->UpdateProperty("resourceProperty", "res1");
-
-      worker.files.clear();
-      worker.images.clear();
-      gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
-      REQUIRE(worker.files.size() == 4);
-      REQUIRE(worker.images.size() == 1);
-      REQUIRE(worker.images[0] == "res1");
-    }
-
     SECTION("Can find resource usages in layout events") {
       gd::Platform platform;
       gd::Project project;

Core/tests/DummyPlatform.cpp

@@ -39,31 +39,20 @@ class BehaviorWithRequiredBehaviorProperty : public gd::Behavior {
             behaviorContent.GetStringAttribute("requiredBehaviorProperty"))
         .SetType("Behavior")
         .AddExtraInfo("MyExtension::MyBehavior");
-    properties["resourceProperty"]
-        .SetLabel("A resource")
-        .SetValue(
-            behaviorContent.GetStringAttribute("resourceProperty"))
-        .SetType("Resource")
-        .AddExtraInfo("image");
     return properties;
   }
   virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
                               const gd::String& name,
                               const gd::String& value) override {
-    if (name == "requiredBehaviorProperty") {
+    if (name == _("requiredBehaviorProperty")) {
       behaviorContent.SetAttribute("requiredBehaviorProperty", value);
       return true;
     }
-    if (name == "resourceProperty") {
-      behaviorContent.SetAttribute("resourceProperty", value);
-      return true;
-    }
     return false;
   }
   virtual void InitializeContent(
       gd::SerializerElement& behaviorContent) override {
     behaviorContent.SetAttribute("requiredBehaviorProperty", "");
-    behaviorContent.SetAttribute("resourceProperty", "");
   }
 };
 
@@ -265,9 +254,9 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
 
   extension
       ->AddAction("SetNumberVariable",
-                  "Change variable value",
-                  "Modify the number value of a variable.",
-                  "the variable _PARAM0_",
+                  "Do something with number variables",
+                  "This does something with variables",
+                  "Do something with variables",
                   "",
                   "",
                   "")
@@ -278,9 +267,9 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
 
   extension
       ->AddAction("SetStringVariable",
-                  "Change text variable",
-                  "Modify the text (string) of a variable.",
-                  "the variable _PARAM0_",
+                  "Do something with string variables",
+                  "This does something with variables",
+                  "Do something with variables",
                   "",
                   "",
                   "")
@@ -291,9 +280,9 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
 
   extension
       ->AddAction("SetBooleanVariable",
-                  "Change boolean variable",
-                  "Modify the boolean value of a variable.",
-                  "Change the variable _PARAM0_: _PARAM1_",
+                  "Do something with boolean variables",
+                  "This does something with variables",
+                  "Do something with variables",
                   "",
                   "",
                   "")
@@ -358,17 +347,6 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
       .AddParameter("soundfile", "Parameter 3 (an audio resource)")
       .SetFunctionName("doSomethingWithResources");
 
-  extension
-      ->AddAction("DoSomethingWithAnyVariable",
-                  "Do something with variables",
-                  "This does something with variables",
-                  "Do something with variables please",
-                  "",
-                  "",
-                  "")
-      .AddParameter("variable", "Any variable")
-      .SetFunctionName("doSomethingWithAnyVariable");
-
   extension
       ->AddAction("DoSomethingWithLegacyPreScopedVariables",
                   "Do something with variables",
@@ -709,14 +687,6 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Property name"));
-
-  extension
-      ->AddAction("DisplayLeaderboard",
-                  "Display leaderboard",
-                  "Display the specified leaderboard on top of the game.",
-                  "Display leaderboard _PARAM1_",
-                  "Display leaderboard", "", "")
-      .AddParameter("leaderboardId", "Leaderboard", "", false);
   }
 
   {

Core/tests/ExpressionParser2.cpp

@@ -1737,12 +1737,10 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
 
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
       node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 3);
+      REQUIRE(validator.GetFatalErrors().size() == 2);
       REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
               "A name should be entered after the dot.");
       REQUIRE(validator.GetFatalErrors()[1]->GetMessage() ==
-              "An object variable or expression should be entered.");
-      REQUIRE(validator.GetFatalErrors()[2]->GetMessage() ==
               "A name should be entered after the dot.");
     }
   }
@@ -1819,19 +1817,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     }
   }
 
-  SECTION("Invalid object variables (non existing variable with child)") {
-    {
-      auto node =
-          parser.ParseExpression("MySpriteObject.MyNonExistingVariable.MyNonExistingChild");
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "This variable does not exist on this object or group.");
-    }
-  }
-
   SECTION("Invalid object (object entered without any variable)") {
     {
       auto node =
@@ -1977,25 +1962,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     }
   }
 
-  SECTION("Invalid property (required behavior)") {
-    {
-      gd::PropertiesContainer propertiesContainer(gd::EventsFunctionsContainer::Extension);
-
-      auto projectScopedContainersWithProperties = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout1);
-      projectScopedContainersWithProperties.AddPropertiesContainer(propertiesContainer);
-
-      propertiesContainer.InsertNew("MyRequiredBehavior").SetType("Behavior");
-
-      auto node =
-          parser.ParseExpression("\"abc\" + MyRequiredBehavior");
-
-      gd::ExpressionValidator validator(platform, projectScopedContainersWithProperties, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() == "Behaviors can't be used as a value in expressions.");
-    }
-  }
-
   SECTION("Invalid property (unsupported child syntax, 1 level)") {
     {
       gd::PropertiesContainer propertiesContainer(gd::EventsFunctionsContainer::Extension);
@@ -2391,12 +2357,10 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
 
     gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
     node->Visit(validator);
-    REQUIRE(validator.GetFatalErrors().size() == 3);
+    REQUIRE(validator.GetFatalErrors().size() == 2);
     REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
           "A name should be entered after the dot.");
     REQUIRE(validator.GetFatalErrors()[1]->GetMessage() ==
-          "An object variable or expression should be entered.");
-    REQUIRE(validator.GetFatalErrors()[2]->GetMessage() ==
           "A name should be entered after the dot.");
   }
 

Core/tests/ObjectSerialization.cpp

@@ -262,153 +262,4 @@ TEST_CASE("ObjectSerialization", "[common]") {
     auto &behaviorElement = behaviorsElement.GetChild(0);
     REQUIRE(behaviorElement.GetStringAttribute("name") == "MyBehavior");
   }
-
-  // Event-based object dependency cycles are not tested because they are forbidden by the editor.
-  SECTION("Save and load a project with custom object dependencies from different extensions") {
-    gd::Platform platform;
-    gd::Project writtenProject;
-    SetupProjectWithDummyPlatform(writtenProject, platform);
-
-    {
-      // The extension with the dependency is added first to make the
-      // implementation change the order in which extensions are loaded.
-      auto &eventsExtensionWithDependency =
-          writtenProject.InsertNewEventsFunctionsExtension(
-              "MyEventsExtensionWithDependency", 0);
-      auto &eventsExtension = writtenProject.InsertNewEventsFunctionsExtension(
-          "MyEventsExtension", 1);
-      {
-        auto &eventsBasedObject =
-            eventsExtension.GetEventsBasedObjects().InsertNew(
-                "MyEventsBasedObject", 0);
-        auto &childObject = eventsBasedObject.GetObjects().InsertNewObject(
-            writtenProject, "MyExtension::Sprite", "MyChildSprite", 0);
-      }
-      // An event-based object with a custom object child that overrides its
-      // configuration.
-      {
-        auto &eventsBasedObject =
-            eventsExtensionWithDependency.GetEventsBasedObjects().InsertNew(
-                "MyEventsBasedObjectWithDependency", 0);
-        auto &childObject = eventsBasedObject.GetObjects().InsertNewObject(
-            writtenProject, "MyEventsExtension::MyEventsBasedObject",
-            "MyChildCustomObject", 0);
-        auto *customObjectConfiguration =
-            dynamic_cast<gd::CustomObjectConfiguration *>(
-                &childObject.GetConfiguration());
-        auto &spriteConfiguration =
-            customObjectConfiguration->GetChildObjectConfiguration(
-                "MyChildSprite");
-        SetupSpriteConfiguration(spriteConfiguration);
-      }
-    }
-
-    SerializerElement projectElement;
-    writtenProject.SerializeTo(projectElement);
-
-    gd::Project readProject;
-    readProject.AddPlatform(platform);
-    readProject.UnserializeFrom(projectElement);
-
-    REQUIRE(readProject.GetEventsFunctionsExtensionsCount() == 2);
-    auto &eventsExtensionWithDependency =
-        readProject.GetEventsFunctionsExtension(0);
-    REQUIRE(eventsExtensionWithDependency.GetEventsBasedObjects().GetCount() ==
-            1);
-    auto &eventsBasedObject =
-        eventsExtensionWithDependency.GetEventsBasedObjects().Get(0);
-    REQUIRE(eventsBasedObject.GetObjects().GetObjectsCount() == 1);
-    auto &childObject = eventsBasedObject.GetObjects().GetObject(0);
-    REQUIRE(childObject.GetName() == "MyChildCustomObject");
-    REQUIRE(childObject.GetType() == "MyEventsExtension::MyEventsBasedObject");
-    auto *customObjectConfiguration =
-        dynamic_cast<gd::CustomObjectConfiguration *>(
-            &childObject.GetConfiguration());
-    REQUIRE(customObjectConfiguration != nullptr);
-    auto &spriteConfiguration =
-        customObjectConfiguration->GetChildObjectConfiguration("MyChildSprite");
-    CheckSpriteConfiguration(spriteConfiguration);
-  }
-
-  SECTION("Save and load a project with custom object dependencies inside an extension") {
-    gd::Platform platform;
-    gd::Project writtenProject;
-    SetupProjectWithDummyPlatform(writtenProject, platform);
-
-    {
-      auto &eventsExtension = writtenProject.InsertNewEventsFunctionsExtension(
-          "MyEventsExtension", 0);
-      {
-        auto &eventsBasedObject =
-            eventsExtension.GetEventsBasedObjects().InsertNew(
-                "MyEventsBasedObject", 0);
-        auto &childObject = eventsBasedObject.GetObjects().InsertNewObject(
-            writtenProject, "MyExtension::Sprite", "MyChildSprite", 0);
-      }
-      // An event-based object with a custom object child that overrides its
-      // configuration.
-      // The extension with the dependency is added first to make the
-      // implementation change the order in which extensions are loaded.
-      {
-        auto &eventsBasedObject =
-            eventsExtension.GetEventsBasedObjects().InsertNew(
-                "MyEventsBasedObjectWithDependency", 0);
-        auto &childObject = eventsBasedObject.GetObjects().InsertNewObject(
-            writtenProject, "MyEventsExtension::MyEventsBasedObject",
-            "MyChildCustomObject", 0);
-        auto *customObjectConfiguration =
-            dynamic_cast<gd::CustomObjectConfiguration *>(
-                &childObject.GetConfiguration());
-        auto &spriteConfiguration =
-            customObjectConfiguration->GetChildObjectConfiguration(
-                "MyChildSprite");
-        SetupSpriteConfiguration(spriteConfiguration);
-      }
-    }
-
-    SerializerElement projectElement;
-    writtenProject.SerializeTo(projectElement);
-
-    gd::Project readProject;
-    readProject.AddPlatform(platform);
-    readProject.UnserializeFrom(projectElement);
-
-    REQUIRE(readProject.GetEventsFunctionsExtensionsCount() == 1);
-    auto &eventsExtension =
-        readProject.GetEventsFunctionsExtension(0);
-    REQUIRE(eventsExtension.GetEventsBasedObjects().GetCount() == 2);
-    auto &eventsBasedObject =
-        eventsExtension.GetEventsBasedObjects().Get(0);
-    REQUIRE(eventsBasedObject.GetObjects().GetObjectsCount() == 1);
-    auto &childObject = eventsBasedObject.GetObjects().GetObject(0);
-    REQUIRE(childObject.GetName() == "MyChildCustomObject");
-    REQUIRE(childObject.GetType() == "MyEventsExtension::MyEventsBasedObject");
-    auto *customObjectConfiguration =
-        dynamic_cast<gd::CustomObjectConfiguration *>(
-            &childObject.GetConfiguration());
-    REQUIRE(customObjectConfiguration != nullptr);
-    auto &spriteConfiguration =
-        customObjectConfiguration->GetChildObjectConfiguration("MyChildSprite");
-    CheckSpriteConfiguration(spriteConfiguration);
-  }
-
-  SECTION("Can unserialize over an existing extension without duplicating its event-based objects") {
-    gd::Platform platform;
-    gd::Project project;
-    SetupProjectWithDummyPlatform(project, platform);
-
-    auto &eventsExtension =
-        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
-    {
-      auto &eventsBasedObject =
-          eventsExtension.GetEventsBasedObjects().InsertNew(
-              "MyEventsBasedObject", 0);
-    }
-
-    SerializerElement extensionElement;
-    eventsExtension.SerializeTo(extensionElement);
-    eventsExtension.UnserializeFrom(project, extensionElement);
-
-    REQUIRE(eventsExtension.GetEventsBasedObjects().GetCount() == 1);
-  }
-}
+}

Core/tests/Project-EnsureObjectDefaultBehaviors.cpp

@@ -1,74 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-/**
- * @file Tests covering common features of GDevelop Core.
- */
-#include "GDCore/Project/Project.h"
-
-#include <algorithm>
-
-#include "DummyPlatform.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/String.h"
-#include "catch.hpp"
-
-TEST_CASE("Project::EnsureObjectDefaultBehaviors", "[common]") {
-  SECTION("Check that default behaviors are added to an object") {
-    gd::Platform platform;
-    gd::Project project;
-    SetupProjectWithDummyPlatform(project, platform);
-
-    auto myObject = project.CreateObject("MyExtension::Sprite", "MyObject");
-    REQUIRE(myObject->GetType() == "MyExtension::Sprite");
-    REQUIRE(myObject->GetAllBehaviorNames().size() == 0);
-
-    project.EnsureObjectDefaultBehaviors(*myObject);
-    REQUIRE(myObject->GetAllBehaviorNames().size() == 0);
-
-    // Modify the "Sprite" extension to add a default behavior to the object.
-    const auto& allExtensions = platform.GetAllPlatformExtensions();
-    auto spriteExtensionIt = std::find_if(
-        allExtensions.begin(),
-        allExtensions.end(),
-        [&](const std::shared_ptr<gd::PlatformExtension>& extension) {
-          return extension->GetName() == "MyExtension";
-        });
-    REQUIRE(spriteExtensionIt != allExtensions.end());
-    auto spriteExtension = *spriteExtensionIt;
-
-    auto& spriteObjectMetadata =
-        spriteExtension->GetObjectMetadata("MyExtension::Sprite");
-    REQUIRE(gd::MetadataProvider::IsBadObjectMetadata(spriteObjectMetadata) ==
-            false);
-
-    spriteObjectMetadata.AddDefaultBehavior(
-        "FlippableCapability::FlippableBehavior");
-
-    // Ensure the default behavior is added.
-    project.EnsureObjectDefaultBehaviors(*myObject);
-    REQUIRE(myObject->GetAllBehaviorNames().size() == 1);
-    REQUIRE(myObject->GetAllBehaviorNames()[0] == "Flippable");
-    REQUIRE(myObject->GetBehavior("Flippable").GetTypeName() == "FlippableCapability::FlippableBehavior");
-
-    // Ensure default behaviors are adapted if the object default behaviors are modified.
-    // While this can not happen with pre-coded extensions, it can happen with custom objects.
-    spriteObjectMetadata.ResetDefaultBehaviorsJustForTesting();
-    spriteObjectMetadata.AddDefaultBehavior(
-        "ResizableCapability::ResizableBehavior");
-    spriteObjectMetadata.AddDefaultBehavior(
-        "ScalableCapability::ScalableBehavior");
-
-    project.EnsureObjectDefaultBehaviors(*myObject);
-    REQUIRE(myObject->GetAllBehaviorNames().size() == 2);
-    REQUIRE(myObject->GetAllBehaviorNames()[0] == "Resizable");
-    REQUIRE(myObject->GetAllBehaviorNames()[1] == "Scale");
-    REQUIRE(myObject->GetBehavior("Resizable").GetTypeName() == "ResizableCapability::ResizableBehavior");
-    REQUIRE(myObject->GetBehavior("Scale").GetTypeName() == "ScalableCapability::ScalableBehavior");
-  }
-}

Core/tests/WholeProjectRefactorer.cpp

@@ -77,34 +77,6 @@ const gd::String &GetEventFirstActionType(const gd::BaseEvent &event) {
   return actions.Get(0).GetType();
 }
 
-const gd::Instruction &
-CreateInstructionWithNumberParameter(gd::Project &project,
-                                     gd::EventsList &events,
-                                     const gd::String &expression) {
-  gd::StandardEvent &event = dynamic_cast<gd::StandardEvent &>(
-      events.InsertNewEvent(project, "BuiltinCommonInstructions::Standard"));
-
-  gd::Instruction instruction;
-  instruction.SetType("MyExtension::DoSomething");
-  instruction.SetParametersCount(1);
-  instruction.SetParameter(0, expression);
-  return event.GetActions().Insert(instruction);
-}
-
-const gd::Instruction &
-CreateInstructionWithVariableParameter(gd::Project &project,
-                                     gd::EventsList &events,
-                                     const gd::String &expression) {
-  gd::StandardEvent &event = dynamic_cast<gd::StandardEvent &>(
-      events.InsertNewEvent(project, "BuiltinCommonInstructions::Standard"));
-
-  gd::Instruction instruction;
-  instruction.SetType("MyExtension::DoSomethingWithAnyVariable");
-  instruction.SetParametersCount(1);
-  instruction.SetParameter(0, expression);
-  return event.GetActions().Insert(instruction);
-}
-
 enum TestEvent {
   FreeFunctionAction,
   FreeFunctionWithExpression,
@@ -1561,8 +1533,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       // events in this test.
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForFreeEventsFunction(
               project, eventsExtension, eventsFunction,
@@ -1590,8 +1561,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
           eventsExtension.GetEventsFunction("MyOtherEventsFunction");
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForFreeEventsFunction(
               project, eventsExtension, eventsFunction,
@@ -1646,8 +1616,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
           project, "MyExtension::Sprite", "Object2", 0);
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForEventsBasedObject(
               project, eventsExtension, eventsBasedObject,
@@ -1688,8 +1657,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       eventsBasedObject.GetInitialInstances().InsertInitialInstance(instance2);
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForEventsBasedObject(
               project, eventsExtension, eventsBasedObject,
@@ -1715,8 +1683,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
               .Get("MyOtherEventsBasedObject");
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForEventsBasedObject(
               project, eventsExtension, eventsBasedObject,
@@ -1771,8 +1738,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
           project, "MyExtension::Sprite", "Object2", 0);
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForEventsBasedObject(
               project, eventsExtension, eventsBasedObject,
@@ -1812,8 +1778,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       eventsBasedObject.GetInitialInstances().InsertInitialInstance(instance2);
 
       // Create the objects container for the events function
-      gd::ObjectsContainer parametersObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parametersObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForEventsBasedObject(
               project, eventsExtension, eventsBasedObject,
@@ -2027,7 +1992,7 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
     SetupProjectWithDummyPlatform(project, platform);
     auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
 
-    // An events-based behavior is copied from one extension to another.
+    // A behavior is copied from one extension to another.
 
     auto &destinationExtension =
         project.InsertNewEventsFunctionsExtension("DestinationExtension", 0);
@@ -2036,19 +2001,21 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
     // instruction keeps pointing to the old extension.
     destinationExtension.InsertNewEventsFunction("MyEventsFunction", 0);
 
-    auto &duplicatedBehavior =
+    auto &copiedBehavior =
         destinationExtension.GetEventsBasedBehaviors().InsertNew(
             "MyOtherEventsBasedBehavior", 0);
-    duplicatedBehavior.SetObjectType("MyEventsExtension::MyEventsBasedObject");
+    copiedBehavior.SetFullName("My events based behavior");
+    copiedBehavior.SetDescription("An events based behavior for test");
+    copiedBehavior.SetObjectType("MyEventsExtension::MyEventsBasedObject");
 
     // Add the copied events.
-    auto &eventsFunctions = duplicatedBehavior.GetEventsFunctions();
-    auto &behaviorAction = eventsFunctions.InsertNewEventsFunction(
-        "MyObjectEventsFunction", 0);
+    auto &behaviorEventsFunctions = copiedBehavior.GetEventsFunctions();
+    auto &behaviorAction = behaviorEventsFunctions.InsertNewEventsFunction(
+        "MyBehaviorEventsFunction", 0);
     SetupEvents(behaviorAction.GetEvents());
 
     gd::WholeProjectRefactorer::UpdateExtensionNameInEventsBasedBehavior(
-        project, destinationExtension, duplicatedBehavior, "MyEventsExtension");
+        project, destinationExtension, copiedBehavior, "MyEventsExtension");
 
     // Check that events function calls in instructions have been renamed
     REQUIRE(GetEventFirstActionType(behaviorAction.GetEvents().GetEvent(
@@ -2056,123 +2023,13 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
 
     for (auto *eventsList : GetEventsLists(project)) {
       // Check that events function calls in instructions have NOT been renamed
-      // outside of the copied events-based behavior.
+      // outside of the copied behavior.
       REQUIRE(
           GetEventFirstActionType(eventsList->GetEvent(FreeFunctionAction)) ==
           "MyEventsExtension::MyEventsFunction");
     }
   }
 
-  SECTION("Events extension renamed in instructions scoped to one object") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-
-    // An events-based object is copied from one extension to another.
-
-    auto &destinationExtension =
-        project.InsertNewEventsFunctionsExtension("DestinationExtension", 0);
-    // Add the function used by the instruction that is checked in this test.
-    // When the function doesn't exist the destination extension, the
-    // instruction keeps pointing to the old extension.
-    destinationExtension.InsertNewEventsFunction("MyEventsFunction", 0);
-
-    auto &duplicatedObject =
-        destinationExtension.GetEventsBasedObjects().InsertNew(
-            "MyDuplicatedEventsBasedObject", 0);
-
-    // Add the copied events.
-    auto &eventsFunctions = duplicatedObject.GetEventsFunctions();
-    auto &objectAction = eventsFunctions.InsertNewEventsFunction(
-        "MyBehaviorEventsFunction", 0);
-    SetupEvents(objectAction.GetEvents());
-
-    gd::WholeProjectRefactorer::UpdateExtensionNameInEventsBasedObject(
-        project, destinationExtension, duplicatedObject, "MyEventsExtension");
-
-    // Check that events function calls in instructions have been renamed
-    REQUIRE(GetEventFirstActionType(objectAction.GetEvents().GetEvent(
-                FreeFunctionAction)) == "DestinationExtension::MyEventsFunction");
-
-    for (auto *eventsList : GetEventsLists(project)) {
-      // Check that events function calls in instructions have NOT been renamed
-      // outside of the copied events-based object.
-      REQUIRE(
-          GetEventFirstActionType(eventsList->GetEvent(FreeFunctionAction)) ==
-          "MyEventsExtension::MyEventsFunction");
-    }
-  }
-
-  SECTION("Events-based behavior renamed in instructions scoped to one behavior") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-
-    // An events-based behavior is duplicated in the same extension.
-    auto &duplicatedBehavior =
-        eventsExtension.GetEventsBasedBehaviors().InsertNew(
-            "MyDuplicatedEventsBasedBehavior", 0);
-    duplicatedBehavior.SetObjectType("MyEventsExtension::MyEventsBasedObject");
-
-    // Add the copied events.
-    auto &eventsFunctions = duplicatedBehavior.GetEventsFunctions();
-    auto &behaviorAction = eventsFunctions.InsertNewEventsFunction(
-        "MyBehaviorEventsFunction", 0);
-    SetupEvents(behaviorAction.GetEvents());
-
-    gd::WholeProjectRefactorer::UpdateBehaviorNameInEventsBasedBehavior(
-        project, eventsExtension, duplicatedBehavior, "MyEventsBasedBehavior");
-
-    // Check that events function calls in instructions have been renamed
-    REQUIRE(GetEventFirstActionType(
-                behaviorAction.GetEvents().GetEvent(BehaviorAction)) ==
-            "MyEventsExtension::MyDuplicatedEventsBasedBehavior::MyBehaviorEventsFunction");
-
-    for (auto *eventsList : GetEventsLists(project)) {
-      // Check that events function calls in instructions have NOT been renamed
-      // outside of the duplicated events-based behavior.
-      REQUIRE(
-          GetEventFirstActionType(eventsList->GetEvent(BehaviorAction)) ==
-          "MyEventsExtension::MyEventsBasedBehavior::MyBehaviorEventsFunction");
-    }
-  }
-
-  SECTION("Events-based object renamed in instructions scoped to one object") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-
-    // An events-based object is duplicated in the same extension.
-    auto &duplicatedObject =
-        eventsExtension.GetEventsBasedObjects().InsertNew(
-            "MyDuplicatedEventsBasedObject", 0);
-
-    // Add the copied events.
-    auto &eventsFunctions = duplicatedObject.GetEventsFunctions();
-    auto &objectAction = eventsFunctions.InsertNewEventsFunction(
-        "MyObjectEventsFunction", 0);
-    SetupEvents(objectAction.GetEvents());
-
-    gd::WholeProjectRefactorer::UpdateObjectNameInEventsBasedObject(
-        project, eventsExtension, duplicatedObject, "MyEventsBasedObject");
-
-    // Check that events function calls in instructions have been renamed
-    REQUIRE(GetEventFirstActionType(
-                objectAction.GetEvents().GetEvent(ObjectAction)) ==
-            "MyEventsExtension::MyDuplicatedEventsBasedObject::MyObjectEventsFunction");
-
-    for (auto *eventsList : GetEventsLists(project)) {
-      // Check that events function calls in instructions have NOT been renamed
-      // outside of the duplicated events-based object.
-      REQUIRE(
-          GetEventFirstActionType(eventsList->GetEvent(ObjectAction)) ==
-          "MyEventsExtension::MyEventsBasedObject::MyObjectEventsFunction");
-    }
-  }
-
   SECTION("Events extension renamed in parameters") {
     gd::Project project;
     gd::Platform platform;
@@ -3073,66 +2930,6 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
     }
   }
 
-  SECTION("(Events based behavior) property renamed (in expressions)") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-    auto &eventsBasedBehavior =
-        eventsExtension.GetEventsBasedBehaviors().Get("MyEventsBasedBehavior");
-
-    auto &behaviorAction =
-        eventsBasedBehavior.GetEventsFunctions().InsertNewEventsFunction(
-            "MyBehaviorEventsFunction", 0);
-    gd::WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
-        eventsExtension, eventsBasedBehavior);
-    auto &instruction = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(), "MyProperty");
-    auto &instruction2 = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(),
-        "MyExtension::GetVariableAsNumber(MyVariable.MyChild[MyProperty])");
-
-    gd::WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
-        project, eventsExtension, eventsBasedBehavior, "MyProperty",
-        "MyRenamedProperty");
-
-    REQUIRE(instruction.GetParameter(0).GetPlainString() ==
-            "MyRenamedProperty");
-    REQUIRE(instruction2.GetParameter(0).GetPlainString() ==
-            "MyExtension::GetVariableAsNumber(MyVariable.MyChild[MyRenamedProperty])");
-  }
-
-  SECTION("(Events based behavior) property not renamed (in variable parameter)") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-    auto &eventsBasedBehavior =
-        eventsExtension.GetEventsBasedBehaviors().Get("MyEventsBasedBehavior");
-
-    auto &behaviorAction =
-        eventsBasedBehavior.GetEventsFunctions().InsertNewEventsFunction(
-            "MyBehaviorEventsFunction", 0);
-    gd::WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
-        eventsExtension, eventsBasedBehavior);
-    // Properties can't actually be used in "variable" parameters.
-    auto &instruction = CreateInstructionWithVariableParameter(
-        project, behaviorAction.GetEvents(), "MyProperty");
-    auto &instruction2 = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(),
-        "MyExtension::GetVariableAsNumber(MyProperty)");
-
-    gd::WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
-        project, eventsExtension, eventsBasedBehavior, "MyProperty",
-        "MyRenamedProperty");
-
-    // "variable" parameters are left untouched.
-    REQUIRE(instruction.GetParameter(0).GetPlainString() ==
-            "MyProperty");
-    REQUIRE(instruction2.GetParameter(0).GetPlainString() ==
-            "MyExtension::GetVariableAsNumber(MyProperty)");
-  }
-
   SECTION("(Events based behavior) shared property renamed") {
     gd::Project project;
     gd::Platform platform;
@@ -3184,35 +2981,6 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
     }
   }
 
-  SECTION("(Events based behavior) shared property renamed (in expressions)") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-    auto &eventsBasedBehavior =
-        eventsExtension.GetEventsBasedBehaviors().Get("MyEventsBasedBehavior");
-
-    auto &behaviorAction =
-        eventsBasedBehavior.GetEventsFunctions().InsertNewEventsFunction(
-            "MyBehaviorEventsFunction", 0);
-    gd::WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
-        eventsExtension, eventsBasedBehavior);
-    auto &instruction = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(), "MySharedProperty");
-    auto &instruction2 = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(),
-        "MyExtension::GetVariableAsNumber(MyVariable.MyChild[MySharedProperty])");
-
-    gd::WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
-        project, eventsExtension, eventsBasedBehavior, "MySharedProperty",
-        "MyRenamedSharedProperty");
-
-    REQUIRE(instruction.GetParameter(0).GetPlainString() ==
-            "MyRenamedSharedProperty");
-    REQUIRE(instruction2.GetParameter(0).GetPlainString() ==
-            "MyExtension::GetVariableAsNumber(MyVariable.MyChild[MyRenamedSharedProperty])");
-  }
-
   SECTION("(Events based object) property renamed") {
     gd::Project project;
     gd::Platform platform;
@@ -3242,66 +3010,6 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
               "MyCustomObject.PropertyMyRenamedProperty()");
     }
   }
-
-  SECTION("(Events based object) property renamed (in expressions)") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-    auto &eventsBasedObject =
-        eventsExtension.GetEventsBasedObjects().Get("MyEventsBasedObject");
-
-    auto &behaviorAction =
-        eventsBasedObject.GetEventsFunctions().InsertNewEventsFunction(
-            "MyObjectEventsFunction", 0);
-    gd::WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
-        eventsExtension, eventsBasedObject);
-    auto &instruction = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(), "MyProperty");
-    auto &instruction2 = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(),
-        "MyExtension::GetVariableAsNumber(MyVariable.MyChild[MyProperty])");
-
-    gd::WholeProjectRefactorer::RenameEventsBasedObjectProperty(
-        project, eventsExtension, eventsBasedObject, "MyProperty",
-        "MyRenamedProperty");
-
-    REQUIRE(instruction.GetParameter(0).GetPlainString() ==
-            "MyRenamedProperty");
-    REQUIRE(instruction2.GetParameter(0).GetPlainString() ==
-            "MyExtension::GetVariableAsNumber(MyVariable.MyChild[MyRenamedProperty])");
-  }
-
-  SECTION("(Events based object) property not renamed (in variable parameter)") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
-    auto &eventsBasedObject =
-        eventsExtension.GetEventsBasedObjects().Get("MyEventsBasedObject");
-
-    auto &behaviorAction =
-        eventsBasedObject.GetEventsFunctions().InsertNewEventsFunction(
-            "MyObjectEventsFunction", 0);
-    gd::WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
-        eventsExtension, eventsBasedObject);
-    // Properties can't actually be used in "variable" parameters.
-    auto &instruction = CreateInstructionWithVariableParameter(
-        project, behaviorAction.GetEvents(), "MyProperty");
-    auto &instruction2 = CreateInstructionWithNumberParameter(
-        project, behaviorAction.GetEvents(),
-        "MyExtension::GetVariableAsNumber(MyProperty)");
-
-    gd::WholeProjectRefactorer::RenameEventsBasedObjectProperty(
-        project, eventsExtension, eventsBasedObject, "MyProperty",
-        "MyRenamedProperty");
-
-    // "variable" parameters are left untouched.
-    REQUIRE(instruction.GetParameter(0).GetPlainString() ==
-            "MyProperty");
-    REQUIRE(instruction2.GetParameter(0).GetPlainString() ==
-            "MyExtension::GetVariableAsNumber(MyProperty)");
-  }
 }
 // TODO: Check that this works when behaviors are attached to a child-object.
 TEST_CASE("WholeProjectRefactorer (FindInvalidRequiredBehaviorProperties)",
@@ -4635,33 +4343,4 @@ TEST_CASE("MergeLayers", "[common]") {
     // Other layers from the same layout are untouched.
     REQUIRE(initialInstances.GetLayerInstancesCount("My other layer") == 1);
   }
-
-  // TODO: ideally, a test should also cover objects having `leaderboardId` as property.
-  SECTION("Can rename a leaderboard in scene events") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-
-    auto &layout = project.InsertNewLayout("My layout", 0);
-
-    gd::StandardEvent &event = dynamic_cast<gd::StandardEvent &>(
-        layout.GetEvents().InsertNewEvent(project, "BuiltinCommonInstructions::Standard"));
-
-    gd::Instruction action;
-    action.SetType("MyExtension::DisplayLeaderboard");
-    action.SetParametersCount(1);
-    action.SetParameter(0, gd::Expression("\"12345678-9abc-def0-1234-56789abcdef0\""));
-    event.GetActions().Insert(action);
-
-    std::set<gd::String> allLeaderboardIds = gd::WholeProjectRefactorer::FindAllLeaderboardIds(project);
-    REQUIRE(allLeaderboardIds.size() == 1);
-    REQUIRE(allLeaderboardIds.count("12345678-9abc-def0-1234-56789abcdef0") == 1);
-
-    std::map<gd::String, gd::String> leaderboardIdMap;
-    leaderboardIdMap["12345678-9abc-def0-1234-56789abcdef0"] = "87654321-9abc-def0-1234-56789abcdef0";
-    gd::WholeProjectRefactorer::RenameLeaderboards(project, leaderboardIdMap);
-
-    REQUIRE(GetEventFirstActionFirstParameterString(layout.GetEvents().GetEvent(0)) ==
-            "\"87654321-9abc-def0-1234-56789abcdef0\"");
-  }
 }

Extensions/3D/CustomRuntimeObject3D.ts

@@ -112,25 +112,10 @@ namespace gdjs {
      * @return The Z position of the rendered object.
      */
     getDrawableZ(): float {
-      let minZ = 0;
-      if (this._innerArea) {
-        minZ = this._innerArea.min[2];
-      } else {
-        if (this._isUntransformedHitBoxesDirty) {
-          this._updateUntransformedHitBoxes();
-        }
-        minZ = this._minZ;
-      }
-      const absScaleZ = this.getScaleZ();
-      if (!this._flippedZ) {
-        return this._z + minZ * absScaleZ;
-      } else {
-        return (
-          this._z +
-          (-minZ - this.getUnscaledDepth() + 2 * this.getUnscaledCenterZ()) *
-            absScaleZ
-        );
+      if (this._isUntransformedHitBoxesDirty) {
+        this._updateUntransformedHitBoxes();
       }
+      return this._z + this._minZ;
     }
 
     /**
@@ -253,39 +238,10 @@ namespace gdjs {
       this.setAngle(gdjs.toDegrees(mesh.rotation.z));
     }
 
-    /**
-     * @return the internal top bound of the object according to its children.
-     */
-    getInnerAreaMinZ(): number {
-      if (this._innerArea) {
-        return this._innerArea.min[2];
-      }
-      if (this._isUntransformedHitBoxesDirty) {
-        this._updateUntransformedHitBoxes();
-      }
-      return this._minZ;
-    }
-
-    /**
-     * @return the internal bottom bound of the object according to its children.
-     */
-    getInnerAreaMaxZ(): number {
-      if (this._innerArea) {
-        return this._innerArea.max[2];
-      }
-      if (this._isUntransformedHitBoxesDirty) {
-        this._updateUntransformedHitBoxes();
-      }
-      return this._maxZ;
-    }
-
     /**
      * @return the internal width of the object according to its children.
      */
     getUnscaledDepth(): float {
-      if (this._innerArea) {
-        return this._innerArea.max[2] - this._innerArea.min[2];
-      }
       if (this._isUntransformedHitBoxesDirty) {
         this._updateUntransformedHitBoxes();
       }
@@ -324,9 +280,6 @@ namespace gdjs {
       if (this.hasCustomRotationCenter()) {
         return this._customCenterZ;
       }
-      if (this._innerArea) {
-        return (this._innerArea.min[2] + this._innerArea.max[2]) / 2;
-      }
       if (this._isUntransformedHitBoxesDirty) {
         this._updateUntransformedHitBoxes();
       }

Extensions/3D/JsExtension.js

@@ -2203,8 +2203,6 @@ module.exports = {
           if (!texture.baseTexture.valid) {
             // Post pone texture update if texture is not loaded.
             texture.once('update', () => {
-              if (this._wasDestroyed) return;
-
               this.updateTexture();
               this.updatePIXISprite();
             });
@@ -2377,7 +2375,6 @@ module.exports = {
           getFaceMaterial(this._project, materialIndexToFaceIndex[4]),
           getFaceMaterial(this._project, materialIndexToFaceIndex[5]),
         ]);
-        if (this._wasDestroyed) return;
 
         this._threeObject.material[0] = materials[0];
         this._threeObject.material[1] = materials[1];
@@ -2826,7 +2823,6 @@ module.exports = {
         this._pixiResourcesLoader
           .get3DModel(project, modelResourceName)
           .then((model3d) => {
-            if (this._wasDestroyed) return;
             const clonedModel3D = THREE_ADDONS.SkeletonUtils.clone(
               model3d.scene
             );
@@ -3231,9 +3227,9 @@ module.exports = {
               : this._originalDepth / modelDepth;
           const minScaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
           if (!Number.isFinite(minScaleRatio)) {
-            this._defaultWidth = this._originalWidth;
-            this._defaultHeight = this._originalHeight;
-            this._defaultDepth = this._originalDepth;
+            this._defaultWidth = modelWidth;
+            this._defaultHeight = modelHeight;
+            this._defaultDepth = modelDepth;
           } else {
             if (widthRatio === minScaleRatio) {
               this._defaultWidth = this._originalWidth;
@@ -3274,10 +3270,6 @@ module.exports = {
               this._defaultDepth = this._originalDepth;
             }
           }
-        } else {
-          this._defaultWidth = this._originalWidth;
-          this._defaultHeight = this._originalHeight;
-          this._defaultDepth = this._originalDepth;
         }
 
         this._threeObject.add(this._threeModelGroup);
@@ -3346,7 +3338,6 @@ module.exports = {
           this._pixiResourcesLoader
             .get3DModel(this._project, modelResourceName)
             .then((model3d) => {
-              if (this._wasDestroyed) return;
               this._clonedModel3D = THREE_ADDONS.SkeletonUtils.clone(
                 model3d.scene
               );

Extensions/3D/Model3DRuntimeObject.ts

@@ -376,9 +376,6 @@ namespace gdjs {
 
     setAnimationElapsedTime(time: float): void {
       this._renderer.setAnimationElapsedTime(time);
-      if (!this._animationPaused) {
-        this._renderer.resumeAnimation();
-      }
     }
 
     getAnimationDuration(): float {