Fix the mock.

.circleci/config.yml

@@ -30,7 +30,7 @@ jobs:
 
       - 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 ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -107,7 +107,7 @@ jobs:
 
       - 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 ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       - run:
           name: Install system dependencies for Electron builder
@@ -127,8 +127,7 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
 
       # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
       - run:
@@ -185,7 +184,7 @@ jobs:
 
       - 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 ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -201,8 +200,7 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
 
       - save_cache:
           paths:

.github/ISSUE_TEMPLATE/--automatic-crash.yml

@@ -1,37 +0,0 @@
-name: 💥 Automatic crash report
-description: Do not use this template for bug reports. This template is only for automatic crash reports.
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe what you were doing when the crash happened
-      description: If applicable, add screenshots to help explain your problem.
-      placeholder: |
-        1. Went to '...'
-        2. Clicked on '...'
-        3. Scrolled down to '...'
-        4. Saw error
-  - type: input
-    id: gdevelop_version
-    attributes:
-      label: GDevelop version
-      description: |
-        The version of GDevelop used. Leave the prefilled value.
-    validations:
-      required: true
-  - type: textarea
-    id: platform_info
-    attributes:
-      label: Platform info
-      description: |
-        The platform you are using GDevelop on. Leave the prefilled value.
-  - type: textarea
-    id: error_stack
-    attributes:
-      label: Additional error context
-      description: Additonal context about the problem. Leave the prefilled value.
-  - type: textarea
-    id: component_stack
-    attributes:
-      label: Additional component context
-      description: Additonal context about the problem. Leave the prefilled value.

.github/ISSUE_TEMPLATE/--bug-report.yml

@@ -2,21 +2,18 @@ name: 🐛Bug report
 description: Create a bug report about GDevelop or the game engine
 body:
   - type: checkboxes
-    id: searched_issues
     attributes:
       label: Is there an existing issue for this?
       options:
-        - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
-          required: true
+      - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
+        required: true
   - type: textarea
-    id: description
     attributes:
       label: Describe the bug
       description: A clear and concise description of what the bug is.
     validations:
       required: true
   - type: textarea
-    id: reproduction_steps
     attributes:
       label: Steps to reproduce
       description: |
@@ -30,7 +27,6 @@ body:
     validations:
       required: true
   - type: dropdown
-    id: platform
     attributes:
       label: GDevelop platform
       description: Which platform of GDevelop are you using?
@@ -42,7 +38,6 @@ body:
     validations:
       required: true
   - type: input
-    id: gdevelop_version
     attributes:
       label: GDevelop version
       description: |
@@ -52,7 +47,6 @@ body:
     validations:
       required: true
   - type: textarea
-    id: platform_info
     attributes:
       label: Platform info
       value: |
@@ -72,7 +66,6 @@ body:
 
         </details>
   - type: textarea
-    id: additional_context
     attributes:
       label: Additional context
       description: Add any other context about the problem here.

.gitpod.yml

@@ -14,7 +14,7 @@ tasks:
     init: |
           sudo apt-get update 
           sudo apt install cmake python-is-python3 python3-distutils -y
-          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
           cd GDevelop.js
           npm install
           source ../emsdk/emsdk_env.sh && npm run build -- --dev

.travis.yml

@@ -39,7 +39,7 @@ install:
   - cd ..
 # Install Emscripten (for GDevelop.js)
   - git clone https://github.com/juj/emsdk.git
-  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+  - cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 # Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
 # Build GDevelop.js

.vscode/settings.json

@@ -113,8 +113,7 @@
     "memory_resource": "cpp",
     "__bits": "cpp",
     "__verbose_abort": "cpp",
-    "variant": "cpp",
-    "charconv": "cpp"
+    "variant": "cpp"
   },
   "files.exclude": {
     "Binaries/*build*": true,

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -164,7 +164,7 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
 }
 
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
-  return BaseEvent::AcceptVisitor(eventVisitor) ||
+  return BaseEvent::AcceptVisitor(eventVisitor) |
          eventVisitor.VisitLinkEvent(*this);
 }
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -299,6 +299,22 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
   AddIncludeFiles(instrInfos.GetIncludeFiles());
   maxConditionsListsSize =
       std::max(maxConditionsListsSize, condition.GetSubInstructions().size());
+
+  // Flag the ObjectsLists as modified.
+  gd::ParameterMetadataTools::IterateOverParameters(
+      condition.GetParameters(), instrInfos.parameters,
+      [this, &context,
+       &conditionCode](const gd::ParameterMetadata &parameterMetadata,
+                       const gd::Expression &parameterValue,
+                       const gd::String &lastObjectName) {
+        if (parameterMetadata.GetType() == "objectList" ||
+            parameterMetadata.GetType() == "objectListOrEmptyIfJustDeclared" ||
+            parameterMetadata.GetType() == "objectListOrEmptyWithoutPicking") {
+          conditionCode +=
+              GetObjectMapName(parameterValue.GetPlainString(), context) +
+              ".isPicked = true;\n";
+        }
+      });
 
   if (instrInfos.HasCustomCodeGenerator()) {
     context.EnterCustomCondition();
@@ -714,8 +730,6 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
              metadata.GetType() == "model3DResource" ||
-             metadata.GetType() == "atlasResource" ||
-             metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -585,6 +585,12 @@ class GD_CORE_API EventsCodeGenerator {
     return "fakeObjectListOf_" + objectName;
   }
 
+  // TODO Documentation
+  virtual gd::String GetObjectMapName(const gd::String &objectName,
+                                      gd::EventsCodeGenerationContext &context) {
+    return "fakeObjectListOf_" + objectName;
+  }
+
   virtual gd::String GeneratePropertyGetter(
       const gd::PropertiesContainer& propertiesContainer,
       const gd::NamedPropertyDescriptor& property,

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -277,11 +277,8 @@ class GD_CORE_API ExpressionParser2 {
 
   std::unique_ptr<VariableNode> Variable(const gd::String &name, gd::ExpressionParserLocation nameLocation) {
     auto variable = gd::make_unique<VariableNode>(name);
-
-    if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
-      variable->child = VariableAccessorOrVariableBracketAccessor();
-      variable->child->parent = variable.get();
-    }
+    variable->child = VariableAccessorOrVariableBracketAccessor();
+    variable->child->parent = variable.get();
 
     variable->location = ExpressionParserLocation(
         nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -305,12 +302,8 @@ class GD_CORE_API ExpressionParser2 {
                                "bracket for each opening bracket."));
       }
       SkipIfChar(IsClosingSquareBracket);
-
-      SkipAllWhitespaces();
-      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
-        child->child = VariableAccessorOrVariableBracketAccessor();
-        child->child->parent = child.get();
-      }
+      child->child = VariableAccessorOrVariableBracketAccessor();
+      child->child->parent = child.get();
       child->location =
           ExpressionParserLocation(childStartPosition, GetCurrentPosition());
 
@@ -322,15 +315,8 @@ class GD_CORE_API ExpressionParser2 {
       auto identifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
       auto child =
           gd::make_unique<VariableAccessorNode>(identifierAndLocation.name);
-      if (identifierAndLocation.name.empty()) {
-        child->diagnostic = RaiseSyntaxError(_("A name should be entered after the dot."));
-      }
-
-      SkipAllWhitespaces();
-      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
-        child->child = VariableAccessorOrVariableBracketAccessor();
-        child->child->parent = child.get();
-      }
+      child->child = VariableAccessorOrVariableBracketAccessor();
+      child->child->parent = child.get();
       child->nameLocation = identifierAndLocation.location;
       child->dotLocation = dotLocation;
       child->location =
@@ -339,11 +325,7 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(child);
     }
 
-    // Should never happen, unless a node called this function without checking if the current character
-    // was a dot or an opening bracket - this means there is an error in the grammar.
-    auto unrecognisedNode = gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>();
-    unrecognisedNode->diagnostic = RaiseSyntaxError(_("A dot or bracket was expected here."));
-    return std::move(unrecognisedNode);
+    return std::move(gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>());
   }
 
   std::unique_ptr<FunctionCallNode> FreeFunction(
@@ -379,24 +361,18 @@ class GD_CORE_API ExpressionParser2 {
     const auto &childIdentifierNameLocation =
         childIdentifierAndLocation.location;
 
-    std::unique_ptr<gd::ExpressionParserError> emptyNameError = childIdentifierName.empty() ?
-      RaiseSyntaxError(_("A name should be entered after the dot.")) : nullptr;
-
     SkipAllWhitespaces();
 
     if (IsNamespaceSeparator()) {
       ExpressionParserLocation namespaceSeparatorLocation =
           SkipNamespaceSeparator();
       SkipAllWhitespaces();
-      auto behaviorFunction = BehaviorFunction(parentIdentifier,
+      return BehaviorFunction(parentIdentifier,
                               childIdentifierName,
                               parentIdentifierLocation,
                               parentIdentifierDotLocation,
                               childIdentifierNameLocation,
                               namespaceSeparatorLocation);
-
-      if (emptyNameError) behaviorFunction->diagnostic = std::move(emptyNameError);
-      return std::move(behaviorFunction);
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
 
@@ -405,7 +381,7 @@ class GD_CORE_API ExpressionParser2 {
           childIdentifierName);
       auto parametersNode = Parameters(function.get(), parentIdentifier);
       function->parameters = std::move(parametersNode.parameters),
-      function->diagnostic = emptyNameError ? std::move(emptyNameError) : std::move(parametersNode.diagnostic);
+      function->diagnostic = std::move(parametersNode.diagnostic);
 
       function->location = ExpressionParserLocation(
           parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
@@ -418,8 +394,6 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(function);
     } else if (CheckIfChar(IsDot) || CheckIfChar(IsOpeningSquareBracket)) {
       auto variable = gd::make_unique<VariableNode>(parentIdentifier);
-      variable->diagnostic = std::move(emptyNameError);
-
       auto child =
           gd::make_unique<VariableAccessorNode>(childIdentifierName);
       child->child = VariableAccessorOrVariableBracketAccessor();
@@ -445,7 +419,6 @@ class GD_CORE_API ExpressionParser2 {
     node->identifierNameLocation = parentIdentifierLocation;
     node->identifierNameDotLocation = parentIdentifierDotLocation;
     node->childIdentifierNameLocation = childIdentifierNameLocation;
-    node->diagnostic = std::move(emptyNameError);
     return std::move(node);
   }
 
@@ -518,6 +491,11 @@ class GD_CORE_API ExpressionParser2 {
     std::vector<std::unique_ptr<ExpressionNode>> parameters;
     gd::String lastObjectName = "";
 
+    // By convention, object is always the first parameter, and behavior the
+    // second one.
+    size_t parameterIndex =
+        WrittenParametersFirstIndex(objectName, behaviorName);
+
     bool previousCharacterIsParameterSeparator = false;
     while (!IsEndReached()) {
       SkipAllWhitespaces();
@@ -536,6 +514,7 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
       previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
       SkipIfChar(IsParameterSeparator);
+      parameterIndex++;
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -8,7 +8,6 @@
 
 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 namespace gd {
@@ -44,11 +43,6 @@ class GD_CORE_API ExpressionParser2NodePrinter
    */
   const gd::String& GetOutput() { return output; };
 
-  static gd::String PrintStringLiteral(const gd::String& str) {
-    return "\"" +
-           str.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") + "\"";
-  }
-
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
     output += "(";
@@ -75,7 +69,10 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitNumberNode(NumberNode& node) override { output += node.number; }
   void OnVisitTextNode(TextNode& node) override {
-    output += PrintStringLiteral(node.text);
+    output +=
+        "\"" +
+        node.text.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") +
+        "\"";
   }
   void OnVisitVariableNode(VariableNode& node) override {
     output += node.name;
@@ -100,8 +97,8 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     if (!node.behaviorFunctionName.empty()) {
-      output += node.objectName + "." + node.objectFunctionOrBehaviorName +
-                "::" + node.behaviorFunctionName;
+      output +=
+          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
     } else {
       output += node.objectName + "." + node.objectFunctionOrBehaviorName;
     }

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -1281,8 +1281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM1_ on _PARAM0_: _PARAM2_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable?"))
@@ -1297,8 +1297,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1315,8 +1315,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1332,8 +1332,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM2_ for effect _PARAM1_ of _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1347,8 +1347,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM1_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect_black.svg",
-                   "res/actions/effect_black.svg")
+                   "res/actions/effect24.png",
+                   "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .MarkAsSimple()
@@ -1375,7 +1375,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "res/actions/create24.png",
                  "res/actions/create24.png")
       .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyIfJustDeclared", _("Object to create"))
+      .AddParameter("objectList", _("Object to create"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
       .AddParameter("layer", _("Layer"), "", true)
@@ -1393,7 +1393,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "res/actions/create24.png",
                  "res/actions/create24.png")
       .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyIfJustDeclared",
+      .AddParameter("objectList",
                     _("Group of potential objects"))
       .SetParameterLongDescription(
           _("Group containing objects that can be created by the action."))
@@ -1624,7 +1624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
             "distance: _PARAM4_px, against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          _("Collision"),
+          "",
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
@@ -1655,7 +1655,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          _("Collision"),
+          "",
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -327,6 +327,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
+  // TODO Deprecated: hide this action in a future release.
   extension
       .AddAction(
           "FixCamera",
@@ -338,7 +339,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
-      .SetHidden()
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("expression",
@@ -386,7 +386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Center the camera on an object"),
                  _("Center the camera on the specified object."),
                  _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -450,8 +450,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -469,8 +469,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -488,8 +488,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -504,8 +504,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
                     _(""),
-                    "res/actions/effect_black.svg",
-                    "res/actions/effect_black.svg")
+                    "res/actions/effect24.png",
+                    "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -518,8 +518,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/actions/effect_black.svg",
-                 "res/actions/effect_black.svg")
+                 "res/actions/effect24.png",
+                 "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -548,7 +548,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "ChangeLayerTimeScale",
-          _("Layer time scale"),
+          _("Change layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
           _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
           "",
@@ -594,7 +594,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerAmbientLightColor",
-          _("Ambient light color"),
+          _("Set the ambient light color"),
           _("Set the ambient light color of the lighting layer in format "
             "\"R;G;B\" string."),
           _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),

Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp

@@ -44,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
          "number",
          "Index",
          _("Animation (by number)"),
-         _("the animation played by the object using the animation number (from "
+         _("the number of the animation played by the object (the number from "
            "the animations list)"),
          _("the number of the animation"),
          _("Animations and images"),

Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "EffectBehavior",
@@ -32,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
       "Effect",
       _("Apply visual effects to objects."),
       "",
-      "res/actions/effect_black.svg",
+      "res/actions/effect24.png",
       "EffectBehavior",
       std::make_shared<gd::Behavior>(),
       std::make_shared<gd::BehaviorsSharedData>())
@@ -43,8 +43,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM2_ on _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -58,8 +58,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -75,8 +75,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -91,8 +91,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM3_ for effect _PARAM2_ of _PARAM0_: _PARAM4_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -105,8 +105,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM2_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect_black.svg",
-                   "res/actions/effect_black.svg")
+                   "res/actions/effect24.png",
+                   "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))

Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "FlippableBehavior",

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -5,7 +5,6 @@
  */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -58,7 +57,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .AddCondition("DoesSceneExist",
                     _("Does scene exist"),
-                    _("Check if a scene exists."),
+                    _("Check if scene exists."),
                     _("Scene _PARAM1_ exists"),
                     "",
                     "res/actions/texte.png",
@@ -164,45 +163,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
           "res/actions/window.png")
       .SetHelpPath("/interface/scene-editor/events")
       .AddCodeOnlyParameter("currentScene", "");
-
-  extension
-      .AddAction("PrioritizeLoadingOfScene",
-                 _("Preload scene"),
-                 _("Preload a scene resources as soon as possible in background."),
-                 _("Preload scene _PARAM1_ in background"),
-                 "",
-                 "res/actions/hourglass_black.svg",
-                 "res/actions/hourglass_black.svg")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Name of the new scene"))
-      .MarkAsAdvanced();
-
-  extension.AddExpressionAndCondition("number",
-                                "SceneLoadingProgress",
-                                _("Scene loading progress"),
-                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
-                                _("_PARAM0_ loading progress"),
-                                _(""),
-                                "res/actions/hourglass_black.svg")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("AreSceneAssetsLoaded",
-                    _("Scene preloaded"),
-                    _("Check if scene resources have finished to load in background."),
-                    _("Scene _PARAM1_ was preloaded in background"),
-                    "",
-                    "res/actions/hourglass_black.svg",
-                    "res/actions/hourglass_black.svg")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -87,8 +87,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
   extension
       .AddAction(
           "SetWindowSize",
-          _("Game window size"),
-          _("Changes the size of the game window. Note that this "
+          _("Change the size of the game window"),
+          _("This action changes the size of the game window. Note that this "
             "will only work on platform supporting this operation: games "
             "running in browsers or on mobile phones can not update their "
             "window size. Game resolution can still be updated."),

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -5,7 +5,6 @@
  */
 #include "ExpressionMetadata.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/String.h"
 
 namespace gd {
@@ -47,14 +46,16 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-        gd::ParameterMetadata::IsBehavior(type))
-               // Prefix with the namespace if it's not already there.
-               && (supplementaryInformation.find(
-                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
-           ? (supplementaryInformation.empty()
-                  ? ""
-                  : extensionNamespace + supplementaryInformation)
-           : supplementaryInformation));
+       gd::ParameterMetadata::IsBehavior(type))
+       // Prefix with the namespace if it's not already there.
+       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
+          ? (supplementaryInformation.empty()
+                 ? ""
+                 : extensionNamespace +
+                       supplementaryInformation  //... so prefix it with the extension
+                                           // namespace.
+             )
+          : supplementaryInformation);  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -8,7 +8,6 @@
 #include <algorithm>
 
 #include "GDCore/CommonTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
@@ -65,14 +64,17 @@ InstructionMetadata& InstructionMetadata::AddParameter(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-        gd::ParameterMetadata::IsBehavior(type))
-               // Prefix with the namespace if it's not already there.
-               && (supplementaryInformation.find(
-                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
-           ? (supplementaryInformation.empty()
-                  ? ""
-                  : extensionNamespace + supplementaryInformation)
-           : supplementaryInformation));
+       gd::ParameterMetadata::IsBehavior(type))
+       // Prefix with the namespace if it's not already there.
+       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
+          ? (supplementaryInformation.empty()
+                 ? ""
+                 : extensionNamespace +
+                       supplementaryInformation  //... so prefix it with the
+                                                 // extension
+                                                 // namespace.
+             )
+          : supplementaryInformation);  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -188,7 +190,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
+          templateSentence.FindAndReplace("<subject>", sentence)
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")
@@ -198,7 +200,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
+          templateSentence.FindAndReplace("<subject>", sentence)
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -191,16 +191,6 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  /**
-   * \see gd::InstructionMetadata::SetHelpPath
-   */
-  MultipleInstructionMetadata &SetHelpPath(const gd::String &path) {
-    if (expression) expression->SetHelpPath(path);
-    if (condition) condition->SetHelpPath(path);
-    if (action) action->SetHelpPath(path);
-    return *this;
-  }
-
   /**
    * \see gd::InstructionMetadata::MarkAsSimple
    */

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -217,9 +217,7 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "jsonResource" ||
              parameterType == "tilemapResource" ||
              parameterType == "tilesetResource" ||
-             parameterType == "model3DResource" ||
-             parameterType == "atlasResource" ||
-             parameterType == "spineResource";
+             parameterType == "model3DResource";
     }
     return false;
   }

Core/GDCore/Extensions/PlatformExtension.h

@@ -264,11 +264,8 @@ class GD_CORE_API PlatformExtension {
    *
    * \param name The name of the behavior
    * \param fullname The user friendly name of the behavior
-   * \param defaultName The default name of behavior instances
    * \param description The user friendly description of the behavior
-   * \param group The behavior category label
    * \param icon The icon of the behavior.
-   * \param className The name of the class implementing the behavior
    * \param instance An instance of the behavior that
    * will be used to create the behavior
    * \param sharedDatasInstance Optional
@@ -291,7 +288,6 @@ class GD_CORE_API PlatformExtension {
    * \param name The name of the behavior
    * \param fullname The user friendly name of the behavior
    * \param description The user friendly description of the behavior
-   * \param group The behavior category label
    * \param icon The icon of the behavior.
    */
   gd::BehaviorMetadata& AddEventsBasedBehavior(

Core/GDCore/IDE/DependenciesAnalyzer.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
+#if defined(GD_IDE_ONLY)
 #include "DependenciesAnalyzer.h"
 #include <algorithm>
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -28,9 +29,9 @@ DependenciesAnalyzer::DependenciesAnalyzer(const gd::Project& project_,
 
 bool DependenciesAnalyzer::Analyze() {
   if (layout)
-    return Analyze(layout->GetEvents());
+    return Analyze(layout->GetEvents(), true);
   else if (externalEvents)
-    return Analyze(externalEvents->GetEvents());
+    return Analyze(externalEvents->GetEvents(), true);
 
   std::cout << "ERROR: DependenciesAnalyzer called without any layout or "
                "external events.";
@@ -39,38 +40,63 @@ bool DependenciesAnalyzer::Analyze() {
 
 DependenciesAnalyzer::~DependenciesAnalyzer() {}
 
-bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
+bool DependenciesAnalyzer::Analyze(const gd::EventsList& events, bool isOnTopLevel) {
   for (unsigned int i = 0; i < events.size(); ++i) {
     const gd::LinkEvent* linkEvent = dynamic_cast<const gd::LinkEvent*>(&events[i]);
     if (linkEvent) {
+      DependenciesAnalyzer analyzer(*this);
+
       gd::String linked = linkEvent->GetTarget();
       if (project.HasExternalEventsNamed(linked)) {
         if (std::find(parentExternalEvents.begin(),
                       parentExternalEvents.end(),
-                      linked) != parentExternalEvents.end()) {
-          // Circular dependency!
+                      linked) != parentExternalEvents.end())
+          return false;  // Circular dependency!
+
+        externalEventsDependencies.insert(
+            linked);  // There is a direct dependency
+        if (!isOnTopLevel) notTopLevelExternalEventsDependencies.insert(linked);
+        analyzer.AddParentExternalEvents(linked);
+        if (!analyzer.Analyze(project.GetExternalEvents(linked).GetEvents(),
+                              isOnTopLevel))
           return false;
-        }
-        bool wasDependencyJustAdded = externalEventsDependencies.insert(linked).second;
-        if (wasDependencyJustAdded) {
-          parentExternalEvents.push_back(linked);
-          if (!Analyze(project.GetExternalEvents(linked).GetEvents()))
-            return false;
-          parentExternalEvents.pop_back();
-        }
+
       } else if (project.HasLayoutNamed(linked)) {
         if (std::find(parentScenes.begin(), parentScenes.end(), linked) !=
-            parentScenes.end()) {
-          // Circular dependency!
+            parentScenes.end())
+          return false;  // Circular dependency!
+
+        scenesDependencies.insert(linked);  // There is a direct dependency
+        if (!isOnTopLevel) notTopLevelScenesDependencies.insert(linked);
+        analyzer.AddParentScene(linked);
+        if (!analyzer.Analyze(project.GetLayout(linked).GetEvents(),
+                              isOnTopLevel))
           return false;
-        }
-        bool wasDependencyJustAdded = scenesDependencies.insert(linked).second;
-        if (wasDependencyJustAdded) {
-          parentScenes.push_back(linked);
-          if (!Analyze(project.GetLayout(linked).GetEvents()))
-            return false;
-          parentScenes.pop_back();
-        }
+      }
+
+      // Update with indirect dependencies.
+      scenesDependencies.insert(analyzer.GetScenesDependencies().begin(),
+                                analyzer.GetScenesDependencies().end());
+      externalEventsDependencies.insert(
+          analyzer.GetExternalEventsDependencies().begin(),
+          analyzer.GetExternalEventsDependencies().end());
+      sourceFilesDependencies.insert(
+          analyzer.GetSourceFilesDependencies().begin(),
+          analyzer.GetSourceFilesDependencies().end());
+      notTopLevelScenesDependencies.insert(
+          analyzer.GetNotTopLevelScenesDependencies().begin(),
+          analyzer.GetNotTopLevelScenesDependencies().end());
+      notTopLevelExternalEventsDependencies.insert(
+          analyzer.GetNotTopLevelExternalEventsDependencies().begin(),
+          analyzer.GetNotTopLevelExternalEventsDependencies().end());
+
+      if (!isOnTopLevel) {
+        notTopLevelScenesDependencies.insert(
+            analyzer.GetScenesDependencies().begin(),
+            analyzer.GetScenesDependencies().end());
+        notTopLevelExternalEventsDependencies.insert(
+            analyzer.GetExternalEventsDependencies().begin(),
+            analyzer.GetExternalEventsDependencies().end());
       }
     }
 
@@ -86,9 +112,45 @@ bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
 
     // Analyze sub events dependencies
     if (events[i].CanHaveSubEvents()) {
-      if (!Analyze(events[i].GetSubEvents())) return false;
+      if (!Analyze(events[i].GetSubEvents(), false)) return false;
     }
   }
 
   return true;
 }
+
+gd::String DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene() {
+  if (!externalEvents) {
+    std::cout << "ERROR: ExternalEventsCanBeCompiledForAScene called without "
+                 "external events set!"
+              << std::endl;
+    return "";
+  }
+
+  gd::String sceneName;
+  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
+    // For each layout, compute the dependencies and the dependencies which are
+    // not coming from a top level event.
+    DependenciesAnalyzer analyzer(project, project.GetLayout(i));
+    if (!analyzer.Analyze()) continue;  // Analyze failed -> Cyclic dependencies
+    const std::set<gd::String>& dependencies =
+        analyzer.GetExternalEventsDependencies();
+    const std::set<gd::String>& notTopLevelDependencies =
+        analyzer.GetNotTopLevelExternalEventsDependencies();
+
+    // Check if the external events is a dependency, and that is is only present
+    // as a link on the top level.
+    if (dependencies.find(externalEvents->GetName()) != dependencies.end() &&
+        notTopLevelDependencies.find(externalEvents->GetName()) ==
+            notTopLevelDependencies.end()) {
+      if (!sceneName.empty())
+        return "";  // External events can be compiled only if one scene is
+                    // including them.
+      else
+        sceneName = project.GetLayout(i).GetName();
+    }
+  }
+
+  return sceneName;  // External events can be compiled and used for the scene.
+}
+#endif

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -39,6 +39,11 @@ class GD_CORE_API DependenciesAnalyzer {
 
   /**
    * \brief Constructor for analyzing the dependencies of external events.
+   *
+   * You can also call then
+   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
+   * external events can be compiled separately and called by a scene. \see
+   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,
                        const gd::ExternalEvents& externalEvents);
@@ -55,6 +60,18 @@ class GD_CORE_API DependenciesAnalyzer {
    */
   bool Analyze();
 
+  /**
+   * Check if the external events (passed in the constructor) can be compiled
+   * and called by a single scene:<br> This is possible when the link calling
+   * the external events does not have any parent event and when this situation
+   * occurs only in a single scene and not in another.
+   *
+   * \return The name of the scene which is able to call the compiled external
+   * events. If empty, no scene is able to call them. (So external events have
+   * to be included directly by links).
+   */
+  gd::String ExternalEventsCanBeCompiledForAScene();
+
   /**
    * \brief Return the scenes being dependencies of the scene or external events
    * passed in the constructor.
@@ -79,6 +96,25 @@ class GD_CORE_API DependenciesAnalyzer {
     return sourceFilesDependencies;
   };
 
+  /**
+   * \brief Return the scenes being dependencies of the scene or external events
+   * passed in the constructor, but being not top level dependencies: The links
+   * including them are not a top level events (i.e: They have a parent event).
+   */
+  const std::set<gd::String>& GetNotTopLevelScenesDependencies() const {
+    return notTopLevelScenesDependencies;
+  };
+
+  /**
+   * \brief Return the external events being dependencies of the scene or
+   * external events passed in the constructor, but being not top level
+   * dependencies: The links including them are not a top level events (i.e:
+   * They have a parent event).
+   */
+  const std::set<gd::String>& GetNotTopLevelExternalEventsDependencies() const {
+    return notTopLevelExternalEventsDependencies;
+  };
+
  private:
   /**
    * \brief Analyze the dependencies of the events.
@@ -88,11 +124,32 @@ class GD_CORE_API DependenciesAnalyzer {
    * (they have no parents). \return false if a circular dependency exists, true
    * otherwise.
    */
-  bool Analyze(const gd::EventsList& events);
+  bool Analyze(const gd::EventsList& events, bool isOnTopLevel);
+
+  void AddParentScene(gd::String parentScene) {
+    parentScenes.push_back(parentScene);
+  };
+  void AddParentExternalEvents(gd::String parentExternalEvents_) {
+    parentExternalEvents.push_back(parentExternalEvents_);
+  };
+
+  /**
+   * Return true if all links pointing to external events called \a
+   * externalEventsName are only at the top level of \a events. The function
+   * return false as soon as it discover a link to external events which is not
+   * at the top level ( i.e: It has a parent event ).
+   *
+   * \warning The function assumes that there are not cyclic dependencies.
+   */
+  bool CheckIfExternalEventsIsLinkedOnlyAtTopLevel(
+      const gd::String& externalEventsName,
+      std::vector<std::shared_ptr<gd::BaseEvent> >& events);
 
   std::set<gd::String> scenesDependencies;
   std::set<gd::String> externalEventsDependencies;
   std::set<gd::String> sourceFilesDependencies;
+  std::set<gd::String> notTopLevelScenesDependencies;
+  std::set<gd::String> notTopLevelExternalEventsDependencies;
   std::vector<gd::String>
       parentScenes;  ///< Used to check for circular dependencies.
   std::vector<gd::String>

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -226,7 +226,7 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
   eventWorker.Launch(layout.GetEvents(),
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -136,7 +136,7 @@ class GD_CORE_API ExpressionVariableReplacer
     auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
     if (!objectNameToUseForVariableAccessor.empty()) {
-      if (objectsContainersList.HasObjectOrGroupVariablesContainer(
+      if (objectsContainersList.HasVariablesContainer(
               objectNameToUseForVariableAccessor, targetVariablesContainer)) {
         // The node represents an object variable, and this object variables are
         // the target. Do the replacement or removals:
@@ -177,7 +177,7 @@ class GD_CORE_API ExpressionVariableReplacer
         GetPotentialNewName(node.identifierName),
         [&]() {
           // This represents an object.
-          if (objectsContainersList.HasObjectOrGroupVariablesContainer(
+          if (objectsContainersList.HasVariablesContainer(
                   node.identifierName, targetVariablesContainer)) {
             // The node represents an object variable, and this object variables
             // are the target. Do the replacement or removals:

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -258,7 +258,7 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
   eventWorker.Launch(layout.GetEvents(),
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -11,16 +11,13 @@
 
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Events/Parsers/GrammarTerminals.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
 #include "GDCore/IDE/Events/ExpressionNodeLocationFinder.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariableParentFinder.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/Variable.h"
 
@@ -489,56 +486,47 @@ class GD_CORE_API ExpressionCompletionFinder
     auto type = gd::ExpressionTypeFinder::GetType(
         platform, projectScopedContainers, rootType, node);
 
-    // Only attempt to complete with the children of the variable
-    // if it's the last child (no more `.AnotherVariable` written after).
-    bool eagerlyCompleteIfExactMatch = node.child == nullptr;
-
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      if (type == "globalvar" || type == "scenevar") {
+      if (type == "globalvar") {
         const auto* variablesContainer =
-            type == "globalvar"
-                ? projectScopedContainers.GetVariablesContainersList()
-                      .GetTopMostVariablesContainer()
-                : projectScopedContainers.GetVariablesContainersList()
-                      .GetBottomMostVariablesContainer();
+            projectScopedContainers.GetVariablesContainersList()
+                .GetTopMostVariablesContainer();
         if (variablesContainer) {
-          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
-                                                   node.name,
-                                                   node.nameLocation,
-                                                   eagerlyCompleteIfExactMatch);
+          AddCompletionsForVariablesMatchingSearch(
+              *variablesContainer, node.name, node.nameLocation);
+        }
+      } else if (type == "scenevar") {
+        const auto* variablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetBottomMostVariablesContainer();
+        if (variablesContainer) {
+          AddCompletionsForVariablesMatchingSearch(
+              *variablesContainer, node.name, node.nameLocation);
         }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform, objectsContainersList, rootObjectName, node);
+            platform,
+            objectsContainersList,
+            // Variable fields doesn't use expression completion,
+            // so the object will be found inside the expression itself.
+            "",
+            node);
 
         AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-            objectsContainersList,
-            objectName,
-            node.name,
-            node.nameLocation,
-            eagerlyCompleteIfExactMatch);
+            objectsContainersList, objectName, node.name, node.nameLocation);
       }
     } else {
       AddCompletionsForObjectsAndVariablesMatchingSearch(
-          node.name, type, node.nameLocation, eagerlyCompleteIfExactMatch);
+          node.name, type, node.nameLocation);
     }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    VariableAndItsParent variableAndItsParent =
-        gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-            platform, projectScopedContainers, node);
-
-    // If no child, we're at the end of a variable (like `GrandChild` in
-    // `Something.Child.GrandChild`) so we can complete eagerly children if we
-    // can.
-    gd::String eagerlyCompleteForVariableName =
-        node.child == nullptr ? node.name : "";
-    AddCompletionsForChildrenVariablesOf(variableAndItsParent,
-                                         node.nameLocation,
-                                         eagerlyCompleteForVariableName);
+    // No completions
   }
   void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {}
+      VariableBracketAccessorNode& node) override {
+    // No completions
+  }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     const auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
@@ -549,81 +537,45 @@ class GD_CORE_API ExpressionCompletionFinder
       AddCompletionsForObjectMatchingSearch(
           node.identifierName, type, node.location);
     } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      if (type == "globalvar" || type == "scenevar") {
+      if (type == "globalvar") {
         const auto* variablesContainer =
-            type == "globalvar"
-                ? projectScopedContainers.GetVariablesContainersList()
-                      .GetTopMostVariablesContainer()
-                : projectScopedContainers.GetVariablesContainersList()
-                      .GetBottomMostVariablesContainer();
+            projectScopedContainers.GetVariablesContainersList()
+                .GetTopMostVariablesContainer();
         if (variablesContainer) {
-          if (IsCaretOn(node.identifierNameDotLocation) ||
-              IsCaretOn(node.childIdentifierNameLocation)) {
-            // Complete a potential child variable:
-            if (variablesContainer->Has(node.identifierName)) {
-              AddCompletionsForChildrenVariablesOf(
-                  &variablesContainer->Get(node.identifierName),
-                  node.childIdentifierNameLocation,
-                  node.childIdentifierName);
-            }
-          } else {
-            // Complete a root variable of the scene or project.
-
-            // Don't attempt to complete children variables if there is
-            // already a dot written (`MyVariable.`).
-            bool eagerlyCompleteIfPossible =
-                !node.identifierNameDotLocation.IsValid();
-            AddCompletionsForVariablesMatchingSearch(
-                *variablesContainer,
-                node.identifierName,
-                node.identifierNameLocation,
-                eagerlyCompleteIfPossible);
-          }
+          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
+                                               node.identifierName,
+                                               node.identifierNameLocation);
+        }
+      } else if (type == "scenevar") {
+        const auto* variablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetBottomMostVariablesContainer();
+        if (variablesContainer) {
+          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
+                                               node.identifierName,
+                                               node.identifierNameLocation);
         }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform, objectsContainersList, rootObjectName, node);
+            platform,
+            objectsContainersList,
+            // Variable fields doesn't use expression completion,
+            // so the object will be found inside the expression itself.
+            "",
+            node);
 
-        if (IsCaretOn(node.identifierNameDotLocation) ||
-            IsCaretOn(node.childIdentifierNameLocation)) {
-          // Complete a potential child variable:
-          const auto* variablesContainer =
-              objectsContainersList.GetObjectOrGroupVariablesContainer(
-                  objectName);
-          if (variablesContainer &&
-              variablesContainer->Has(node.identifierName)) {
-            AddCompletionsForChildrenVariablesOf(
-                &variablesContainer->Get(node.identifierName),
-                node.childIdentifierNameLocation,
-                node.childIdentifierName);
-          }
-        } else {
-          // Complete a root variable of the object.
-
-          // Don't attempt to complete children variables if there is
-          // already a dot written (`MyVariable.`).
-          bool eagerlyCompleteIfPossible =
-              !node.identifierNameDotLocation.IsValid();
-          AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-              objectsContainersList,
-              objectName,
-              node.identifierName,
-              node.identifierNameLocation,
-              eagerlyCompleteIfPossible);
-        }
+        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+            objectsContainersList,
+            objectName,
+            node.identifierName,
+            node.identifierNameLocation);
       }
     } else {
       // Object function, behavior name, variable, object variable.
       if (IsCaretOn(node.identifierNameLocation)) {
-        // Don't attempt to complete children variables if there is
-        // already a dot written (`MyVariable.`).
-        bool eagerlyCompleteIfPossible =
-            !node.identifierNameDotLocation.IsValid();
+        // Is this the proper position?
         AddCompletionsForAllIdentifiersMatchingSearch(
-            node.identifierName,
-            type,
-            node.identifierNameLocation,
-            eagerlyCompleteIfPossible);
+            node.identifierName, type, node.identifierNameLocation);
         if (!node.identifierNameDotLocation.IsValid()) {
           completions.push_back(
               ExpressionCompletionDescription::ForExpressionWithPrefix(
@@ -634,57 +586,27 @@ class GD_CORE_API ExpressionCompletionFinder
         }
       } else if (IsCaretOn(node.identifierNameDotLocation) ||
                  IsCaretOn(node.childIdentifierNameLocation)) {
-        // Might be:
-        // - An object variable, object behavior or object expression.
-        // - Or a variable with a child.
-        projectScopedContainers.MatchIdentifierWithName<void>(
-            node.identifierName,
-            [&]() {
-              // This is an object.
-              const gd::String& objectName = node.identifierName;
-              AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-                  objectsContainersList,
-                  objectName,
-                  node.childIdentifierName,
-                  node.childIdentifierNameLocation,
-                  true);
+        const gd::String& objectName = node.identifierName;
 
-              completions.push_back(
-                  ExpressionCompletionDescription::ForBehaviorWithPrefix(
-                      node.childIdentifierName,
-                      node.childIdentifierNameLocation.GetStartPosition(),
-                      node.childIdentifierNameLocation.GetEndPosition(),
-                      objectName));
-              completions.push_back(
-                  ExpressionCompletionDescription::ForExpressionWithPrefix(
-                      type,
-                      node.childIdentifierName,
-                      node.childIdentifierNameLocation.GetStartPosition(),
-                      node.childIdentifierNameLocation.GetEndPosition(),
-                      objectName));
-            },
-            [&]() {
-              // This is a variable.
-              VariableAndItsParent variableAndItsParent =
-                  gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-                      platform, projectScopedContainers, node);
-
-              AddCompletionsForChildrenVariablesOf(
-                  variableAndItsParent,
-                  node.childIdentifierNameLocation,
-                  node.childIdentifierName);
-            },
-            [&]() {
-              // Ignore properties here.
-              // There is no support for "children" of properties.
-            },
-            [&]() {
-              // Ignore parameters here.
-              // There is no support for "children" of parameters.
-            },
-            [&]() {
-              // Ignore unrecognised identifiers here.
-            });
+        // Might be an object variable, object behavior or object expression:
+        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+            objectsContainersList,
+            objectName,
+            node.childIdentifierName,
+            node.childIdentifierNameLocation);
+        completions.push_back(
+            ExpressionCompletionDescription::ForBehaviorWithPrefix(
+                node.childIdentifierName,
+                node.childIdentifierNameLocation.GetStartPosition(),
+                node.childIdentifierNameLocation.GetEndPosition(),
+                objectName));
+        completions.push_back(
+            ExpressionCompletionDescription::ForExpressionWithPrefix(
+                type,
+                node.childIdentifierName,
+                node.childIdentifierNameLocation.GetStartPosition(),
+                node.childIdentifierNameLocation.GetEndPosition(),
+                objectName));
       }
     }
   }
@@ -814,8 +736,7 @@ class GD_CORE_API ExpressionCompletionFinder
     auto type = gd::ExpressionTypeFinder::GetType(
         platform, projectScopedContainers, rootType, node);
 
-    AddCompletionsForAllIdentifiersMatchingSearch(
-        node.text, type, node.location);
+    AddCompletionsForAllIdentifiersMatchingSearch(node.text, type, node.location);
     completions.push_back(
         ExpressionCompletionDescription::ForExpressionWithPrefix(
             type,
@@ -834,96 +755,10 @@ class GD_CORE_API ExpressionCompletionFinder
              (inclusive && searchedPosition <= location.GetEndPosition())));
   }
 
-  /**
-   * A slightly less strict check than `gd::Project::IsNameSafe` as child
-   * variables can be completed even if they start with a number.
-   */
-  bool IsIdentifierSafe(const gd::String& name) {
-    if (name.empty()) return false;
-
-    for (auto character : name) {
-      if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  void AddCompletionsForChildrenVariablesOf(
-      VariableAndItsParent variableAndItsParent,
-      const ExpressionParserLocation& location,
-      gd::String eagerlyCompleteForVariableName = "") {
-    if (variableAndItsParent.parentVariable) {
-      AddCompletionsForChildrenVariablesOf(variableAndItsParent.parentVariable,
-                                           location,
-                                           eagerlyCompleteForVariableName);
-    } else if (variableAndItsParent.parentVariablesContainer) {
-      AddCompletionsForVariablesMatchingSearch(
-          *variableAndItsParent.parentVariablesContainer, "", location);
-    }
-  }
-
-  void AddCompletionsForChildrenVariablesOf(
-      const gd::Variable* variable,
-      const ExpressionParserLocation& location,
-      gd::String eagerlyCompleteForVariableName = "") {
-    if (!variable) return;
-
-    if (variable->GetType() == gd::Variable::Structure) {
-      for (const auto& name : variable->GetAllChildrenNames()) {
-        if (!IsIdentifierSafe(name)) continue;
-
-        const auto& childVariable = variable->GetChild(name);
-        ExpressionCompletionDescription description(
-            ExpressionCompletionDescription::Variable,
-            location.GetStartPosition(),
-            location.GetEndPosition());
-        description.SetCompletion(name);
-        description.SetVariableType(childVariable.GetType());
-        completions.push_back(description);
-
-        if (name == eagerlyCompleteForVariableName) {
-          AddEagerCompletionForVariableChildren(childVariable, name, location);
-        }
-      }
-    } else {
-      // TODO: we could do a "comment only completion" to indicate that nothing
-      // can/should be completed?
-    }
-  }
-
-  void AddEagerCompletionForVariableChildren(
-      const gd::Variable& variable,
-      const gd::String& variableName,
-      const ExpressionParserLocation& location) {
-    if (variable.GetType() == gd::Variable::Structure) {
-      gd::String prefix = variableName + ".";
-      for (const auto& name : variable.GetAllChildrenNames()) {
-        gd::String completion =
-            IsIdentifierSafe(name)
-                ? (prefix + name)
-                : (variableName + "[" +
-                   gd::ExpressionParser2NodePrinter::PrintStringLiteral(name) +
-                   "]");
-
-        const auto& childVariable = variable.GetChild(name);
-        ExpressionCompletionDescription description(
-            ExpressionCompletionDescription::Variable,
-            location.GetStartPosition(),
-            location.GetEndPosition());
-        description.SetCompletion(completion);
-        description.SetVariableType(childVariable.GetType());
-        completions.push_back(description);
-      }
-    }
-  }
-
   void AddCompletionsForVariablesMatchingSearch(
       const gd::VariablesContainer& variablesContainer,
       const gd::String& search,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch = false) {
+      const ExpressionParserLocation& location) {
     variablesContainer.ForEachVariableMatchingSearch(
         search,
         [&](const gd::String& variableName, const gd::Variable& variable) {
@@ -934,11 +769,6 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         });
   }
 
@@ -946,8 +776,7 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::ObjectsContainersList& objectsContainersList,
       const gd::String& objectOrGroupName,
       const gd::String& search,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch) {
+      const ExpressionParserLocation& location) {
     objectsContainersList.ForEachObjectOrGroupVariableMatchingSearch(
         objectOrGroupName,
         search,
@@ -959,11 +788,6 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         });
   }
 
@@ -971,27 +795,25 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& search,
       const gd::String& type,
       const ExpressionParserLocation& location) {
-    projectScopedContainers.GetObjectsContainersList()
-        .ForEachNameMatchingSearch(
-            search,
-            [&](const gd::String& name,
-                const gd::ObjectConfiguration* objectConfiguration) {
-              ExpressionCompletionDescription description(
-                  ExpressionCompletionDescription::Object,
-                  location.GetStartPosition(),
-                  location.GetEndPosition());
-              description.SetObjectConfiguration(objectConfiguration);
-              description.SetCompletion(name);
-              description.SetType(type);
-              completions.push_back(description);
-            });
+    projectScopedContainers.GetObjectsContainersList().ForEachNameMatchingSearch(
+        search,
+        [&](const gd::String& name,
+            const gd::ObjectConfiguration* objectConfiguration) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Object,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetObjectConfiguration(objectConfiguration);
+          description.SetCompletion(name);
+          description.SetType(type);
+          completions.push_back(description);
+        });
   }
 
   void AddCompletionsForObjectsAndVariablesMatchingSearch(
       const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch) {
+      const ExpressionParserLocation& location) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
         [&](const gd::String& objectName,
@@ -1013,11 +835,6 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           // Ignore properties here.
@@ -1028,7 +845,7 @@ class GD_CORE_API ExpressionCompletionFinder
   }
 
   void AddCompletionsForAllIdentifiersMatchingSearch(const gd::String& search,
-                                                     const gd::String& type) {
+                                                 const gd::String& type) {
     AddCompletionsForAllIdentifiersMatchingSearch(
         search,
         type,
@@ -1038,8 +855,7 @@ class GD_CORE_API ExpressionCompletionFinder
   void AddCompletionsForAllIdentifiersMatchingSearch(
       const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch = false) {
+      const ExpressionParserLocation& location) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
         [&](const gd::String& objectName,
@@ -1061,11 +877,6 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           ExpressionCompletionDescription description(
@@ -1093,14 +904,11 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& rootType_,
       size_t searchedPosition_,
       gd::ExpressionNode* maybeParentNodeAtLocation_)
-      : searchedPosition(searchedPosition_),
-        maybeParentNodeAtLocation(maybeParentNodeAtLocation_),
-        platform(platform_),
+      : platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
-        rootObjectName("")  // Always empty, might be changed if variable fields
-                            // in the editor are changed to use completion.
-        {};
+        searchedPosition(searchedPosition_),
+        maybeParentNodeAtLocation(maybeParentNodeAtLocation_){};
 
   std::vector<ExpressionCompletionDescription> completions;
   size_t searchedPosition;
@@ -1109,7 +917,6 @@ class GD_CORE_API ExpressionCompletionFinder
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
   const gd::String rootType;
-  const gd::String rootObjectName;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -263,17 +263,11 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
   }
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
-    if (function.functionName.empty()) {
-      RaiseError("invalid_function_name",
-               _("Enter the name of the function to call."),
-               function.location);
-    } else {
-      RaiseError("invalid_function_name",
+    RaiseError("invalid_function_name",
                _("Cannot find an expression with this name: ") +
                    function.functionName + "\n" +
                    _("Double check that you've not made any typo in the name."),
                function.location);
-    }
     return returnType;
   }
 

Core/GDCore/IDE/Events/ExpressionVariableParentFinder.h

@@ -1,374 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/Project/Variable.h"
-#include "GDCore/Tools/Localization.h"
-
-namespace gd {
-class Expression;
-class ObjectsContainer;
-class Platform;
-class ParameterMetadata;
-class ExpressionMetadata;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Contains a variables container or a variable. Useful
- * to refer to the parent of a variable (which can be a VariablesContainer
- * or another Variable).
- */
-struct VariableAndItsParent {
-  const gd::VariablesContainer* parentVariablesContainer;
-  const gd::Variable* parentVariable;
-};
-
-/**
- * \brief Find the last parent (i.e: the variables container) of a node
- * representing a variable.
- *
- * Useful for completions, to know which variables can be entered in a node.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionVariableParentFinder
-    : public ExpressionParser2NodeWorker {
- public:
-  static VariableAndItsParent GetLastParentOfNode(
-      const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers,
-      gd::ExpressionNode& node) {
-    gd::ExpressionVariableParentFinder typeFinder(platform,
-                                                  projectScopedContainers);
-    node.Visit(typeFinder);
-    return typeFinder.variableAndItsParent;
-  }
-
-  virtual ~ExpressionVariableParentFinder(){};
-
- protected:
-  ExpressionVariableParentFinder(
-      const gd::Platform& platform_,
-      const gd::ProjectScopedContainers& projectScopedContainers_)
-      : platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        variableNode(nullptr),
-        thisIsALegacyPrescopedVariable(false),
-        bailOutBecauseEmptyVariableName(false),
-        legacyPrescopedVariablesContainer(nullptr),
-        variableAndItsParent{} {};
-
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {}
-  void OnVisitOperatorNode(OperatorNode& node) override {}
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {}
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (variableNode != nullptr) {
-      // This is not possible
-      return;
-    }
-    variableNode = &node;
-
-    // Check if the parent is a function call, in which we might be dealing
-    // with a legacy pre-scoped variable parameter:
-    if (node.parent) node.parent->Visit(*this);
-
-    if (thisIsALegacyPrescopedVariable) {
-      // The node represents a variable name, and the variables container
-      // containing it was identified in the FunctionCallNode.
-      childVariableNames.insert(childVariableNames.begin(), node.name);
-      if (legacyPrescopedVariablesContainer)
-        variableAndItsParent = WalkUntilLastParent(
-            *legacyPrescopedVariablesContainer, childVariableNames);
-    } else {
-      // Otherwise, the identifier is to be interpreted as usual:
-      // it can be an object (on which a variable is accessed),
-      // or a variable.
-      projectScopedContainers.MatchIdentifierWithName<void>(
-          node.name,
-          [&]() {
-            // This is an object.
-            const auto* variablesContainer =
-                projectScopedContainers.GetObjectsContainersList()
-                    .GetObjectOrGroupVariablesContainer(node.name);
-            if (variablesContainer)
-              variableAndItsParent =
-                  WalkUntilLastParent(*variablesContainer, childVariableNames);
-          },
-          [&]() {
-            // This is a variable.
-            if (projectScopedContainers.GetVariablesContainersList().Has(
-                    node.name)) {
-              variableAndItsParent = WalkUntilLastParent(
-                  projectScopedContainers.GetVariablesContainersList().Get(
-                      node.name),
-                  childVariableNames);
-            }
-          },
-          [&]() {
-            // Ignore properties here.
-            // There is no support for "children" of properties.
-          },
-          [&]() {
-            // Ignore parameters here.
-            // There is no support for "children" of parameters.
-          },
-          [&]() {
-            // Ignore unrecognised identifiers here.
-          });
-    }
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.name.empty() && node.child) {
-      // A variable accessor should always have a name if it has a child (i.e:
-      // another accessor). While the parser may have generated an empty name,
-      // flag this so we avoid finding a wrong parent (and so, run the risk of
-      // giving wrong autocompletions).
-      bailOutBecauseEmptyVariableName = true;
-    }
-    childVariableNames.insert(childVariableNames.begin(), node.name);
-    if (node.parent) node.parent->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (variableNode != nullptr) {
-      // This is not possible
-      return;
-    }
-    // This node is not necessarily a variable node.
-    // It will be checked when visiting the FunctionCallNode, just after.
-    variableNode = &node;
-
-    // Check if the parent is a function call, in which we might be dealing
-    // with a legacy pre-scoped variable parameter:
-    if (node.parent) node.parent->Visit(*this);
-
-    if (thisIsALegacyPrescopedVariable) {
-      // The identifier represents a variable name, and the variables container
-      // containing it was identified in the FunctionCallNode.
-      if (!node.childIdentifierName.empty())
-        childVariableNames.insert(childVariableNames.begin(),
-                                  node.childIdentifierName);
-      childVariableNames.insert(childVariableNames.begin(),
-                                node.identifierName);
-
-      if (legacyPrescopedVariablesContainer)
-        variableAndItsParent = WalkUntilLastParent(
-            *legacyPrescopedVariablesContainer, childVariableNames);
-
-    } else {
-      // Otherwise, the identifier is to be interpreted as usual:
-      // it can be an object (on which a variable is accessed),
-      // or a variable.
-      projectScopedContainers.MatchIdentifierWithName<void>(
-          node.identifierName,
-          [&]() {
-            // This is an object.
-            if (!node.childIdentifierName.empty())
-              childVariableNames.insert(childVariableNames.begin(),
-                                        node.childIdentifierName);
-
-            const auto* variablesContainer =
-                projectScopedContainers.GetObjectsContainersList()
-                    .GetObjectOrGroupVariablesContainer(node.identifierName);
-            if (variablesContainer)
-              variableAndItsParent =
-                  WalkUntilLastParent(*variablesContainer, childVariableNames);
-          },
-          [&]() {
-            // This is a variable.
-            if (!node.childIdentifierName.empty())
-              childVariableNames.insert(childVariableNames.begin(),
-                                        node.childIdentifierName);
-
-            if (projectScopedContainers.GetVariablesContainersList().Has(
-                    node.identifierName)) {
-              variableAndItsParent = WalkUntilLastParent(
-                  projectScopedContainers.GetVariablesContainersList().Get(
-                      node.identifierName),
-                  childVariableNames);
-            }
-          },
-          [&]() {
-            // Ignore properties here.
-            // There is no support for "children" of properties.
-          },
-          [&]() {
-            // Ignore parameters here.
-            // There is no support for "children" of properties.
-          },
-          [&]() {
-            // Ignore unrecognised identifiers here.
-          });
-    }
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    // Add a child with an empty name, which will be interpreted as
-    // "take the first child/item of the structure/array".
-    childVariableNames.insert(childVariableNames.begin(), "");
-    if (node.parent) node.parent->Visit(*this);
-  }
-  void OnVisitFunctionCallNode(FunctionCallNode& functionCall) override {
-    if (variableNode == nullptr) {
-      return;
-    }
-    int parameterIndex = -1;
-    for (int i = 0; i < functionCall.parameters.size(); i++) {
-      if (functionCall.parameters.at(i).get() == variableNode) {
-        parameterIndex = i;
-        break;
-      }
-    }
-    if (parameterIndex < 0) {
-      return;
-    }
-
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
-
-    const gd::ParameterMetadata* parameterMetadata =
-        MetadataProvider::GetFunctionCallParameterMetadata(
-            platform, objectsContainersList, functionCall, parameterIndex);
-    if (parameterMetadata == nullptr) return;  // Unexpected
-
-    // Support for legacy pre-scoped variables:
-    if (parameterMetadata->GetValueTypeMetadata().IsLegacyPreScopedVariable()) {
-      if (parameterMetadata->GetType() == "objectvar") {
-        // Legacy convention where a "objectvar"
-        // parameter represents a variable of the object represented by the
-        // previous "object" parameter. The object on which the function is
-        // called is returned if no previous parameters are objects.
-        gd::String objectName = functionCall.objectName;
-        for (int previousIndex = parameterIndex - 1; previousIndex >= 0;
-             previousIndex--) {
-          const gd::ParameterMetadata* previousParameterMetadata =
-              MetadataProvider::GetFunctionCallParameterMetadata(
-                  platform, objectsContainersList, functionCall, previousIndex);
-          if (previousParameterMetadata != nullptr &&
-              gd::ParameterMetadata::IsObject(
-                  previousParameterMetadata->GetType())) {
-            auto previousParameterNode =
-                functionCall.parameters[previousIndex].get();
-            IdentifierNode* objectNode =
-                dynamic_cast<IdentifierNode*>(previousParameterNode);
-            objectName = objectNode->identifierName;
-            break;
-          }
-        }
-
-        legacyPrescopedVariablesContainer =
-            projectScopedContainers.GetObjectsContainersList()
-                .GetObjectOrGroupVariablesContainer(objectName);
-        thisIsALegacyPrescopedVariable = true;
-      } else if (parameterMetadata->GetType() == "scenevar") {
-        legacyPrescopedVariablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetBottomMostVariablesContainer();
-        thisIsALegacyPrescopedVariable = true;
-      } else if (parameterMetadata->GetType() == "globalvar") {
-        legacyPrescopedVariablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetTopMostVariablesContainer();
-        thisIsALegacyPrescopedVariable = true;
-      }
-    } else {
-      thisIsALegacyPrescopedVariable = false;
-      legacyPrescopedVariablesContainer = nullptr;
-    }
-  }
-
- private:
-  VariableAndItsParent WalkUntilLastParent(
-      const gd::Variable& variable,
-      const std::vector<gd::String>& childVariableNames,
-      size_t startIndex = 0) {
-    if (bailOutBecauseEmptyVariableName)
-      return {};  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
-
-    const gd::Variable* currentVariable = &variable;
-
-    // Walk until size - 1 as we want the last parent.
-    for (size_t index = startIndex; index + 1 < childVariableNames.size();
-         ++index) {
-      const gd::String& childName = childVariableNames[index];
-
-      if (childName.empty()) {
-        if (currentVariable->GetChildrenCount() == 0) {
-          // The array or structure is empty, we can't walk through it - there
-          // is no "parent".
-          return {};
-        }
-
-        if (currentVariable->GetType() == gd::Variable::Array) {
-          currentVariable = &currentVariable->GetAtIndex(0);
-        } else {
-          currentVariable =
-              currentVariable->GetAllChildren().begin()->second.get();
-        }
-      } else {
-        if (!currentVariable->HasChild(childName)) {
-          // Non existing child - there is no "parent".
-          return {};
-        }
-
-        currentVariable = &currentVariable->GetChild(childName);
-      }
-    }
-
-    // Return the last parent of the chain of variables (so not the last
-    // variable but the one before it).
-    return {.parentVariable = currentVariable};
-  }
-
-  VariableAndItsParent WalkUntilLastParent(
-      const gd::VariablesContainer& variablesContainer,
-      const std::vector<gd::String>& childVariableNames) {
-    if (bailOutBecauseEmptyVariableName)
-      return {};  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
-    if (childVariableNames.empty())
-      return {};  // There is no "parent" to the variables container itself.
-
-    const gd::String& firstChildName = *childVariableNames.begin();
-
-    const gd::Variable* variable = variablesContainer.Has(firstChildName)
-                                       ? &variablesContainer.Get(firstChildName)
-                                       : nullptr;
-    if (childVariableNames.size() == 1 || !variable)
-      return {// Only one child: the parent is the variables container itself.
-              .parentVariablesContainer = &variablesContainer};
-
-    return WalkUntilLastParent(*variable, childVariableNames, 1);
-  }
-
-  gd::ExpressionNode* variableNode;
-  std::vector<gd::String> childVariableNames;
-  bool thisIsALegacyPrescopedVariable;
-  bool bailOutBecauseEmptyVariableName;
-  const gd::VariablesContainer* legacyPrescopedVariablesContainer;
-  VariableAndItsParent variableAndItsParent;
-
-  const gd::Platform& platform;
-  const gd::ProjectScopedContainers& projectScopedContainers;
-};
-
-}  // namespace gd

Core/GDCore/IDE/ExtensionsLoader.cpp

@@ -43,6 +43,7 @@ void ExtensionsLoader::LoadAllExtensions(const gd::String &directory,
   struct dirent *lecture;
   DIR *rep;
   rep = opendir(directory.c_str());
+  int l = 0;
 
   if (rep == NULL) {
     cout << "Unable to open Extensions (" << directory << ") directory."
@@ -62,6 +63,8 @@ void ExtensionsLoader::LoadAllExtensions(const gd::String &directory,
 
       LoadExtension(directory + "/" + lec, platform, forgiving);
       librariesLoaded.push_back(directory + "/" + lec);
+
+      l++;
     }
   }
 
@@ -100,6 +103,7 @@ void ExtensionsLoader::ExtensionsLoadingDone(const gd::String &directory) {
   struct dirent *lecture;
   DIR *rep;
   rep = opendir(directory.c_str());
+  int l = 0;
 
   if (rep == NULL) {
     cout << "Unable to open Extensions (" << directory << ") directory."
@@ -114,6 +118,7 @@ void ExtensionsLoader::ExtensionsLoadingDone(const gd::String &directory) {
         lec.find(".xgd" + suffix, lec.length() - 4 - suffix.length()) !=
             string::npos) {
       librariesLoaded.push_back(directory + "/" + lec);
+      l++;
     }
   }
 

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -1,222 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "ObjectAssetSerializer.h"
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
-#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Project/AssetResourcePathCleaner.h"
-#include "GDCore/IDE/Project/ResourcesInUseHelper.h"
-#include "GDCore/IDE/Project/ResourcesRenamer.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/CustomBehavior.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-gd::String
-ObjectAssetSerializer::GetObjectExtensionName(const gd::Object &object) {
-  const gd::String &type = object.GetType();
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  return separatorIndex != std::string::npos ? type.substr(0, separatorIndex)
-                                             : "";
-}
-
-void ObjectAssetSerializer::SerializeTo(
-    gd::Project &project, const gd::Object &object,
-    const gd::String &objectFullName, SerializerElement &element,
-    std::map<gd::String, gd::String> &resourcesFileNameMap) {
-  auto cleanObject = object.Clone();
-  cleanObject->GetVariables().Clear();
-  cleanObject->GetEffects().Clear();
-  for (auto &&behaviorName : cleanObject->GetAllBehaviorNames()) {
-    cleanObject->RemoveBehavior(behaviorName);
-  }
-
-  gd::String extensionName = GetObjectExtensionName(*cleanObject);
-
-  std::map<gd::String, gd::String> resourcesNameReverseMap;
-  gd::ObjectAssetSerializer::RenameObjectResourceFiles(
-      project, *cleanObject, "", objectFullName, resourcesFileNameMap,
-      resourcesNameReverseMap);
-
-  element.SetAttribute("id", "");
-  element.SetAttribute("name", "");
-  element.SetAttribute("license", "");
-  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
-    auto &extension = project.GetEventsFunctionsExtension(extensionName);
-    element.SetAttribute("description", extension.GetShortDescription());
-  }
-  element.SetAttribute("gdevelopVersion", "");
-  element.SetAttribute("version", "");
-  element.SetIntAttribute("animationsCount", 1);
-  element.SetIntAttribute("maxFramesCount", 1);
-  // TODO Find the right object dimensions.
-  element.SetIntAttribute("width", 0);
-  element.SetIntAttribute("height", 0);
-  SerializerElement &authorsElement = element.AddChild("authors");
-  authorsElement.ConsiderAsArrayOf("author");
-  SerializerElement &tagsElement = element.AddChild("tags");
-  tagsElement.ConsiderAsArrayOf("tag");
-
-  SerializerElement &objectAssetsElement = element.AddChild("objectAssets");
-  objectAssetsElement.ConsiderAsArrayOf("objectAsset");
-  SerializerElement &objectAssetElement =
-      objectAssetsElement.AddChild("objectAsset");
-
-  cleanObject->SerializeTo(objectAssetElement.AddChild("object"));
-
-  SerializerElement &resourcesElement =
-      objectAssetElement.AddChild("resources");
-  resourcesElement.ConsiderAsArrayOf("resource");
-  auto &resourcesManager = project.GetResourcesManager();
-  gd::ResourcesInUseHelper resourcesInUse(resourcesManager);
-  cleanObject->GetConfiguration().ExposeResources(resourcesInUse);
-  for (auto &&newResourceName : resourcesInUse.GetAllResources()) {
-    if (newResourceName.length() == 0) {
-      continue;
-    }
-    auto &resource = resourcesManager.GetResource(
-        resourcesNameReverseMap.find(newResourceName) !=
-                resourcesNameReverseMap.end()
-            ? resourcesNameReverseMap[newResourceName]
-            : newResourceName);
-    SerializerElement &resourceElement = resourcesElement.AddChild("resource");
-    resource.SerializeTo(resourceElement);
-    // Override name and file because the project and the asset don't use the
-    // same one.
-    resourceElement.SetAttribute("kind", resource.GetKind());
-    resourceElement.SetAttribute("name", newResourceName);
-    auto &oldFilePath = resource.GetFile();
-    resourceElement.SetAttribute("file",
-                                 resourcesFileNameMap.find(oldFilePath) !=
-                                         resourcesFileNameMap.end()
-                                     ? resourcesFileNameMap[oldFilePath]
-                                     : oldFilePath);
-  }
-
-  SerializerElement &requiredExtensionsElement =
-      objectAssetElement.AddChild("requiredExtensions");
-  requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
-  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
-    SerializerElement &requiredExtensionElement =
-        requiredExtensionsElement.AddChild("requiredExtension");
-    requiredExtensionElement.SetAttribute("extensionName", extensionName);
-    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
-  }
-
-  // TODO This can be removed when the asset script no longer require it.
-  SerializerElement &customizationElement =
-      objectAssetElement.AddChild("customization");
-  customizationElement.ConsiderAsArrayOf("empty");
-}
-
-void ObjectAssetSerializer::RenameObjectResourceFiles(
-    gd::Project &project, gd::Object &object,
-    const gd::String &destinationDirectory, const gd::String &objectFullName,
-    std::map<gd::String, gd::String> &resourcesFileNameMap,
-    std::map<gd::String, gd::String> &resourcesNameReverseMap) {
-  gd::AssetResourcePathCleaner assetResourcePathCleaner(
-      project.GetResourcesManager(), resourcesFileNameMap,
-      resourcesNameReverseMap);
-  object.GetConfiguration().ExposeResources(assetResourcePathCleaner);
-
-  // Use asset store script naming conventions for sprite resource files.
-  if (object.GetConfiguration().GetType() == "Sprite") {
-    gd::SpriteObject &spriteConfiguration =
-        dynamic_cast<gd::SpriteObject &>(object.GetConfiguration());
-    std::map<gd::String, gd::String> normalizedFileNames;
-
-    for (std::size_t animationIndex = 0;
-         animationIndex < spriteConfiguration.GetAnimationsCount();
-         animationIndex++) {
-      auto &animation = spriteConfiguration.GetAnimation(animationIndex);
-      auto &direction = animation.GetDirection(0);
-
-      const gd::String &animationName =
-          animation.GetName().empty()
-              ? gd::String::From(animationIndex)
-              : animation.GetName().FindAndReplace("_", " ", true);
-
-      // Search frames that share the same resource.
-      std::map<gd::String, std::vector<int>> frameIndexes;
-      for (std::size_t frameIndex = 0; frameIndex < direction.GetSpritesCount();
-           frameIndex++) {
-        auto &frame = direction.GetSprite(frameIndex);
-
-        if (frameIndexes.find(frame.GetImageName()) == frameIndexes.end()) {
-          std::vector<int> emptyVector;
-          frameIndexes[frame.GetImageName()] = emptyVector;
-        }
-        auto &indexes = frameIndexes[frame.GetImageName()];
-        indexes.push_back(frameIndex);
-      }
-
-      for (std::size_t frameIndex = 0; frameIndex < direction.GetSpritesCount();
-           frameIndex++) {
-        auto &frame = direction.GetSprite(frameIndex);
-        auto oldName = frame.GetImageName();
-
-        if (normalizedFileNames.find(oldName) != normalizedFileNames.end()) {
-          gd::LogWarning("The resource \"" + oldName +
-                         "\" is shared by several animations.");
-          continue;
-        }
-
-        gd::String newName = objectFullName;
-        if (spriteConfiguration.GetAnimationsCount() > 1) {
-          newName += "_" + animationName;
-        }
-        if (direction.GetSpritesCount() > 1) {
-          newName += "_";
-          auto &indexes = frameIndexes[frame.GetImageName()];
-          for (size_t i = 0; i < indexes.size(); i++) {
-            newName += gd::String::From(indexes.at(i) + 1);
-            if (i < indexes.size() - 1) {
-              newName += ";";
-            }
-          }
-        }
-        gd::String extension = oldName.substr(oldName.find_last_of("."));
-        newName += extension;
-
-        frame.SetImageName(newName);
-        normalizedFileNames[oldName] = newName;
-      }
-    }
-    for (std::map<gd::String, gd::String>::const_iterator it =
-             resourcesFileNameMap.begin();
-         it != resourcesFileNameMap.end(); ++it) {
-      if (!it->first.empty()) {
-        gd::String originFile = it->first;
-        gd::String destinationFile = it->second;
-        resourcesFileNameMap[originFile] = normalizedFileNames[destinationFile];
-      }
-    }
-    auto clonedResourcesNameReverseMap = resourcesNameReverseMap;
-    resourcesNameReverseMap.clear();
-    for (std::map<gd::String, gd::String>::const_iterator it =
-             clonedResourcesNameReverseMap.begin();
-         it != clonedResourcesNameReverseMap.end(); ++it) {
-      if (!it->first.empty()) {
-        gd::String newResourceName = it->first;
-        gd::String oldResourceName = it->second;
-        resourcesNameReverseMap[normalizedFileNames[newResourceName]] =
-            oldResourceName;
-      }
-    }
-  }
-}
-} // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.h

@@ -1,64 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-#include <map>
-#include <vector>
-
-#include "GDCore/String.h"
-
-namespace gd {
-class Object;
-class ExtensionDependency;
-class PropertyDescriptor;
-class Project;
-class Layout;
-class ArbitraryResourceWorker;
-class InitialInstance;
-class SerializerElement;
-class EffectsContainer;
-class AbstractFileSystem;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Serialize objects into an asset for the store.
- *
- * \ingroup IDE
- */
-class GD_CORE_API ObjectAssetSerializer {
-public:
-  /**
-   * \brief Serialize an object into an asset.
-   *
-   * \param project The project that contains the object and its resources.
-   * It's not actually modified.
-   * \param object The object to serialize as an asset.
-   * \param objectFullName The object name with spaces instead of PascalCase.
-   * \param element The element where the asset is serialize.
-   * \param resourcesFileNameMap The map from project resource file paths to
-   * asset resource file paths.
-   */
-  static void
-  SerializeTo(gd::Project &project, const gd::Object &object,
-              const gd::String &objectFullName, SerializerElement &element,
-              std::map<gd::String, gd::String> &resourcesFileNameMap);
-
-  ~ObjectAssetSerializer(){};
-
-private:
-  ObjectAssetSerializer(){};
-
-  static void RenameObjectResourceFiles(
-      gd::Project &project, gd::Object &object,
-      const gd::String &destinationDirectory, const gd::String &objectFullName,
-      std::map<gd::String, gd::String> &resourcesFileNameMap,
-      std::map<gd::String, gd::String> &resourcesNameReverseMap);
-
-  static gd::String GetObjectExtensionName(const gd::Object &object);
-};
-
-} // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -52,16 +52,6 @@ void ArbitraryResourceWorker::ExposeModel3D(gd::String& resourceName){
     // do.
 };
 
-void ArbitraryResourceWorker::ExposeAtlas(gd::String& resourceName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
-void ArbitraryResourceWorker::ExposeSpine(gd::String& resourceName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
 void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
     // Nothing to do by default - each child class can define here the action to
     // do.
@@ -73,10 +63,14 @@ void ArbitraryResourceWorker::ExposeBitmapFont(gd::String& bitmapFontName){
 };
 
 void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
-  if (resourcesManager->HasResource(audioName) &&
-      resourcesManager->GetResource(audioName).GetKind() == "audio") {
-    // Nothing to do, the audio is a reference to a proper resource.
-    return;
+  for (auto resources : GetResources()) {
+    if (!resources) continue;
+
+    if (resources->HasResource(audioName) &&
+        resources->GetResource(audioName).GetKind() == "audio") {
+      // Nothing to do, the audio is a reference to a proper resource.
+      return;
+    }
   }
 
   // For compatibility with older projects (where events were referring to files
@@ -86,10 +80,14 @@ void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
 };
 
 void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
-  if (resourcesManager->HasResource(fontName) &&
-      resourcesManager->GetResource(fontName).GetKind() == "font") {
-    // Nothing to do, the font is a reference to a proper resource.
-    return;
+  for (auto resources : GetResources()) {
+    if (!resources) continue;
+
+    if (resources->HasResource(fontName) &&
+        resources->GetResource(fontName).GetKind() == "font") {
+      // Nothing to do, the font is a reference to a proper resource.
+      return;
+    }
   }
 
   // For compatibility with older projects (where events were referring to files
@@ -98,7 +96,12 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
   ExposeFile(fontName);
 };
 
-void ArbitraryResourceWorker::ExposeResources() {
+void ArbitraryResourceWorker::ExposeResources(
+    gd::ResourcesManager* resourcesManager) {
+  if (!resourcesManager) return;
+
+  resourcesManagers.push_back(resourcesManager);
+
   std::vector<gd::String> resources = resourcesManager->GetAllResourceNames();
   for (std::size_t i = 0; i < resources.size(); i++) {
     if (resourcesManager->GetResource(resources[i]).UseFile())
@@ -107,6 +110,9 @@ void ArbitraryResourceWorker::ExposeResources() {
 }
 
 void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
+  if (resourcesManagers.empty()) return;
+  gd::ResourcesManager* resourcesManager = resourcesManagers[0];
+
   gd::Resource& resource = resourcesManager->GetResource(resourceName);
 
   if (!resource.GetMetadata().empty()) {
@@ -130,7 +136,6 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
 
           gd::String potentiallyUpdatedTargetResourceName = targetResourceName;
           ExposeResourceWithType(targetResource.GetKind(), potentiallyUpdatedTargetResourceName);
-          ExposeEmbeddeds(potentiallyUpdatedTargetResourceName);
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
             // The resource name was renamed. Also update the mapping.
@@ -171,7 +176,6 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
   }
   if (resourceType == "tilemap") {
     ExposeTilemap(resourceName);
-    ExposeEmbeddeds(resourceName);
     return;
   }
   if (resourceType == "tileset") {
@@ -180,21 +184,12 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
   }
   if (resourceType == "json") {
     ExposeJson(resourceName);
-    ExposeEmbeddeds(resourceName);
     return;
   }
   if (resourceType == "video") {
     ExposeVideo(resourceName);
     return;
   }
-  if (resourceType == "atlas") {
-    ExposeAtlas(resourceName);
-    return;
-  }
-  if (resourceType == "spine") {
-    ExposeSpine(resourceName);
-    return;
-  }
   gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
   return;
 }
@@ -248,12 +243,10 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
         } else if (parameterMetadata.GetType() == "jsonResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeJson(updatedParameterValue);
-          worker.ExposeEmbeddeds(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
         } else if (parameterMetadata.GetType() == "tilemapResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeTilemap(updatedParameterValue);
-          worker.ExposeEmbeddeds(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
         } else if (parameterMetadata.GetType() == "tilesetResource") {
           gd::String updatedParameterValue = parameterValue;
@@ -263,20 +256,19 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeModel3D(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
-        } else if (parameterMetadata.GetType() == "atlasResource") {
-          gd::String updatedParameterValue = parameterValue;
-          worker.ExposeAtlas(updatedParameterValue);
-          instruction.SetParameter(parameterIndex, updatedParameterValue);
-        } else if (parameterMetadata.GetType() == "spineResource") {
-          gd::String updatedParameterValue = parameterValue;
-          worker.ExposeSpine(updatedParameterValue);
-          instruction.SetParameter(parameterIndex, updatedParameterValue);
         }
       });
 
   return false;
 };
 
+void LaunchResourceWorkerOnEvents(const gd::Project& project,
+                                  gd::EventsList& events,
+                                  gd::ArbitraryResourceWorker& worker) {
+  gd::ResourceWorkerInEventsWorker eventsWorker(project, worker);
+  eventsWorker.Launch(events);
+}
+
 gd::ResourceWorkerInEventsWorker
 GetResourceWorkerOnEvents(const gd::Project &project,
                           gd::ArbitraryResourceWorker &worker) {

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -37,14 +37,13 @@ namespace gd {
  * \see ResourcesMergingHelper
  * \see gd::ResourcesInUseHelper
  *
- * \see gd::GetResourceWorkerOnEvents
+ * \see gd::LaunchResourceWorkerOnEvents
  *
  * \ingroup IDE
  */
 class GD_CORE_API ArbitraryResourceWorker {
-public:
-  ArbitraryResourceWorker(gd::ResourcesManager &resourcesManager_)
-      : resourcesManager(&resourcesManager_){};
+ public:
+  ArbitraryResourceWorker(){};
   virtual ~ArbitraryResourceWorker();
 
   /**
@@ -53,7 +52,7 @@ public:
    * first to ensure that resources are known so that images, shaders & audio
    * can make reference to them.
    */
-  void ExposeResources();
+  void ExposeResources(gd::ResourcesManager *resourcesManager);
 
   /**
    * \brief Expose a resource from a given type.
@@ -96,16 +95,6 @@ public:
    * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
    */
   virtual void ExposeModel3D(gd::String &resourceName);
-  
-  /**
-   * \brief Expose an atlas, which is always a reference to a "atlas" resource.
-   */
-  virtual void ExposeAtlas(gd::String &resourceName);
-
-  /**
-   * \brief Expose an spine, which is always a reference to a "spine" resource.
-   */
-  virtual void ExposeSpine(gd::String &resourceName);
 
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
@@ -133,8 +122,10 @@ public:
    */
   virtual void ExposeEmbeddeds(gd::String &resourceName);
 
-protected:
-  gd::ResourcesManager * resourcesManager;
+ protected:
+  const std::vector<gd::ResourcesManager *> &GetResources() {
+    return resourcesManagers;
+  };
 
  private:
   /**
@@ -142,6 +133,8 @@ protected:
    * exposed as file (see ExposeFile).
    */
   void ExposeResource(gd::Resource &resource);
+
+  std::vector<gd::ResourcesManager *> resourcesManagers;
 };
 
 /**

Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp

@@ -1,74 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "AssetResourcePathCleaner.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ResourcesManager.h"
-#include "GDCore/String.h"
-
-namespace gd {
-void AssetResourcePathCleaner::ExposeImage(gd::String &imageName) {
-  ExposeResourceAsFile(imageName);
-}
-
-void AssetResourcePathCleaner::ExposeAudio(gd::String &audioName) {
-  ExposeResourceAsFile(audioName);
-}
-
-void AssetResourcePathCleaner::ExposeFont(gd::String &fontName) {
-  ExposeResourceAsFile(fontName);
-}
-
-void AssetResourcePathCleaner::ExposeJson(gd::String &jsonName) {
-  ExposeResourceAsFile(jsonName);
-}
-
-void AssetResourcePathCleaner::ExposeTilemap(gd::String &tilemapName) {
-  ExposeResourceAsFile(tilemapName);
-}
-
-void AssetResourcePathCleaner::ExposeTileset(gd::String &tilesetName) {
-  ExposeResourceAsFile(tilesetName);
-}
-
-void AssetResourcePathCleaner::ExposeVideo(gd::String &videoName) {
-  ExposeResourceAsFile(videoName);
-}
-
-void AssetResourcePathCleaner::ExposeBitmapFont(gd::String &bitmapFontName) {
-  ExposeResourceAsFile(bitmapFontName);
-}
-
-void AssetResourcePathCleaner::ExposeResourceAsFile(gd::String &resourceName) {
-
-  auto &resource = resourcesManager->GetResource(resourceName);
-  gd::String file = resource.GetFile();
-  ExposeFile(file);
-
-  resourcesNameReverseMap[file] = resourceName;
-  resourceName = file;
-}
-
-void AssetResourcePathCleaner::ExposeFile(gd::String &resourceFilePath) {
-
-  size_t slashPos = resourceFilePath.find_last_of("/");
-  size_t antiSlashPos = resourceFilePath.find_last_of("\\");
-  size_t baseNamePos =
-      slashPos == String::npos
-          ? antiSlashPos == String::npos ? 0 : (antiSlashPos + 1)
-      : antiSlashPos == String::npos ? (slashPos + 1)
-      : slashPos > antiSlashPos      ? (slashPos + 1)
-                                     : (antiSlashPos + 1);
-  gd::String baseName =
-      baseNamePos != 0
-          ? resourceFilePath.substr(baseNamePos, resourceFilePath.length())
-          : resourceFilePath;
-
-  resourcesFileNameMap[resourceFilePath] = baseName;
-  resourceFilePath = baseName;
-}
-
-} // namespace gd

Core/GDCore/IDE/Project/AssetResourcePathCleaner.h

@@ -1,65 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/IDE/Project/ResourcesMergingHelper.h"
-#include "GDCore/String.h"
-#include <map>
-#include <memory>
-#include <vector>
-
-namespace gd {
-class AbstractFileSystem;
-class Project;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief AssetResourcePathCleaner is used when exporting an object as an asset.
- * It removes the folder from the path.
- *
- * \see ArbitraryResourceWorker
- *
- * \ingroup IDE
- */
-class GD_CORE_API AssetResourcePathCleaner : public ArbitraryResourceWorker {
-public:
-  AssetResourcePathCleaner(
-      gd::ResourcesManager &resourcesManager,
-      std::map<gd::String, gd::String> &resourcesFileNameMap_,
-      std::map<gd::String, gd::String> &resourcesNameReverseMap_)
-      : ArbitraryResourceWorker(resourcesManager),
-        resourcesFileNameMap(resourcesFileNameMap_),
-        resourcesNameReverseMap(resourcesNameReverseMap_){};
-  virtual ~AssetResourcePathCleaner(){};
-
-  void ExposeImage(gd::String &imageName) override;
-  void ExposeAudio(gd::String &audioName) override;
-  void ExposeFont(gd::String &fontName) override;
-  void ExposeJson(gd::String &jsonName) override;
-  void ExposeTilemap(gd::String &tilemapName) override;
-  void ExposeTileset(gd::String &tilesetName) override;
-  void ExposeVideo(gd::String &videoName) override;
-  void ExposeBitmapFont(gd::String &bitmapFontName) override;
-  void ExposeFile(gd::String &resource) override;
-
-protected:
-  void ExposeResourceAsFile(gd::String &resourceName);
-
-  /**
-   * New file names that can be accessed by their original name.
-   */
-  std::map<gd::String, gd::String> &resourcesFileNameMap;
-
-  /**
-   * Original resource names that can be accessed by their new name.
-   */
-  std::map<gd::String, gd::String> &resourcesNameReverseMap;
-};
-
-} // namespace gd

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.cpp

@@ -6,7 +6,7 @@
 namespace gd {
 
 void ObjectsUsingResourceCollector::DoVisitObject(gd::Object& object) {
-  gd::ResourceNameMatcher resourceNameMatcher(*resourcesManager, resourceName);
+  gd::ResourceNameMatcher resourceNameMatcher(resourceName);
 
   object.GetConfiguration().ExposeResources(resourceNameMatcher);
   if (resourceNameMatcher.AnyResourceMatches()) {

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h

@@ -4,7 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
+#ifndef ProjectObjectsUsingResourceCollector_H
+#define ProjectObjectsUsingResourceCollector_H
 
 #include <vector>
 
@@ -20,10 +21,9 @@ namespace gd {
 
 class GD_CORE_API ObjectsUsingResourceCollector
     : public ArbitraryObjectsWorker {
-public:
-  ObjectsUsingResourceCollector(gd::ResourcesManager &resourcesManager_,
-                                const gd::String &resourceName_)
-      : resourcesManager(&resourcesManager_), resourceName(resourceName_){};
+ public:
+  ObjectsUsingResourceCollector(const gd::String& resourceName_)
+      : resourceName(resourceName_){};
   virtual ~ObjectsUsingResourceCollector();
 
   std::vector<gd::String>& GetObjectNames() { return objectNames; }
@@ -33,16 +33,12 @@ public:
 
   std::vector<gd::String> objectNames;
   gd::String resourceName;
-  gd::ResourcesManager *resourcesManager;
 };
 
 class GD_CORE_API ResourceNameMatcher : public ArbitraryResourceWorker {
-public:
-  ResourceNameMatcher(gd::ResourcesManager &resourcesManager,
-                      const gd::String &resourceName_)
-      : resourceName(resourceName_),
-        matchesResourceName(false), gd::ArbitraryResourceWorker(
-                                        resourcesManager){};
+ public:
+  ResourceNameMatcher(const gd::String& resourceName_)
+      : resourceName(resourceName_), matchesResourceName(false){};
   virtual ~ResourceNameMatcher(){};
 
   bool AnyResourceMatches() { return matchesResourceName; }
@@ -79,12 +75,6 @@ public:
   virtual void ExposeModel3D(gd::String& otherResourceName) override {
     MatchResourceName(otherResourceName);
   };
-  virtual void ExposeAtlas(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeSpine(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
 
   void MatchResourceName(gd::String& otherResourceName) {
     if (otherResourceName == resourceName) matchesResourceName = true;
@@ -95,3 +85,5 @@ public:
 };
 
 };  // namespace gd
+
+#endif  // ProjectObjectsUsingResourceCollector_H

Core/GDCore/IDE/Project/ProjectResourcesAdder.cpp

@@ -18,9 +18,8 @@ namespace gd {
 std::vector<gd::String> ProjectResourcesAdder::GetAllUseless(
     gd::Project& project, const gd::String& resourceType) {
   std::vector<gd::String> unusedResources;
-
   // Search for resources used in the project
-  gd::ResourcesInUseHelper resourcesInUse(project.GetResourcesManager());
+  gd::ResourcesInUseHelper resourcesInUse;
   gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesInUse);
   std::set<gd::String>& usedResources = resourcesInUse.GetAll(resourceType);
 

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -25,29 +25,8 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
     bool updateOriginalProject,
     bool preserveAbsoluteFilenames,
     bool preserveDirectoryStructure) {
-  if (updateOriginalProject) {
-    gd::ProjectResourcesCopier::CopyAllResourcesTo(
-        originalProject, originalProject, fs, destinationDirectory,
-        preserveAbsoluteFilenames, preserveDirectoryStructure);
-  } else {
-    gd::Project clonedProject = originalProject;
-    gd::ProjectResourcesCopier::CopyAllResourcesTo(
-        originalProject, clonedProject, fs, destinationDirectory,
-        preserveAbsoluteFilenames, preserveDirectoryStructure);
-  }
-  return true;
-}
-
-bool ProjectResourcesCopier::CopyAllResourcesTo(
-    gd::Project& originalProject,
-    gd::Project& clonedProject,
-    AbstractFileSystem& fs,
-    gd::String destinationDirectory,
-    bool preserveAbsoluteFilenames,
-    bool preserveDirectoryStructure) {
-
   // Check if there are some resources with absolute filenames
-  gd::ResourcesAbsolutePathChecker absolutePathChecker(originalProject.GetResourcesManager(), fs);
+  gd::ResourcesAbsolutePathChecker absolutePathChecker(fs);
   gd::ResourceExposer::ExposeWholeProjectResources(originalProject, absolutePathChecker);
 
   auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
@@ -55,18 +34,24 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
             << destinationDirectory << "..." << std::endl;
 
   // Get the resources to be copied
-  gd::ResourcesMergingHelper resourcesMergingHelper(
-      clonedProject.GetResourcesManager(), fs);
+  gd::ResourcesMergingHelper resourcesMergingHelper(fs);
   resourcesMergingHelper.SetBaseDirectory(projectDirectory);
   resourcesMergingHelper.PreserveDirectoriesStructure(
       preserveDirectoryStructure);
-  resourcesMergingHelper.PreserveAbsoluteFilenames(preserveAbsoluteFilenames);
-  gd::ResourceExposer::ExposeWholeProjectResources(clonedProject,
-                                                    resourcesMergingHelper);
+  resourcesMergingHelper.PreserveAbsoluteFilenames(
+      preserveAbsoluteFilenames);
+
+  if (updateOriginalProject) {
+    gd::ResourceExposer::ExposeWholeProjectResources(originalProject, resourcesMergingHelper);
+  } else {
+    std::shared_ptr<gd::Project> project(new gd::Project(originalProject));
+    gd::ResourceExposer::ExposeWholeProjectResources(*project, resourcesMergingHelper);
+  }
 
   // Copy resources
   map<gd::String, gd::String>& resourcesNewFilename =
       resourcesMergingHelper.GetAllResourcesOldAndNewFilename();
+  unsigned int i = 0;
   for (map<gd::String, gd::String>::const_iterator it =
            resourcesNewFilename.begin();
        it != resourcesNewFilename.end();
@@ -86,6 +71,8 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
                        destinationFile + _("\"."));
       }
     }
+
+    ++i;
   }
 
   return true;

Core/GDCore/IDE/Project/ProjectResourcesCopier.h

@@ -3,10 +3,9 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef PROJECTRESOURCESCOPIER_H
+#define PROJECTRESOURCESCOPIER_H
 #include "GDCore/String.h"
-
 namespace gd {
 class Project;
 class AbstractFileSystem;
@@ -48,14 +47,8 @@ class GD_CORE_API ProjectResourcesCopier {
                                  bool updateOriginalProject,
                                  bool preserveAbsoluteFilenames = true,
                                  bool preserveDirectoryStructure = true);
-
-private:
-  static bool CopyAllResourcesTo(gd::Project& originalProject,
-                                 gd::Project& clonedProject,
-                                 gd::AbstractFileSystem& fs,
-                                 gd::String destinationDirectory,
-                                 bool preserveAbsoluteFilenames = true,
-                                 bool preserveDirectoryStructure = true);
 };
 
 }  // namespace gd
+
+#endif  // PROJECTRESOURCESCOPIER_H

Core/GDCore/IDE/Project/ResourcesAbsolutePathChecker.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 RESOURCESABSOLUTEPATHCHECKER_H
+#define RESOURCESABSOLUTEPATHCHECKER_H
 
 #include "GDCore/IDE/AbstractFileSystem.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
@@ -21,10 +22,10 @@ namespace gd {
  */
 class GD_CORE_API ResourcesAbsolutePathChecker
     : public ArbitraryResourceWorker {
-public:
-  ResourcesAbsolutePathChecker(gd::ResourcesManager &resourcesManager,
-                               AbstractFileSystem &fileSystem)
-      : ArbitraryResourceWorker(resourcesManager), hasAbsoluteFilenames(false),
+ public:
+  ResourcesAbsolutePathChecker(AbstractFileSystem& fileSystem)
+      : ArbitraryResourceWorker(),
+        hasAbsoluteFilenames(false),
         fs(fileSystem){};
   virtual ~ResourcesAbsolutePathChecker(){};
 
@@ -46,3 +47,5 @@ public:
 };
 
 }  // namespace gd
+
+#endif  // RESOURCESABSOLUTEPATHCHECKER_H

Core/GDCore/IDE/Project/ResourcesInUseHelper.cpp

@@ -1,25 +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 "ResourcesInUseHelper.h"
-
-namespace gd {
-
-const std::vector<gd::String> ResourcesInUseHelper::resourceTypes = {
-    "image",   "audio", "font",       "json",   "tilemap",
-    "tileset", "video", "bitmapFont", "model3D"};
-
-const std::vector<gd::String> &ResourcesInUseHelper::GetAllResources() {
-  allResources.clear();
-  for (auto &&resourceType : gd::ResourcesInUseHelper::resourceTypes) {
-    for (auto &&resourceName : GetAll(resourceType)) {
-      allResources.push_back(resourceName);
-    }
-  }
-  return allResources;
-}
-
-} // namespace gd

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -4,7 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
+#if defined(GD_IDE_ONLY)
+#ifndef IMAGESUSEDINVENTORIZER_H
+#define IMAGESUSEDINVENTORIZER_H
 
 #include <set>
 #include <vector>
@@ -31,12 +33,10 @@ std::set<gd::String> & usedImages = resourcesInUse.GetAllImages();
  * \ingroup IDE
  */
 class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
-public:
-  ResourcesInUseHelper(gd::ResourcesManager &resourcesManager)
-      : gd::ArbitraryResourceWorker(resourcesManager){};
+ public:
+  ResourcesInUseHelper() : gd::ArbitraryResourceWorker(){};
   virtual ~ResourcesInUseHelper(){};
 
-  const std::vector<gd::String>& GetAllResources();
   std::set<gd::String>& GetAllImages() { return GetAll("image"); };
   std::set<gd::String>& GetAllAudios() { return GetAll("audio"); };
   std::set<gd::String>& GetAllFonts() { return GetAll("font"); };
@@ -46,8 +46,6 @@ public:
   std::set<gd::String>& GetAllVideos() { return GetAll("video"); };
   std::set<gd::String>& GetAllBitmapFonts() { return GetAll("bitmapFont"); };
   std::set<gd::String>& GetAll3DModels() { return GetAll("model3D"); };
-  std::set<gd::String>& GetAllAtlases() { return GetAll("atlas"); };
-  std::set<gd::String>& GetAllSpines() { return GetAll("spine"); };
   std::set<gd::String>& GetAll(const gd::String& resourceType) {
     if (resourceType == "image") return allImages;
     if (resourceType == "audio") return allAudios;
@@ -58,8 +56,6 @@ public:
     if (resourceType == "video") return allVideos;
     if (resourceType == "bitmapFont") return allBitmapFonts;
     if (resourceType == "model3D") return allModel3Ds;
-    if (resourceType == "atlas") return allAtlases;
-    if (resourceType == "spine") return allSpines;
 
     return emptyResources;
   };
@@ -67,42 +63,35 @@ public:
   virtual void ExposeFile(gd::String& resource) override{
       /*Don't care, we just list resource names*/
   };
-  virtual void ExposeImage(gd::String& resourceName) override {
-    allImages.insert(resourceName);
+  virtual void ExposeImage(gd::String& imageResourceName) override {
+    allImages.insert(imageResourceName);
   };
-  virtual void ExposeAudio(gd::String& resourceName) override {
-    allAudios.insert(resourceName);
+  virtual void ExposeAudio(gd::String& audioResourceName) override {
+    allAudios.insert(audioResourceName);
   };
-  virtual void ExposeFont(gd::String& resourceName) override {
-    allFonts.insert(resourceName);
+  virtual void ExposeFont(gd::String& fontResourceName) override {
+    allFonts.insert(fontResourceName);
   };
-  virtual void ExposeJson(gd::String& resourceName) override {
-    allJsons.insert(resourceName);
+  virtual void ExposeJson(gd::String& jsonResourceName) override {
+    allJsons.insert(jsonResourceName);
   };
-  virtual void ExposeTilemap(gd::String& resourceName) override {
-    allTilemaps.insert(resourceName);
+  virtual void ExposeTilemap(gd::String& tilemapResourceName) override {
+    allTilemaps.insert(tilemapResourceName);
   };
-  virtual void ExposeTileset(gd::String& resourceName) override {
-    allTilesets.insert(resourceName);
+  virtual void ExposeTileset(gd::String& tilesetResourceName) override {
+    allTilesets.insert(tilesetResourceName);
   };
-  virtual void ExposeVideo(gd::String& resourceName) override {
-    allVideos.insert(resourceName);
+  virtual void ExposeVideo(gd::String& videoResourceName) override {
+    allVideos.insert(videoResourceName);
   };
-  virtual void ExposeBitmapFont(gd::String& resourceName) override {
-    allBitmapFonts.insert(resourceName);
+  virtual void ExposeBitmapFont(gd::String& bitmapFontResourceName) override {
+    allBitmapFonts.insert(bitmapFontResourceName);
   };
   virtual void ExposeModel3D(gd::String& resourceName) override {
     allModel3Ds.insert(resourceName);
   };
-  virtual void ExposeAtlas(gd::String& resourceName) override {
-    allAtlases.insert(resourceName);
-  };
-  virtual void ExposeSpine(gd::String& resourceName) override {
-    allSpines.insert(resourceName);
-  };
 
  protected:
-  std::vector<gd::String> allResources;
   std::set<gd::String> allImages;
   std::set<gd::String> allAudios;
   std::set<gd::String> allFonts;
@@ -112,11 +101,10 @@ public:
   std::set<gd::String> allVideos;
   std::set<gd::String> allBitmapFonts;
   std::set<gd::String> allModel3Ds;
-  std::set<gd::String> allAtlases;
-  std::set<gd::String> allSpines;
   std::set<gd::String> emptyResources;
-
-  static const std::vector<gd::String> resourceTypes;
 };
 
 }  // namespace gd
+
+#endif  // IMAGESUSEDINVENTORIZER_H
+#endif

Core/GDCore/IDE/Project/ResourcesMergingHelper.cpp

@@ -28,7 +28,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
   auto stripToFilenameOnly = [&]() {
     fs.MakeAbsolute(resourceFullFilename, baseDirectory);
     SetNewFilename(resourceFullFilename, fs.FileNameFrom(resourceFullFilename));
-    resourceFilename = newFilenames[resourceFullFilename];
+    resourceFilename = oldFilenames[resourceFullFilename];
   };
 
   // if we do not want to preserve the folders at all,
@@ -45,7 +45,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
     gd::String relativeFilename = resourceFullFilename;
     if (fs.MakeRelative(relativeFilename, baseDirectory)) {
       SetNewFilename(resourceFullFilename, relativeFilename);
-      resourceFilename = newFilenames[resourceFullFilename];
+      resourceFilename = oldFilenames[resourceFullFilename];
     } else {
       // The filename cannot be made relative. Consider that it is absolute.
       // Just strip the filename to its file part
@@ -63,7 +63,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
 
 void ResourcesMergingHelper::SetNewFilename(gd::String oldFilename,
                                             gd::String newFilename) {
-  if (newFilenames.find(oldFilename) != newFilenames.end()) return;
+  if (oldFilenames.find(oldFilename) != oldFilenames.end()) return;
 
   // Extract baseName and extension from the new filename
   size_t extensionPos = newFilename.find_last_of(".");
@@ -80,13 +80,13 @@ void ResourcesMergingHelper::SetNewFilename(gd::String oldFilename,
       gd::NewNameGenerator::Generate(
           baseName,
           [this, extension](const gd::String& newBaseName) {
-            return oldFilenames.find(newBaseName + extension) !=
-                   oldFilenames.end();
+            return newFilenames.find(newBaseName + extension) !=
+                   newFilenames.end();
           }) +
       extension;
 
-  newFilenames[oldFilename] = finalFilename;
-  oldFilenames[finalFilename] = oldFilename;
+  oldFilenames[oldFilename] = finalFilename;
+  newFilenames[finalFilename] = oldFilename;
 }
 
 void ResourcesMergingHelper::SetBaseDirectory(

Core/GDCore/IDE/Project/ResourcesMergingHelper.h

@@ -28,11 +28,11 @@ namespace gd {
  * \ingroup IDE
  */
 class GD_CORE_API ResourcesMergingHelper : public ArbitraryResourceWorker {
-public:
-  ResourcesMergingHelper(gd::ResourcesManager &resourcesManager,
-                         gd::AbstractFileSystem &fileSystem)
-      : ArbitraryResourceWorker(resourcesManager),
-        preserveDirectoriesStructure(false), preserveAbsoluteFilenames(false),
+ public:
+  ResourcesMergingHelper(gd::AbstractFileSystem& fileSystem)
+      : ArbitraryResourceWorker(),
+        preserveDirectoriesStructure(false),
+        preserveAbsoluteFilenames(false),
         fs(fileSystem){};
   virtual ~ResourcesMergingHelper(){};
 
@@ -64,25 +64,19 @@ public:
    * the Base Directory.
    */
   std::map<gd::String, gd::String>& GetAllResourcesOldAndNewFilename() {
-    return newFilenames;
+    return oldFilenames;
   };
 
   /**
    * Resources merging helper collects all resources filenames and update these
    * filenames.
    */
-  void ExposeFile(gd::String& resource) override;
+  virtual void ExposeFile(gd::String& resource) override;
 
  protected:
   void SetNewFilename(gd::String oldFilename, gd::String newFilename);
 
-  /**
-   * Original file names that can be accessed by their new name.
-   */
   std::map<gd::String, gd::String> oldFilenames;
-  /**
-   * New file names that can be accessed by their original name.
-   */
   std::map<gd::String, gd::String> newFilenames;
   gd::String baseDirectory;
   bool preserveDirectoriesStructure;  ///< If set to true, the directory

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -22,16 +22,13 @@ namespace gd {
  */
 class ResourcesRenamer : public gd::ArbitraryResourceWorker {
  public:
-   /**
-    * @brief Constructor taking the map from old name to new name.
-    * @param oldToNewNames_ A map associating to a resource name the new name to
-    * use.
-    */
-   ResourcesRenamer(gd::ResourcesManager &resourcesManager,
-                    const std::map<gd::String, gd::String> &oldToNewNames_)
-       : gd::ArbitraryResourceWorker(resourcesManager),
-         oldToNewNames(oldToNewNames_){};
-
+  /**
+   * @brief Constructor taking the map from old name to new name.
+   * @param oldToNewNames_ A map associating to a resource name the new name to
+   * use.
+   */
+  ResourcesRenamer(const std::map<gd::String, gd::String>& oldToNewNames_)
+      : gd::ArbitraryResourceWorker(), oldToNewNames(oldToNewNames_){};
   virtual ~ResourcesRenamer(){};
 
   virtual void ExposeFile(gd::String& resourceFileName) override{
@@ -65,12 +62,6 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeModel3D(gd::String& resourceName) override {
     RenameIfNeeded(resourceName);
   };
-  virtual void ExposeAtlas(gd::String& resourceName) override {
-    RenameIfNeeded(resourceName);
-  };
-  virtual void ExposeSpine(gd::String& resourceName) override {
-    RenameIfNeeded(resourceName);
-  };
 
  private:
   void RenameIfNeeded(gd::String& resourceName) {

Core/GDCore/IDE/Project/SceneResourcesFinder.cpp

@@ -1,37 +0,0 @@
-/*
- * GDevelop JS Platform
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "SceneResourcesFinder.h"
-
-#include "GDCore/IDE/ResourceExposer.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-
-std::set<gd::String> SceneResourcesFinder::FindProjectResources(gd::Project &project) {
-  gd::SceneResourcesFinder resourceWorker(project.GetResourcesManager());
-
-  gd::ResourceExposer::ExposeProjectResources(project, resourceWorker);
-  return resourceWorker.resourceNames;
-}
-
-std::set<gd::String> SceneResourcesFinder::FindSceneResources(gd::Project &project,
-    gd::Layout &layout) {
-  gd::SceneResourcesFinder resourceWorker(project.GetResourcesManager());
-
-  gd::ResourceExposer::ExposeLayoutResources(project, layout, resourceWorker);
-  return resourceWorker.resourceNames;
-}
-
-void SceneResourcesFinder::AddUsedResource(gd::String &resourceName) {
-  if (resourceName.empty()) {
-    return;
-  }
-  resourceNames.insert(resourceName);
-}
-
-} // namespace gd

Core/GDCore/IDE/Project/SceneResourcesFinder.h

@@ -1,93 +0,0 @@
-/*
- * GDevelop JS Platform
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/String.h"
-
-#include <set>
-
-namespace gd {
-class Project;
-class Layout;
-class SerializerElement;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Find resource usages in several parts of the project.
- *
- * \ingroup IDE
- */
-class SceneResourcesFinder : private gd::ArbitraryResourceWorker {
-public:
-  /**
-   * @brief Find resource usages in a given scenes.
-   *
-   * It doesn't include resources used globally.
-   */
-  static std::set<gd::String> FindSceneResources(gd::Project &project,
-                                                      gd::Layout &layout);
-
-  /**
-   * @brief Find resource that are used globally in the project.
-   *
-   * It doesn't include resources used in scenes.
-   */
-  static std::set<gd::String> FindProjectResources(gd::Project &project);
-
-  virtual ~SceneResourcesFinder(){};
-
-private:
-  SceneResourcesFinder(gd::ResourcesManager &resourcesManager)
-      : gd::ArbitraryResourceWorker(resourcesManager){};
-
-  void AddUsedResource(gd::String &resourceName);
-
-  void ExposeFile(gd::String &resourceFileName) override{
-      // Don't do anything: we're renaming resources, not the files they are
-      // pointing to.
-  };
-  void ExposeImage(gd::String &imageResourceName) override {
-    AddUsedResource(imageResourceName);
-  };
-  void ExposeAudio(gd::String &audioResourceName) override {
-    AddUsedResource(audioResourceName);
-  };
-  void ExposeFont(gd::String &fontResourceName) override {
-    AddUsedResource(fontResourceName);
-  };
-  void ExposeJson(gd::String &jsonResourceName) override {
-    AddUsedResource(jsonResourceName);
-  };
-  void ExposeTilemap(gd::String &tilemapResourceName) override {
-    AddUsedResource(tilemapResourceName);
-  };
-  void ExposeTileset(gd::String &tilesetResourceName) override {
-    AddUsedResource(tilesetResourceName);
-  };
-  void ExposeVideo(gd::String &videoResourceName) override {
-    AddUsedResource(videoResourceName);
-  };
-  void ExposeBitmapFont(gd::String &bitmapFontName) override {
-    AddUsedResource(bitmapFontName);
-  };
-  void ExposeModel3D(gd::String &resourceName) override {
-    AddUsedResource(resourceName);
-  };
-  void ExposeAtlas(gd::String &resourceName) override {
-    AddUsedResource(resourceName);
-  };
-  void ExposeSpine(gd::String &resourceName) override {
-    AddUsedResource(resourceName);
-  };
-
-  std::set<gd::String> resourceNames;
-};
-
-} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -20,7 +20,6 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
-#include "GDCore/IDE/DependenciesAnalyzer.h"
 
 namespace gd {
 
@@ -34,8 +33,27 @@ void ProjectBrowserHelper::ExposeProjectEvents(
   // Add events based extensions
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
+    // Add (free) events functions
     auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+      worker.Launch(eventsFunction->GetEvents());
+    }
+
+    // Add (behavior) events functions
+    for (auto &&eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
+    }
+
+    // Add (object) events functions
+    for (auto &&eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      auto &objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
+      for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
+        worker.Launch(eventsFunction->GetEvents());
+      }
+    }
   }
 }
 
@@ -51,7 +69,7 @@ void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
   }
 }
 
-void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+void ProjectBrowserHelper::ExposeLayoutEvents(
     gd::Project &project, gd::Layout &layout,
     gd::ArbitraryEventsWorker &worker) {
 
@@ -67,7 +85,7 @@ void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
   }
 }
 
-void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+void ProjectBrowserHelper::ExposeLayoutEvents(
     gd::Project &project, gd::Layout &layout,
     gd::ArbitraryEventsWorkerWithContext &worker) {
   auto projectScopedContainers =
@@ -85,32 +103,6 @@ void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
   }
 }
 
-void ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
-    gd::Project &project, gd::Layout &layout,
-    gd::ArbitraryEventsWorker &worker) {
-  // Add layouts events
-  worker.Launch(layout.GetEvents());
-
-  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
-  bool hasCircularDependencies = !dependenciesAnalyzer.Analyze();
-  if (hasCircularDependencies) {
-    // The analyzer stops when it finds circular dependencies so the dependencies are not complete.
-    // TODO Should the analyzer still continue to avoid side effect on thing that would not be code generation related?
-    // Maybe a boolean parameter should be added?
-    return;
-  }
-  for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
-    gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
-
-    worker.Launch(externalEvents.GetEvents());
-  }
-  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
-    gd::Layout& dependencyLayout = project.GetLayout(sceneName);
-    
-    worker.Launch(dependencyLayout.GetEvents());
-  }
-}
-
 void ProjectBrowserHelper::ExposeProjectEvents(
     gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
   // See also gd::Project::ExposeResources for a method that traverse the whole
@@ -138,43 +130,8 @@ void ProjectBrowserHelper::ExposeProjectEvents(
   // Add events based extensions
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
+    // Add (free) events functions
     auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
-  }
-}
-
-void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    gd::ArbitraryEventsWorker &worker) {
-    // Add (free) events functions
-    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      gd::ObjectsContainer globalObjectsAndGroups;
-      gd::ObjectsContainer objectsAndGroups;
-      gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
-          project, eventsFunctionsExtension, *eventsFunction,
-          globalObjectsAndGroups, objectsAndGroups);
-
-      worker.Launch(eventsFunction->GetEvents());
-    }
-
-    // Add (behavior) events functions
-    for (auto &&eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
-    }
-
-    // Add (object) events functions
-    for (auto &&eventsBasedObject :
-         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
-      ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
-    }
-}
-
-void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    gd::ArbitraryEventsWorkerWithContext &worker) {
-    // Add (free) events functions
     for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
       gd::ObjectsContainer globalObjectsAndGroups;
       gd::ObjectsContainer objectsAndGroups;
@@ -200,6 +157,7 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
          eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
       ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
     }
+  }
 }
 
 void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
@@ -231,21 +189,6 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
   }
 }
 
-void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-    gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
-    gd::ArbitraryEventsWorker &worker) {
-  auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
-  for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
-    gd::ObjectsContainer globalObjectsAndGroups;
-    gd::ObjectsContainer objectsAndGroups;
-    gd::EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
-        project, eventsBasedObject, *eventsFunction, globalObjectsAndGroups,
-        objectsAndGroups);
-
-    worker.Launch(eventsFunction->GetEvents());
-  }
-}
-
 void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
     gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
     gd::ArbitraryEventsWorkerWithContext &worker) {
@@ -273,7 +216,7 @@ void ProjectBrowserHelper::ExposeProjectObjects(
 
   // Layout objects
   for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
-    gd::ProjectBrowserHelper::ExposeLayoutObjects(project.GetLayout(i), worker);
+    worker.Launch(project.GetLayout(i));
   }
 
   // Event based objects children
@@ -289,14 +232,6 @@ void ProjectBrowserHelper::ExposeProjectObjects(
   }
 };
 
-void ProjectBrowserHelper::ExposeLayoutObjects(gd::Layout &layout,
-                                  gd::ArbitraryObjectsWorker &worker) {
-  // In the future, layouts may have children object containers.
-
-  // Layout objects
-  worker.Launch(layout);
-}
-
 void ProjectBrowserHelper::ExposeProjectFunctions(
     gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) {
 

Core/GDCore/IDE/ProjectBrowserHelper.h

@@ -60,52 +60,18 @@ public:
    * \brief Call the specified worker on all events of a layout and
    * its external events.
    */
-  static void ExposeLayoutEventsAndExternalEvents(gd::Project &project, gd::Layout &layout,
+  static void ExposeLayoutEvents(gd::Project &project, gd::Layout &layout,
                                  gd::ArbitraryEventsWorker &worker);
-
   /**
    * \brief Call the specified worker on all events of a layout and
    * its external events.
    */
-  static void ExposeLayoutEventsAndExternalEvents(gd::Project &project, gd::Layout &layout,
+  static void ExposeLayoutEvents(gd::Project &project, gd::Layout &layout,
                                  gd::ArbitraryEventsWorkerWithContext &worker);
 
-  /**
-   * \brief Call the specified worker on all events of a layout and
-   * its dependencies according to EventLink (external events or other layout
-   * events).
-   */
-  static void
-  ExposeLayoutEventsAndDependencies(gd::Project &project, gd::Layout &layout,
-                                    gd::ArbitraryEventsWorker &worker);
-
   /**
    * \brief Call the specified worker on all events of the event-based
-   * extension.
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based extension.
-   */
-  static void ExposeEventsFunctionsExtensionEvents(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      gd::ArbitraryEventsWorker &worker);
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * extension.
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based extension.
-   */
-  static void ExposeEventsFunctionsExtensionEvents(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      gd::ArbitraryEventsWorkerWithContext &worker);
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * behavior.
+   * behavior
    *
    * This should be the preferred way to traverse all the events of an events
    * based behavior.
@@ -127,22 +93,10 @@ public:
 
   /**
    * \brief Call the specified worker on all events of the event-based
-   * object.
+   * behavior.
    *
    * This should be the preferred way to traverse all the events of an
-   * event-based object.
-   */
-  static void
-  ExposeEventsBasedObjectEvents(gd::Project &project,
-                                const gd::EventsBasedObject &eventsBasedObject,
-                                gd::ArbitraryEventsWorker &worker);
-
-  /**
-   * \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.
+   * event-based behavior.
    */
   static void
   ExposeEventsBasedObjectEvents(gd::Project &project,
@@ -158,14 +112,6 @@ public:
   static void ExposeProjectObjects(gd::Project &project,
                                    gd::ArbitraryObjectsWorker &worker);
 
-  /**
-   * \brief Call the specified worker on all ObjectContainers of the layout.
-   *
-   * This should be the preferred way to traverse all the objects of a layout.
-   */
-  static void ExposeLayoutObjects(gd::Layout &layout,
-                                  gd::ArbitraryObjectsWorker &worker);
-
   /**
    * \brief Call the specified worker on all FunctionsContainers of the project
    * (global, layouts...)

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -128,7 +128,11 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     } else {
       gd::Instruction action;
       action.SetType("SetReturn" + numberOrString);
-      action.AddParameter(property.GetName());
+      gd::String receiver = isBehavior ? "Object.Behavior::" : "Object.";
+      gd::String propertyPrefix =
+          (isSharedProperties ? "SharedProperty" : "Property");
+      action.AddParameter(receiver + propertyPrefix + property.GetName() +
+                          "()");
       event.GetActions().Insert(action, 0);
     }
   }
@@ -229,13 +233,15 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       gd::Instruction action;
       action.SetType(setterType);
       action.AddParameter("Object");
+      gd::String parameterGetterCall =
+          "GetArgumentAs" + numberOrString + "(\"Value\")";
       if (isBehavior) {
         action.AddParameter("Behavior");
         action.AddParameter("=");
-        action.AddParameter("Value");
+        action.AddParameter(parameterGetterCall);
       } else {
         action.AddParameter("=");
-        action.AddParameter("Value");
+        action.AddParameter(parameterGetterCall);
       }
       event.GetActions().Insert(action, 0);
     }

Core/GDCore/IDE/ResourceExposer.cpp

@@ -24,7 +24,6 @@
 #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 {
 
@@ -33,9 +32,10 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
   // traverse the whole project (this time for events) and ExposeProjectEffects
   // (this time for effects).
 
-  // Expose any project resources as files.
-  worker.ExposeResources();
+  gd::ResourcesManager* resourcesManager = &(project.GetResourcesManager());
 
+  // Expose any project resources as files.
+  worker.ExposeResources(resourcesManager);
   project.GetPlatformSpecificAssets().ExposeResources(worker);
 
   // Expose event resources
@@ -73,49 +73,6 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
     worker.ExposeImage(loadingScreen.GetBackgroundImageResourceName());
 }
 
-void ResourceExposer::ExposeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
-  // Expose global objects configuration resources
-  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
-  objectWorker.Launch(project);
-}
-
-void ResourceExposer::ExposeLayoutResources(
-    gd::Project &project, gd::Layout &layout,
-    gd::ArbitraryResourceWorker &worker) {
-
-  // Expose object configuration resources
-  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
-  gd::ProjectBrowserHelper::ExposeLayoutObjects(layout, objectWorker);
-
-  // Expose layer effect resources
-  for (std::size_t layerIndex = 0; layerIndex < layout.GetLayersCount();
-       layerIndex++) {
-    auto &layer = layout.GetLayer(layerIndex);
-
-    auto &effects = layer.GetEffects();
-    for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
-         effectIndex++) {
-      auto &effect = effects.GetEffect(effectIndex);
-      gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
-                                                 effect, worker);
-    }
-  }
-
-  // Expose event resources
-  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(project, layout,
-                                                              eventWorker);
-
-  // Exposed extension event resources
-  // Note that using resources in extensions is very unlikely and probably not
-  // worth the effort of something smart.
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, eventWorker);
-  }
-}
-
 void ResourceExposer::ExposeEffectResources(
     gd::Platform &platform, gd::Effect &effect,
     gd::ArbitraryResourceWorker &worker) {
@@ -131,13 +88,11 @@ void ResourceExposer::ExposeEffectResources(
       auto &resourceType = propertyDescriptor.GetExtraInfo()[0];
 
       const gd::String &resourceName = effect.GetStringParameter(propertyName);
-      if (!resourceName.empty()) {
-        gd::String potentiallyUpdatedResourceName = resourceName;
-        worker.ExposeResourceWithType(resourceType,
-                                      potentiallyUpdatedResourceName);
-        if (potentiallyUpdatedResourceName != resourceName) {
-          effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
-        }
+      gd::String potentiallyUpdatedResourceName = resourceName;
+      worker.ExposeResourceWithType(resourceType,
+                                    potentiallyUpdatedResourceName);
+      if (potentiallyUpdatedResourceName != resourceName) {
+        effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
       }
     }
   }

Core/GDCore/IDE/ResourceExposer.h

@@ -10,7 +10,6 @@ class Platform;
 class Project;
 class ArbitraryResourceWorker;
 class Effect;
-class Layout;
 } // namespace gd
 
 namespace gd {
@@ -32,25 +31,6 @@ public:
   static void ExposeWholeProjectResources(gd::Project &project,
                                           gd::ArbitraryResourceWorker &worker);
 
-  /**
-   * @brief Expose only the resources used globally on a project.
-   * 
-   * It doesn't include resources used in layouts.
-   */
-  static void ExposeProjectResources(gd::Project &project,
-                                     gd::ArbitraryResourceWorker &worker);
-
-  /**
-   * @brief Expose the resources used in a given layout.
-   * 
-   * It doesn't include resources used globally.
-   */
-  static void ExposeLayoutResources(gd::Project &project, gd::Layout &layout,
-                                          gd::ArbitraryResourceWorker &worker);
-
-  /**
-   * @brief Expose the resources used in a given effect.
-   */
   static void ExposeEffectResources(gd::Platform &platform, gd::Effect &effect,
                                     gd::ArbitraryResourceWorker &worker);
 };

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -16,8 +16,8 @@
 #include "GDCore/IDE/Events/BehaviorTypeRenamer.h"
 #include "GDCore/IDE/Events/CustomObjectTypeRenamer.h"
 #include "GDCore/IDE/Events/EventsBehaviorRenamer.h"
-#include "GDCore/IDE/Events/EventsPropertyReplacer.h"
 #include "GDCore/IDE/Events/EventsRefactorer.h"
+#include "GDCore/IDE/Events/EventsPropertyReplacer.h"
 #include "GDCore/IDE/Events/EventsVariableReplacer.h"
 #include "GDCore/IDE/Events/ExpressionsParameterMover.h"
 #include "GDCore/IDE/Events/ExpressionsRenamer.h"
@@ -138,8 +138,7 @@ void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
   }
 }
 
-VariablesChangeset
-WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
     gd::Project &project,
     const gd::SerializerElement &oldSerializedVariablesContainer,
     const gd::VariablesContainer &newVariablesContainer) {
@@ -150,9 +149,9 @@ WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
 
   if (oldVariablesContainer.GetPersistentUuid() !=
       newVariablesContainer.GetPersistentUuid()) {
-    gd::LogWarning(_(
-        "Called ComputeChangesetForVariablesContainer on variables containers "
-        "that are different - they can't be compared."));
+    gd::LogWarning(
+        _("Called ComputeChangesetForVariablesContainer on variables containers "
+          "that are different - they can't be compared."));
     return changeset;
   }
 
@@ -193,11 +192,14 @@ WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
 }
 
 void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-    gd::Project &project, const gd::VariablesContainer &newVariablesContainer,
-    const gd::VariablesChangeset &changeset) {
+    gd::Project &project,
+    const gd::VariablesContainer &newVariablesContainer,
+    const gd::VariablesChangeset& changeset) {
   gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(), newVariablesContainer,
-      changeset.oldToNewVariableNames, changeset.removedVariableNames);
+      project.GetCurrentPlatform(),
+      newVariablesContainer,
+      changeset.oldToNewVariableNames,
+      changeset.removedVariableNames);
   gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                 eventsVariableReplacer);
 }
@@ -741,14 +743,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
         EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
     gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-    std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
-        {oldPropertyName, newPropertyName}};
+    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::ExposeProjectEvents(project,
-                                                  eventsPropertyReplacer);
+      project.GetCurrentPlatform(),
+      properties,
+      oldToNewPropertyNames,
+      removedPropertyNames);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -811,14 +813,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
         EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName));
     gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-    std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
-        {oldPropertyName, newPropertyName}};
+    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::ExposeProjectEvents(project,
-                                                  eventsPropertyReplacer);
+      project.GetCurrentPlatform(),
+      properties,
+      oldToNewPropertyNames,
+      removedPropertyNames);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -868,14 +870,14 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
       EventsBasedObject::GetPropertyExpressionName(newPropertyName));
   gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-  std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
-      {oldPropertyName, newPropertyName}};
+  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::ExposeProjectEvents(project,
-                                                eventsPropertyReplacer);
+    project.GetCurrentPlatform(),
+    properties,
+    oldToNewPropertyNames,
+    removedPropertyNames);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer);
 
   gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
       project,
@@ -1349,6 +1351,7 @@ void WholeProjectRefactorer::DoRenameBehavior(
     gd::Project &project, const gd::String &oldBehaviorType,
     const gd::String &newBehaviorType,
     const gd::ProjectBrowser &projectBrowser) {
+
   // Rename behavior in required behavior properties
   auto requiredBehaviorRenamer =
       gd::RequiredBehaviorRenamer(oldBehaviorType, newBehaviorType);
@@ -1375,6 +1378,7 @@ void WholeProjectRefactorer::DoRenameBehavior(
 void WholeProjectRefactorer::DoRenameObject(
     gd::Project &project, const gd::String &oldObjectType,
     const gd::String &newObjectType, const gd::ProjectBrowser &projectBrowser) {
+
   // Rename object type in objects lists.
   auto customObjectTypeRenamer =
       gd::CustomObjectTypeRenamer(oldObjectType, newObjectType);
@@ -1394,8 +1398,7 @@ void WholeProjectRefactorer::DoRenameObject(
 void WholeProjectRefactorer::ObjectOrGroupRemovedInLayout(
     gd::Project &project, gd::Layout &layout, const gd::String &objectName,
     bool isObjectGroup, bool removeEventsAndGroups) {
-  auto projectScopedContainers = gd::ProjectScopedContainers::
-      MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
 
   // Remove object in the current layout
   if (removeEventsAndGroups) {
@@ -1444,8 +1447,7 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInLayout(
   if (oldName == newName || newName.empty() || oldName.empty())
     return;
 
-  auto projectScopedContainers = gd::ProjectScopedContainers::
-      MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
 
   // Rename object in the current layout
   gd::EventsRefactorer::RenameObjectInEvents(
@@ -1534,19 +1536,10 @@ void WholeProjectRefactorer::RenameLayer(gd::Project &project,
                                          const gd::String &newName) {
   if (oldName == newName || newName.empty() || oldName.empty())
     return;
-
   gd::ProjectElementRenamer projectElementRenamer(project.GetCurrentPlatform(),
                                                   "layer", oldName, newName);
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
-      project, layout, projectElementRenamer);
-  layout.GetInitialInstances().MoveInstancesToLayer(oldName, newName);
-
-  std::vector<gd::String> externalLayoutsNames =
-      GetAssociatedExternalLayouts(project, layout);
-  for (gd::String name : externalLayoutsNames) {
-    auto &externalLayout = project.GetExternalLayout(name);
-    externalLayout.GetInitialInstances().MoveInstancesToLayer(oldName, newName);
-  }
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
+                                               projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project,
@@ -1559,8 +1552,8 @@ void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "layerEffectName", oldName, newName);
   projectElementRenamer.SetLayerConstraint(layer.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
-      project, layout, projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
+                                               projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project,
@@ -1573,8 +1566,8 @@ void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectAnimationName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
-      project, layout, projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
+                                               projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project,
@@ -1587,8 +1580,8 @@ void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectPointName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
-      project, layout, projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
+                                               projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project,
@@ -1601,8 +1594,8 @@ void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectEffectName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
-      project, layout, projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
+                                               projectElementRenamer);
 }
 
 void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsBasedObject(
@@ -1624,12 +1617,9 @@ void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::String &objectName,
     bool isObjectGroup, bool removeEventsAndGroups) {
-  // In theory we should pass a ProjectScopedContainers to this function so it
-  // does not have to construct one. In practice, this is ok because we only
-  // deal with objects.
-  auto projectScopedContainers =
-      gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(
-          globalObjectsContainer, objectsContainer);
+  // In theory we should pass a ProjectScopedContainers to this function so it does not have to construct one.
+  // In practice, this is ok because we only deal with objects.
+  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsContainer, objectsContainer);
 
   if (removeEventsAndGroups) {
     gd::EventsRefactorer::RemoveObjectInEvents(
@@ -1665,12 +1655,9 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::String &oldName,
     const gd::String &newName, bool isObjectGroup) {
-  // In theory we should pass a ProjectScopedContainers to this function so it
-  // does not have to construct one. In practice, this is ok because we only
-  // deal with objects.
-  auto projectScopedContainers =
-      gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(
-          globalObjectsContainer, objectsContainer);
+  // In theory we should pass a ProjectScopedContainers to this function so it does not have to construct one.
+  // In practice, this is ok because we only deal with objects.
+  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsContainer, objectsContainer);
 
   gd::EventsRefactorer::RenameObjectInEvents(
       project.GetCurrentPlatform(), projectScopedContainers,
@@ -1718,7 +1705,7 @@ void WholeProjectRefactorer::GlobalObjectOrGroupRemoved(
     if (layout.HasObjectNamed(objectName))
       continue;
 
-    ObjectOrGroupRemovedInLayout(project, layout, objectName, isObjectGroup,
+        ObjectOrGroupRemovedInLayout(project, layout, objectName, isObjectGroup,
                                  removeEventsAndGroups);
   }
 }
@@ -1766,8 +1753,7 @@ size_t WholeProjectRefactorer::GetLayoutAndExternalLayoutLayerInstancesCount(
       GetAssociatedExternalLayouts(project, layout);
   for (gd::String name : externalLayoutsNames) {
     auto &externalLayout = project.GetExternalLayout(name);
-    count +=
-        externalLayout.GetInitialInstances().GetLayerInstancesCount(layerName);
+    count += externalLayout.GetInitialInstances().GetLayerInstancesCount(layerName);
   }
   return count;
 }

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -5,8 +5,6 @@
  */
 #include "CustomConfigurationHelper.h"
 
-#include <map>
-
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Project.h"
@@ -15,6 +13,8 @@
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
+#include <map>
+
 using namespace gd;
 
 void CustomConfigurationHelper::InitializeContent(
@@ -25,8 +25,7 @@ void CustomConfigurationHelper::InitializeContent(
     auto propertyType = property->GetType();
 
     if (propertyType == "String" || propertyType == "Choice" ||
-        propertyType == "Color" || propertyType == "Behavior" ||
-        propertyType == "resource") {
+        propertyType == "Color" || propertyType == "Behavior") {
       element.SetStringValue(property->GetValue());
     } else if (propertyType == "Number") {
       element.SetDoubleValue(property->GetValue().To<double>());
@@ -52,8 +51,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 == "Color" || propertyType == "Behavior") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
       } else if (propertyType == "Number") {
@@ -61,9 +59,8 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
             configurationContent.GetChild(propertyName).GetDoubleValue()));
       } else if (propertyType == "Boolean") {
         newProperty.SetValue(
-            configurationContent.GetChild(propertyName).GetBoolValue()
-                ? "true"
-                : "false");
+            configurationContent.GetChild(propertyName).GetBoolValue() ? "true"
+                                                                  : "false");
       }
     } else {
       // No value was serialized for this property. `newProperty`
@@ -88,8 +85,7 @@ bool CustomConfigurationHelper::UpdateProperty(
   const gd::String &propertyType = property.GetType();
 
   if (propertyType == "String" || propertyType == "Choice" ||
-      propertyType == "Color" || propertyType == "Behavior" ||
-      propertyType == "resource") {
+      propertyType == "Color" || propertyType == "Behavior") {
     element.SetStringValue(newValue);
   } else if (propertyType == "Number") {
     element.SetDoubleValue(newValue.To<double>());

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -155,10 +155,6 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
         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) {

Core/GDCore/Project/Layer.cpp

@@ -39,7 +39,6 @@ void Layer::SetCameraCount(std::size_t n) {
 void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("renderingType", GetRenderingType());
-  element.SetAttribute("cameraType", GetCameraType());
   element.SetAttribute("visibility", GetVisibility());
   element.SetAttribute("isLocked", IsLocked());
   element.SetAttribute("isLightingLayer", IsLightingLayer());
@@ -79,7 +78,6 @@ void Layer::SerializeTo(SerializerElement& element) const {
 void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
   SetRenderingType(element.GetStringAttribute("renderingType", ""));
-  SetCameraType(element.GetStringAttribute("cameraType", "perspective"));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
   SetLocked(element.GetBoolAttribute("isLocked", false));
   SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));

Core/GDCore/Project/Layer.h

@@ -104,17 +104,10 @@ class GD_CORE_API Layer {
   const gd::String& GetName() const { return name; }
 
   const gd::String& GetRenderingType() const { return renderingType; }
-
   void SetRenderingType(const gd::String& renderingType_) {
     renderingType = renderingType_;
   }
 
-  const gd::String& GetCameraType() const { return cameraType; }
-
-  void SetCameraType(const gd::String& cameraType_) {
-    cameraType = cameraType_;
-  }
-
   /**
    * \brief Change if layer is displayed or not
    */
@@ -275,7 +268,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 cameraType;
   bool isVisible;            ///< True if the layer is visible
   bool isLocked;             ///< True if the layer is locked
   bool isLightingLayer;  ///< True if the layer is used to display lights and

Core/GDCore/Project/LoadingScreen.cpp

@@ -17,7 +17,7 @@ LoadingScreen::LoadingScreen()
       backgroundFadeInDuration(0.2),
       minDuration(1.5),
       logoAndProgressFadeInDuration(0.2),
-      logoAndProgressLogoFadeInDelay(0),
+      logoAndProgressLogoFadeInDelay(0.2),
       showProgressBar(true),
       progressBarMinWidth(40),
       progressBarMaxWidth(200),

Core/GDCore/Project/ObjectsContainersList.cpp

@@ -113,7 +113,7 @@ bool ObjectsContainersList::HasObjectWithVariableNamed(
   return false;
 }
 
-bool ObjectsContainersList::HasObjectOrGroupVariablesContainer(
+bool ObjectsContainersList::HasVariablesContainer(
     const gd::String& objectOrGroupName,
     const gd::VariablesContainer& variablesContainer) const {
   for (auto it = objectsContainers.rbegin(); it != objectsContainers.rend();
@@ -123,31 +123,8 @@ bool ObjectsContainersList::HasObjectOrGroupVariablesContainer(
              &(*it)->GetObject(objectOrGroupName).GetVariables();
     }
     if ((*it)->GetObjectGroups().Has(objectOrGroupName)) {
-      // For groups, we consider that the first object of the group defines the
-      // variables available for this group. Note that this is slightly
-      // different than other methods where a group is considered as the
-      // "intersection" of all of its objects.
-      const auto& objectNames =
-          (*it)->GetObjectGroups().Get(objectOrGroupName).GetAllObjectsNames();
-
-      if (!objectNames.empty()) {
-        return HasObjectVariablesContainer(objectNames[0], variablesContainer);
-      }
-      return false;
-    }
-  }
-
-  return false;
-}
-
-bool ObjectsContainersList::HasObjectVariablesContainer(
-    const gd::String& objectName,
-    const gd::VariablesContainer& variablesContainer) const {
-  for (auto it = objectsContainers.rbegin(); it != objectsContainers.rend();
-       ++it) {
-    if ((*it)->HasObjectNamed(objectName)) {
-      return &variablesContainer ==
-             &(*it)->GetObject(objectName).GetVariables();
+      // Could be adapted if objects groups have variables in the future.
+      // This would allow handling the renaming of variables of an object group.
     }
   }
 
@@ -163,30 +140,8 @@ ObjectsContainersList::GetObjectOrGroupVariablesContainer(
       return &(*it)->GetObject(objectOrGroupName).GetVariables();
     }
     if ((*it)->GetObjectGroups().Has(objectOrGroupName)) {
-      // For groups, we consider that the first object of the group defines the
-      // variables available for this group. Note that this is slightly
-      // different than other methods where a group is considered as the
-      // "intersection" of all of its objects.
-      const auto& objectNames =
-          (*it)->GetObjectGroups().Get(objectOrGroupName).GetAllObjectsNames();
-
-      if (!objectNames.empty()) {
-        return GetObjectVariablesContainer(objectNames[0]);
-      }
-      return nullptr;
-    }
-  }
-
-  return nullptr;
-}
-
-const gd::VariablesContainer*
-ObjectsContainersList::GetObjectVariablesContainer(
-    const gd::String& objectName) const {
-  for (auto it = objectsContainers.rbegin(); it != objectsContainers.rend();
-       ++it) {
-    if ((*it)->HasObjectNamed(objectName)) {
-      return &(*it)->GetObject(objectName).GetVariables();
+      // Could be adapted if objects groups have variables in the future.
+      // This would allow handling the renaming of variables of an object group.
     }
   }
 
@@ -195,6 +150,7 @@ ObjectsContainersList::GetObjectVariablesContainer(
 
 gd::Variable::Type ObjectsContainersList::GetTypeOfObjectOrGroupVariable(
     const gd::String& objectOrGroupName, const gd::String& variableName) const {
+
   for (auto it = objectsContainers.rbegin(); it != objectsContainers.rend();
        ++it) {
     if ((*it)->HasObjectNamed(objectOrGroupName)) {
@@ -226,12 +182,13 @@ gd::Variable::Type ObjectsContainersList::GetTypeOfObjectOrGroupVariable(
   return Variable::Type::Number;
 }
 
-gd::Variable::Type ObjectsContainersList::GetTypeOfObjectVariable(
-    const gd::String& objectName, const gd::String& variableName) const {
+gd::Variable::Type ObjectsContainersList::GetTypeOfObjectVariable(const gd::String& objectName, const gd::String& variableName) const {
+
   for (auto it = objectsContainers.rbegin(); it != objectsContainers.rend();
        ++it) {
     if ((*it)->HasObjectNamed(objectName)) {
-      const auto& variables = (*it)->GetObject(objectName).GetVariables();
+      const auto& variables =
+          (*it)->GetObject(objectName).GetVariables();
 
       return variables.Get(variableName).GetType();
     }

Core/GDCore/Project/ObjectsContainersList.h

@@ -61,7 +61,7 @@ class GD_CORE_API ObjectsContainersList {
    * \brief Check if the specified object or group has the specified variables
    * container.
    */
-  bool HasObjectOrGroupVariablesContainer(
+  bool HasVariablesContainer(
       const gd::String& objectOrGroupName,
       const gd::VariablesContainer& variablesContainer) const;
 
@@ -165,13 +165,6 @@ class GD_CORE_API ObjectsContainersList {
   bool HasObjectWithVariableNamed(const gd::String& objectName,
                                   const gd::String& variableName) const;
 
-  bool HasObjectVariablesContainer(
-      const gd::String& objectName,
-      const gd::VariablesContainer& variablesContainer) const;
-
-  const gd::VariablesContainer* GetObjectVariablesContainer(
-      const gd::String& objectName) const;
-
   gd::Variable::Type GetTypeOfObjectVariable(const gd::String& objectName, const gd::String& variableName) const;
 
   void ForEachObjectVariableMatchingSearch(

Core/GDCore/Project/PropertyDescriptor.cpp

@@ -30,9 +30,6 @@ void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
     extraInformationElement.AddChild("").SetStringValue(information);
   }
   element.AddChild("hidden").SetBoolValue(hidden);
-  if (deprecated) {
-    element.AddChild("deprecated").SetBoolValue(deprecated);
-  }
 }
 
 void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
@@ -61,9 +58,6 @@ void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
   hidden = element.HasChild("hidden")
                ? element.GetChild("hidden").GetBoolValue()
                : false;
-  deprecated = element.HasChild("deprecated")
-               ? element.GetChild("deprecated").GetBoolValue()
-               : false;
 }
 
 void PropertyDescriptor::SerializeValuesTo(SerializerElement& element) const {

Core/GDCore/Project/PropertyDescriptor.h

@@ -30,16 +30,12 @@ class GD_CORE_API PropertyDescriptor {
    * \param propertyValue The value of the property.
    */
   PropertyDescriptor(gd::String propertyValue)
-      : currentValue(propertyValue), type("string"), label(""), hidden(false),
-        deprecated(false),
-        measurementUnit(gd::MeasurementUnit::GetUndefined()) {}
+      : currentValue(propertyValue), type("string"), label(""), hidden(false), measurementUnit(gd::MeasurementUnit::GetUndefined()) {}
 
   /**
    * \brief Empty constructor creating an empty property to be displayed.
    */
-  PropertyDescriptor()
-      : hidden(false), deprecated(false),
-        measurementUnit(gd::MeasurementUnit::GetUndefined()){};
+  PropertyDescriptor() : hidden(false), measurementUnit(gd::MeasurementUnit::GetUndefined()) {};
 
   /**
    * \brief Destructor
@@ -146,19 +142,6 @@ class GD_CORE_API PropertyDescriptor {
    */
   bool IsHidden() const { return hidden; }
 
-  /**
-   * \brief Set if the property is deprecated.
-   */
-  PropertyDescriptor& SetDeprecated(bool enable = true) {
-    deprecated = enable;
-    return *this;
-  }
-
-  /**
-   * \brief Check if the property is deprecated.
-   */
-  bool IsDeprecated() const { return deprecated; }
-
   /** \name Serialization
    */
   ///@{
@@ -196,7 +179,6 @@ class GD_CORE_API PropertyDescriptor {
                          ///< choices, if a property is a displayed as a combo
                          ///< box.
   bool hidden;
-  bool deprecated;
   gd::MeasurementUnit measurementUnit; //< The unit of measurement of the property vale.
 };
 

Core/GDCore/Project/ResourcesManager.cpp

@@ -93,10 +93,6 @@ std::shared_ptr<Resource> ResourcesManager::CreateResource(
     return std::make_shared<BitmapFontResource>();
   else if (kind == "model3D")
     return std::make_shared<Model3DResource>();
-  else if (kind == "atlas")
-    return std::make_shared<AtlasResource>();
-  else if (kind == "spine")
-    return std::make_shared<SpineResource>();
 
   std::cout << "Bad resource created (type: " << kind << ")" << std::endl;
   return std::make_shared<Resource>();
@@ -538,7 +534,19 @@ void ResourcesManager::SerializeTo(SerializerElement& element) const {
     if (resources[i] == std::shared_ptr<Resource>()) break;
 
     SerializerElement& resourceElement = resourcesElement.AddChild("resource");
-    gd::ResourcesManager::SerializeResourceTo(*resources[i], resourceElement);
+    resourceElement.SetAttribute("kind", resources[i]->GetKind());
+    resourceElement.SetAttribute("name", resources[i]->GetName());
+    resourceElement.SetAttribute("metadata", resources[i]->GetMetadata());
+
+    const gd::String& originName = resources[i]->GetOriginName();
+    const gd::String& originIdentifier = resources[i]->GetOriginIdentifier();
+    if (!originName.empty() || !originIdentifier.empty()) {
+      resourceElement.AddChild("origin")
+          .SetAttribute("name", originName)
+          .SetAttribute("identifier", originIdentifier);
+    }
+
+    resources[i]->SerializeTo(resourceElement);
   }
 
   SerializerElement& resourcesFoldersElement =
@@ -548,22 +556,6 @@ void ResourcesManager::SerializeTo(SerializerElement& element) const {
     folders[i].SerializeTo(resourcesFoldersElement.AddChild("folder"));
 }
 
-void ResourcesManager::SerializeResourceTo(gd::Resource &resource,
-                                           SerializerElement &resourceElement) {
-  resourceElement.SetAttribute("kind", resource.GetKind());
-  resourceElement.SetAttribute("name", resource.GetName());
-  resourceElement.SetAttribute("metadata", resource.GetMetadata());
-
-  const gd::String &originName = resource.GetOriginName();
-  const gd::String &originIdentifier = resource.GetOriginIdentifier();
-  if (!originName.empty() || !originIdentifier.empty()) {
-    resourceElement.AddChild("origin")
-        .SetAttribute("name", originName)
-        .SetAttribute("identifier", originIdentifier);
-  }
-  resource.SerializeTo(resourceElement);
-}
-
 void ImageResource::SetFile(const gd::String& newFile) {
   file = NormalizePathSeparator(newFile);
 }
@@ -760,20 +752,6 @@ void Model3DResource::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("file", GetFile());
 }
 
-void AtlasResource::SetFile(const gd::String& newFile) {
-  file = NormalizePathSeparator(newFile);
-}
-
-void AtlasResource::UnserializeFrom(const SerializerElement& element) {
-  SetUserAdded(element.GetBoolAttribute("userAdded"));
-  SetFile(element.GetStringAttribute("file"));
-}
-
-void AtlasResource::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("userAdded", IsUserAdded());
-  element.SetAttribute("file", GetFile());
-}
-
 ResourceFolder::ResourceFolder(const ResourceFolder& other) { Init(other); }
 
 ResourceFolder& ResourceFolder::operator=(const ResourceFolder& other) {

Core/GDCore/Project/ResourcesManager.h

@@ -373,21 +373,6 @@ class GD_CORE_API JsonResource : public Resource {
   gd::String file;
 };
 
-/**
- * \brief Describe a spine json file used by a project.
- *
- * \see Resource
- * \ingroup ResourcesManagement
- */
-class GD_CORE_API SpineResource : public JsonResource {
- public:
-  SpineResource() : JsonResource() { SetKind("spine"); };
-  virtual ~SpineResource(){};
-  virtual SpineResource* Clone() const override {
-    return new SpineResource(*this);
-  }
-};
-
 /**
  * \brief Describe a tilemap file used by a project.
  *
@@ -522,32 +507,6 @@ class GD_CORE_API Model3DResource : public Resource {
   gd::String file;
 };
 
-/**
- * \brief Describe an atlas file used by a project.
- *
- * \see Resource
- * \ingroup ResourcesManagement
- */
-class GD_CORE_API AtlasResource : public Resource {
- public:
-  AtlasResource() : Resource() { SetKind("atlas"); };
-  virtual ~AtlasResource(){};
-  virtual AtlasResource* Clone() const override {
-    return new AtlasResource(*this);
-  }
-
-  virtual const gd::String& GetFile() const override { return file; };
-  virtual void SetFile(const gd::String& newFile) override;
-
-  virtual bool UseFile() const override { return true; }
-  void SerializeTo(SerializerElement& element) const override;
-
-  void UnserializeFrom(const SerializerElement& element) override;
-
- private:
-  gd::String file;
-};
-
 /**
  * \brief Inventory all resources used by a project
  *
@@ -703,11 +662,6 @@ class GD_CORE_API ResourcesManager {
    */
   void SerializeTo(SerializerElement& element) const;
 
-  /**
-   * \brief Serialize one resource.
-   */
-  static void SerializeResourceTo(gd::Resource& resource, SerializerElement& resourceElement);
-
   /**
    * \brief Unserialize the object.
    */

Core/GDCore/String.cpp

@@ -403,11 +403,6 @@ String String::LowerCase() const
     return lowerCasedStr;
 }
 
-String String::CapitalizeFirstLetter() const
-{
-  return size() < 1 ? *this : substr(0, 1).UpperCase() + substr(1);
-}
-
 String String::FindAndReplace(String search, String replacement, bool all) const
 {
     gd::String result(*this);

Core/GDCore/String.h

@@ -522,11 +522,6 @@ public:
      */
     String LowerCase() const;
 
-    /**
-     * \brief Returns the string with the first letter in upper case.
-     */
-    String CapitalizeFirstLetter() const;
-
     /**
      * \brief Searches a string for a specified substring and returns a new string where all occurrences of this substring is replaced.
      * \param search The string that will be replaced by the new string.

Core/tests/DummyPlatform.cpp

@@ -489,7 +489,7 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
                           "Effect",
                           _("Apply visual effects to objects."),
                           "",
-                          "res/actions/effect_black.svg", "EffectBehavior",
+                          "res/actions/effect24.png", "EffectBehavior",
                           std::make_shared<gd::Behavior>(),
                           std::make_shared<gd::BehaviorsSharedData>())
             .SetHidden();

Core/tests/ExpressionCodeGenerator.cpp

@@ -1252,49 +1252,6 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
             "MySpriteObject.getObjectStringWith2ObjectParam(fakeObjectListOf_"
             "Object1, fakeObjectListOf_Object2) ?? \"\"");
   }
-  SECTION("Edge cases (variables with object name in objectvar parameter)") {
-    SECTION("Simple case") {
-      gd::String output = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-          codeGenerator,
-          context,
-          "objectvar", // We suppose we generate an "objectvar" parameter.
-          "MyOtherSpriteObject", // This "variable name" is the same as an object name (but this is valid).
-          "MySpriteObject" // The object owning the variable: MySpriteObject.
-          );
-
-      // This seems "obvious", but we had cases where MyOtherSpriteObject could have been interpreted as an object
-      // when the code generation is not properly recognizing "objectvar".
-      REQUIRE(output == "getVariableForObject(MySpriteObject, MyOtherSpriteObject)");
-    }
-
-    SECTION("With child variable") {
-      gd::String output = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-          codeGenerator,
-          context,
-          "objectvar", // We suppose we generate an "objectvar" parameter.
-          "MyOtherSpriteObject.Child", // This "variable name" is the same as an object name (but this is valid).
-          "MySpriteObject" // The object owning the variable: MySpriteObject.
-          );
-
-      // This seems "obvious", but we had cases where MyOtherSpriteObject could have been interpreted as an object
-      // when the code generation is not properly recognizing "objectvar".
-      REQUIRE(output == "getVariableForObject(MySpriteObject, MyOtherSpriteObject).getChild(\"Child\")");
-    }
-
-    SECTION("With child and grandchild variable") {
-      gd::String output = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-          codeGenerator,
-          context,
-          "objectvar", // We suppose we generate an "objectvar" parameter.
-          "MyOtherSpriteObject.Child.Grandchild", // This "variable name" is the same as an object name (but this is valid).
-          "MySpriteObject" // The object owning the variable: MySpriteObject.
-          );
-
-      // This seems "obvious", but we had cases where MyOtherSpriteObject could have been interpreted as an object
-      // when the code generation is not properly recognizing "objectvar".
-      REQUIRE(output == "getVariableForObject(MySpriteObject, MyOtherSpriteObject).getChild(\"Child\").getChild(\"Grandchild\")");
-    }
-  }
   SECTION("Mixed test (1)") {
     {
       auto node = parser.ParseExpression("-+-MyExtension::MouseX(,)");

Core/tests/ExpressionParser2.cpp

@@ -11,7 +11,6 @@
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariableParentFinder.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
@@ -203,23 +202,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node = parser.ParseExpression("abcd[0]");
       REQUIRE(node != nullptr);
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "No object, variable or property with this name found.");
-      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 0);
-    }
-    {
-      auto node = parser.ParseExpression("abcd[0].efg");
-      REQUIRE(node != nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -231,12 +213,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node = parser.ParseExpression("abcd.efg.hij");
       REQUIRE(node != nullptr);
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -785,12 +761,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node = parser.ParseExpression("abcd.efg.hij");
       REQUIRE(node != nullptr);
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -1524,12 +1494,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node =
           parser.ParseExpression("MyNonExistingSceneVariable");
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -1551,25 +1515,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     }
   }
 
-  SECTION("Invalid scene variables (2 levels, variable and child do not exist)") {
-    {
-      auto node =
-          parser.ParseExpression("MyNonExistingSceneVariable.MyNonExistingChild");
-
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "You must enter a number or a text, wrapped inside double quotes (example: \"Hello world\"), or a variable name.");
-    }
-  }
-
   SECTION("Valid object variables (1 level)") {
     {
       auto node =
@@ -1640,12 +1585,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node =
           parser.ParseExpression("MyNonExistingSpriteObject.MyVariable");
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -1667,21 +1606,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     }
   }
 
-  SECTION("Invalid object variables (empty variable name, extra dot)") {
-    {
-      auto node =
-          parser.ParseExpression("MySpriteObjects..");
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 2);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "A name should be entered after the dot.");
-      REQUIRE(validator.GetFatalErrors()[1]->GetMessage() ==
-              "A name should be entered after the dot.");
-    }
-  }
-
   SECTION("Invalid object variables (object group, partially existing variable)") {
     {
       auto node =
@@ -1766,42 +1690,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
               "An object variable or expression should be entered.");
     }
   }
-  SECTION("Invalid object variables (extra dot)") {
-    {
-      auto node =
-          parser.ParseExpression("MySpriteObject.MyVariable.");
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "A name should be entered after the dot.");
-    }
-  }
-  SECTION("Invalid object variables (extra dot after brackets)") {
-    {
-      auto node =
-          parser.ParseExpression("MySpriteObject.MyVariable[\"MyChild\"].");
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "A name should be entered after the dot.");
-    }
-  }
-  SECTION("Invalid object variables (extra dot before brackets)") {
-    {
-      auto node =
-          parser.ParseExpression("MySpriteObject.MyVariable.[\"MyChild\"]");
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "A name should be entered after the dot.");
-    }
-  }
 
   SECTION("Valid property") {
     gd::PropertiesContainer propertiesContainer(gd::EventsFunctionsContainer::Extension);
@@ -2268,14 +2156,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
         dynamic_cast<gd::IdentifierNode &>(*node);
     REQUIRE(identifierNode.identifierName == "MyObject");
     REQUIRE(identifierNode.childIdentifierName == "");
-
-    gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-    node->Visit(validator);
-    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.");
   }
 
   SECTION("Unfinished object function name of type string with parentheses") {
@@ -2287,14 +2167,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     REQUIRE(objectFunctionCall.objectName == "MyObject");
     REQUIRE(objectFunctionCall.functionName == "");
     REQUIRE(type == "string");
-
-    gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-    node->Visit(validator);
-    REQUIRE(validator.GetFatalErrors().size() == 2);
-    REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-          "A name should be entered after the dot.");
-    REQUIRE(validator.GetFatalErrors()[1]->GetMessage() ==
-          "Enter the name of the function to call.");
   }
 
   SECTION("Unfinished object function name of type number with parentheses") {
@@ -2321,19 +2193,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     REQUIRE(type == "number|string");
   }
 
-  SECTION("Unfinished object function/variable name with multiple dots") {
-    auto node = parser.ParseExpression("MyObject..");
-    REQUIRE(node != nullptr);
-
-    gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-    node->Visit(validator);
-    REQUIRE(validator.GetFatalErrors().size() == 2);
-    REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-          "A name should be entered after the dot.");
-    REQUIRE(validator.GetFatalErrors()[1]->GetMessage() ==
-          "A name should be entered after the dot.");
-  }
-
   SECTION("Unfinished object behavior name") {
     auto node = parser.ParseExpression("MyObject.MyBehavior::");
     REQUIRE(node != nullptr);
@@ -2342,12 +2201,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     REQUIRE(objectFunctionName.objectName == "MyObject");
     REQUIRE(objectFunctionName.objectFunctionOrBehaviorName == "MyBehavior");
     REQUIRE(objectFunctionName.behaviorFunctionName == "");
-
-    gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-    node->Visit(validator);
-    REQUIRE(validator.GetFatalErrors().size() == 1);
-    REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-          "An opening parenthesis was expected here to call a function.");
   }
 
   SECTION("Unfinished object behavior name of type string with parentheses") {
@@ -2360,12 +2213,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     REQUIRE(objectFunctionName.behaviorName == "MyBehavior");
     REQUIRE(objectFunctionName.functionName == "");
     REQUIRE(type == "string");
-
-    gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-    node->Visit(validator);
-    REQUIRE(validator.GetFatalErrors().size() == 1);
-    REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-          "Enter the name of the function to call.");
   }
 
   SECTION("Unfinished object behavior name of type number with parentheses") {
@@ -2651,8 +2498,10 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
         node->Visit(validator);
         REQUIRE(validator.GetFatalErrors().size() == 1);
 
+        // TODO: The error message could be improved
         REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-                "Enter the name of the function to call.");
+                "Cannot find an expression with this name: \nDouble "
+                "check that you've not made any typo in the name.");
         REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 0);
         REQUIRE(validator.GetFatalErrors()[0]->GetEndPosition() == 25);
       }
@@ -2960,8 +2809,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       // as ExpressionVariableOwnerFinder depends on this parameter type
       // information.
       auto node = parser.ParseExpression(
-          "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(MySpriteObject, "
-          "MyVariable, MySpriteObject2, MyVariable2)");
+          "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(MyObject1, "
+          "MyVar1, MyObject2, MyVar2)");
       REQUIRE(node != nullptr);
       auto &functionNode = dynamic_cast<gd::FunctionCallNode &>(*node);
       auto &identifierObject1Node =
@@ -2973,25 +2822,17 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto &variable2Node =
           dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[3]);
 
-      REQUIRE(identifierObject1Node.identifierName == "MySpriteObject");
-      REQUIRE(identifierObject2Node.identifierName == "MySpriteObject2");
-      REQUIRE(variable1Node.identifierName == "MyVariable");
-      REQUIRE(variable2Node.identifierName == "MyVariable2");
+      REQUIRE(identifierObject1Node.identifierName == "MyObject1");
+      REQUIRE(identifierObject2Node.identifierName == "MyObject2");
+      REQUIRE(variable1Node.identifierName == "MyVar1");
+      REQUIRE(variable2Node.identifierName == "MyVar2");
 
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, objectsContainersList, "", variable1Node);
-      REQUIRE(variable1ObjectName == "MySpriteObject");
+      REQUIRE(variable1ObjectName == "MyObject1");
       auto variable2ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, objectsContainersList, "", variable2Node);
-      REQUIRE(variable2ObjectName == "MySpriteObject2");
-
-      // Also check the ability to find the last parent of the variables:
-      auto lastParentOfVariable1Node = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, variable1Node);
-      REQUIRE(lastParentOfVariable1Node.parentVariablesContainer == &mySpriteObject.GetVariables());
-      auto lastParentOfVariable2Node = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, variable2Node);
-      REQUIRE(lastParentOfVariable2Node.parentVariablesContainer == &mySpriteObject2.GetVariables());
+      REQUIRE(variable2ObjectName == "MyObject2");
 
       gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
       node->Visit(validator);
@@ -3002,8 +2843,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
   SECTION("Valid function call with 2 object variable from the same object") {
     {
       auto node = parser.ParseExpression(
-          "MyExtension::GetStringWith1ObjectParamAnd2ObjectVarParam(MySpriteObject, "
-          "MyVariable, MyVariable2)");
+          "MyExtension::GetStringWith1ObjectParamAnd2ObjectVarParam(MyObject1, "
+          "MyVar1, MyVar2)");
       REQUIRE(node != nullptr);
       auto &functionNode = dynamic_cast<gd::FunctionCallNode &>(*node);
       auto &identifierObject1Node =
@@ -3013,24 +2854,16 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto &variable2Node =
           dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[2]);
 
-      REQUIRE(identifierObject1Node.identifierName == "MySpriteObject");
-      REQUIRE(variable1Node.identifierName == "MyVariable");
-      REQUIRE(variable2Node.identifierName == "MyVariable2");
+      REQUIRE(identifierObject1Node.identifierName == "MyObject1");
+      REQUIRE(variable1Node.identifierName == "MyVar1");
+      REQUIRE(variable2Node.identifierName == "MyVar2");
 
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, objectsContainersList, "", variable1Node);
-      REQUIRE(variable1ObjectName == "MySpriteObject");
+      REQUIRE(variable1ObjectName == "MyObject1");
       auto variable2ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, objectsContainersList, "", variable2Node);
-      REQUIRE(variable2ObjectName == "MySpriteObject");
-
-      // Also check the ability to find the last parent of the variables:
-      auto lastParentOfVariable1Node = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, variable1Node);
-      REQUIRE(lastParentOfVariable1Node.parentVariablesContainer == &mySpriteObject.GetVariables());
-      auto lastParentOfVariable2Node = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, variable2Node);
-      REQUIRE(lastParentOfVariable2Node.parentVariablesContainer == &mySpriteObject.GetVariables());
+      REQUIRE(variable2ObjectName == "MyObject1");
 
       gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
       node->Visit(validator);
@@ -3041,23 +2874,18 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
   SECTION("Valid object function call with 1 object variable from the object of the function") {
     {
       auto node = parser.ParseExpression(
-          "MySpriteObject.GetObjectVariableAsNumber(MyVariable)");
+          "MySpriteObject.GetObjectVariableAsNumber(MyVar1)");
       REQUIRE(node != nullptr);
       auto &functionNode = dynamic_cast<gd::FunctionCallNode &>(*node);
       auto &variable1Node =
           dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[0]);
 
-      REQUIRE(variable1Node.identifierName == "MyVariable");
+      REQUIRE(variable1Node.identifierName == "MyVar1");
 
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, objectsContainersList, "MySpriteObject", variable1Node);
       REQUIRE(variable1ObjectName == "MySpriteObject");
 
-      // Also check the ability to find the last parent of the variable:
-      auto lastParentOfVariable1Node = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, variable1Node);
-      REQUIRE(lastParentOfVariable1Node.parentVariablesContainer == &mySpriteObject.GetVariables());
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);
@@ -3067,24 +2895,19 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
   SECTION("Valid object function call with 1 object variable from the object of the function with a child") {
     {
       auto node = parser.ParseExpression(
-          "MySpriteObject.GetObjectVariableAsNumber(MyVariable.MyChild)");
+          "MySpriteObject.GetObjectVariableAsNumber(MyVar1.MyChild)");
       REQUIRE(node != nullptr);
       auto &functionNode = dynamic_cast<gd::FunctionCallNode &>(*node);
       auto &variable1Node =
           dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[0]);
 
-      REQUIRE(variable1Node.identifierName == "MyVariable");
+      REQUIRE(variable1Node.identifierName == "MyVar1");
       REQUIRE(variable1Node.childIdentifierName == "MyChild");
 
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, objectsContainersList, "MySpriteObject", variable1Node);
       REQUIRE(variable1ObjectName == "MySpriteObject");
 
-      // Also check the ability to find the last parent of the variable:
-      auto lastParentOfVariable1Node = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, variable1Node);
-      REQUIRE(lastParentOfVariable1Node.parentVariable == &mySpriteObject.GetVariables().Get("MyVariable"));
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);

Core/tests/ObjectAssetSerializer.cpp

@@ -1,148 +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/IDE/ObjectAssetSerializer.h"
-
-#include "DummyPlatform.h"
-#include "GDCore/CommonTools.h"
-#include "GDCore/Events/Builtin/StandardEvent.h"
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Serialization.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Project/CustomObjectConfiguration.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/Variable.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Tools/SystemStats.h"
-#include "GDCore/Tools/VersionWrapper.h"
-#include "catch.hpp"
-#include <string>
-
-using namespace gd;
-
-TEST_CASE("ObjectAssetSerializer", "[common]") {
-
-  SECTION("Can serialize custom objects as assets") {
-    gd::Platform platform;
-    gd::Project project;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &eventsExtension =
-        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
-    auto &eventsBasedObject = eventsExtension.GetEventsBasedObjects().InsertNew(
-        "MyEventsBasedObject", 0);
-    eventsBasedObject.SetFullName("My events based object");
-    eventsBasedObject.SetDescription("An events based object for test");
-    eventsBasedObject.InsertNewObject(project, "MyExtension::Sprite", "MyChild",
-                                      0);
-
-    auto &resourceManager = project.GetResourcesManager();
-    gd::ImageResource imageResource;
-    imageResource.SetName("assets/Idle.png");
-    imageResource.SetFile("assets/Idle.png");
-    imageResource.SetSmooth(true);
-    resourceManager.AddResource(imageResource);
-
-    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
-    gd::Object &object = layout.InsertNewObject(
-        project, "MyEventsExtension::MyEventsBasedObject", "MyObject", 0);
-    auto &configuration = object.GetConfiguration();
-    auto *customObjectConfiguration =
-        dynamic_cast<gd::CustomObjectConfiguration *>(&configuration);
-    auto *spriteConfiguration = dynamic_cast<gd::SpriteObject *>(
-        &customObjectConfiguration->GetChildObjectConfiguration("MyChild"));
-    REQUIRE(spriteConfiguration != nullptr);
-    {
-      gd::Animation animation;
-      animation.SetName("Idle");
-      animation.SetDirectionsCount(1);
-      auto &direction = animation.GetDirection(0);
-      gd::Sprite frame;
-      frame.SetImageName("assets/Idle.png");
-      direction.AddSprite(frame);
-
-      spriteConfiguration->AddAnimation(animation);
-    }
-
-    SerializerElement assetElement;
-    std::map<gd::String, gd::String> resourcesFileNameMap;
-    ObjectAssetSerializer::SerializeTo(project, object, "My Object",
-                                       assetElement, resourcesFileNameMap);
-
-    // This mapping is used to copy resource files.
-    REQUIRE(resourcesFileNameMap.find("assets/Idle.png") !=
-            resourcesFileNameMap.end());
-    REQUIRE(resourcesFileNameMap["assets/Idle.png"] == "Idle.png");
-
-    // Check that the project is left untouched.
-    REQUIRE(resourceManager.HasResource("assets/Idle.png"));
-    REQUIRE(resourceManager.GetResource("assets/Idle.png").GetFile() ==
-            "assets/Idle.png");
-    REQUIRE(!resourceManager.HasResource("Idle.png"));
-
-    REQUIRE(assetElement.HasChild("objectAssets"));
-    auto &objectAssetsElement = assetElement.GetChild("objectAssets");
-    objectAssetsElement.ConsiderAsArrayOf("objectAsset");
-    REQUIRE(objectAssetsElement.GetChildrenCount() == 1);
-    auto &objectAssetElement = objectAssetsElement.GetChild(0);
-
-    REQUIRE(objectAssetElement.HasChild("requiredExtensions"));
-    auto &requiredExtensionsElement =
-        objectAssetElement.GetChild("requiredExtensions");
-    requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
-    REQUIRE(requiredExtensionsElement.GetChildrenCount() == 1);
-    auto &requiredExtensionElement = requiredExtensionsElement.GetChild(0);
-    REQUIRE(requiredExtensionElement.GetStringAttribute("extensionName") ==
-            "MyEventsExtension");
-
-    // Resources are renamed according to asset script naming conventions.
-    REQUIRE(objectAssetElement.HasChild("resources"));
-    auto &resourcesElement = objectAssetElement.GetChild("resources");
-    resourcesElement.ConsiderAsArrayOf("resource");
-    REQUIRE(resourcesElement.GetChildrenCount() == 1);
-    {
-      auto &resourceElement = resourcesElement.GetChild(0);
-      REQUIRE(resourceElement.GetStringAttribute("name") == "Idle.png");
-      REQUIRE(resourceElement.GetStringAttribute("file") == "Idle.png");
-      REQUIRE(resourceElement.GetStringAttribute("kind") == "image");
-      REQUIRE(resourceElement.GetBoolAttribute("smoothed") == true);
-    }
-
-    // Resources used in object configuration are updated.
-    REQUIRE(objectAssetElement.HasChild("object"));
-    auto &objectElement = objectAssetElement.GetChild("object");
-    REQUIRE(objectElement.GetStringAttribute("name") == "MyObject");
-    REQUIRE(objectElement.GetStringAttribute("type") ==
-            "MyEventsExtension::MyEventsBasedObject");
-    auto &childrenContentElement = objectElement.GetChild("childrenContent");
-
-    REQUIRE(childrenContentElement.HasChild("MyChild"));
-    auto &childElement = childrenContentElement.GetChild("MyChild");
-    REQUIRE(childElement.HasChild("animations"));
-    auto &animationsElement = childElement.GetChild("animations");
-    animationsElement.ConsiderAsArrayOf("animation");
-    REQUIRE(animationsElement.GetChildrenCount() == 1);
-    auto &animationElement = animationsElement.GetChild(0);
-
-    REQUIRE(animationElement.GetStringAttribute("name") == "Idle");
-    auto &directionsElement = animationElement.GetChild("directions");
-    directionsElement.ConsiderAsArrayOf("direction");
-    REQUIRE(directionsElement.GetChildrenCount() == 1);
-    auto &directionElement = directionsElement.GetChild(0);
-    auto &spritesElement = directionElement.GetChild("sprites");
-    spritesElement.ConsiderAsArrayOf("sprite");
-    REQUIRE(spritesElement.GetChildrenCount() == 1);
-    auto &spriteElement = spritesElement.GetChild(0);
-    REQUIRE(spriteElement.GetStringAttribute("image") == "Idle.png");
-  }
-}

Core/tests/PropertyFunctionGenerator.cpp

@@ -91,7 +91,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnNumber");
       REQUIRE(getterAction.GetParametersCount() == 1);
-      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "MovementAngle");
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
+              "Object.Behavior::PropertyMovementAngle()");
     }
     {
       auto &setter =
@@ -123,7 +124,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
       REQUIRE(setterAction.GetParameter(1).GetPlainString() == "Behavior");
       REQUIRE(setterAction.GetParameter(2).GetPlainString() == "=");
-      REQUIRE(setterAction.GetParameter(3).GetPlainString() == "Value");
+      REQUIRE(setterAction.GetParameter(3).GetPlainString() ==
+              "GetArgumentAsNumber(\"Value\")");
     }
   }
 
@@ -341,7 +343,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnNumber");
       REQUIRE(getterAction.GetParametersCount() == 1);
-      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "MovementAngle");
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
+              "Object.PropertyMovementAngle()");
     }
     {
       auto &setter =
@@ -372,7 +375,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterAction.GetParametersCount() == 3);
       REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
       REQUIRE(setterAction.GetParameter(1).GetPlainString() == "=");
-      REQUIRE(setterAction.GetParameter(2).GetPlainString() == "Value");
+      REQUIRE(setterAction.GetParameter(2).GetPlainString() ==
+              "GetArgumentAsNumber(\"Value\")");
     }
   }
 
@@ -574,7 +578,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnNumber");
       REQUIRE(getterAction.GetParametersCount() == 1);
-      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "MovementAngle");
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
+              "Object.Behavior::SharedPropertyMovementAngle()");
     }
     {
       auto &setter =

Core/tests/ResourcesMergingHelper.cpp

@@ -65,11 +65,11 @@ class MockFileSystem : public gd::AbstractFileSystem {
 
 TEST_CASE("ResourcesMergingHelper", "[common]") {
   SECTION("Basics") {
-    gd::Project project;
     MockFileSystem fs;
-    gd::ResourcesMergingHelper resourcesMerger(project.GetResourcesManager(), fs);
+    gd::ResourcesMergingHelper resourcesMerger(fs);
     resourcesMerger.SetBaseDirectory("/game/base/folder/");
 
+    gd::Project project;
     project.GetResourcesManager().AddResource("Image1", "/image1.png", "image");
     project.GetResourcesManager().AddResource("Image2", "image2.png", "image");
     project.GetResourcesManager().AddResource("Audio1", "audio1.png", "audio");
@@ -90,12 +90,12 @@ TEST_CASE("ResourcesMergingHelper", "[common]") {
             "FileNameFrom(MakeAbsolute(subfolder/image3.png))");
   }
   SECTION("Can preserve directories structure") {
-    gd::Project project;
     MockFileSystem fs;
-    gd::ResourcesMergingHelper resourcesMerger(project.GetResourcesManager(), fs);
+    gd::ResourcesMergingHelper resourcesMerger(fs);
     resourcesMerger.SetBaseDirectory("/game/base/folder/");
     resourcesMerger.PreserveDirectoriesStructure(true);
 
+    gd::Project project;
     project.GetResourcesManager().AddResource("Image1", "/image1.png", "image");
     project.GetResourcesManager().AddResource("Image2", "image2.png", "image");
     project.GetResourcesManager().AddResource("Audio1", "audio1.png", "audio");

Core/tests/ResourcesRenamer.cpp

@@ -15,10 +15,11 @@
 
 TEST_CASE("ResourcesRenamer", "[common]") {
   SECTION("It renames resources that are exposed") {
-    gd::Project project;
     std::map<gd::String, gd::String> renamings = {
         {"Resource1", "RenamedResource1"}};
-    gd::ResourcesRenamer resourcesRenamer(project.GetResourcesManager(), renamings);
+    gd::ResourcesRenamer resourcesRenamer(renamings);
+
+    gd::Project project;
 
     // Add "classic", plain resources.
     gd::ImageResource resource1;
@@ -44,10 +45,11 @@ TEST_CASE("ResourcesRenamer", "[common]") {
   }
 
   SECTION("It renames embedded resources") {
-    gd::Project project;
     std::map<gd::String, gd::String> renamings = {
         {"Resource1", "RenamedResource1"}};
-    gd::ResourcesRenamer resourcesRenamer(project.GetResourcesManager(), renamings);
+    gd::ResourcesRenamer resourcesRenamer(renamings);
+
+    gd::Project project;
 
     // Add "classic", plain resources.
     gd::ImageResource resource1;

Core/tests/WholeProjectRefactorer-ApplyRefactoringForVariablesContainer.cpp

@@ -201,34 +201,39 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
                                   "MyRenamedGlobalStructureVariable");
     project.GetVariables().Rename("SharedVariableName",
                                   "RenamedGlobalVariableFromASharedName");
-    auto changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project,
-            originalSerializedProjectVariables,
-            project.GetVariables());
+    auto changeset = gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+        project,
+        originalSerializedProjectVariables,
+        project.GetVariables());
     gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, project.GetVariables(), changeset);
+        project,
+        project.GetVariables(),
+        changeset);
 
     layout1.GetVariables().Rename("MySceneVariable", "MyRenamedSceneVariable");
     layout1.GetVariables().Rename("MySceneStructureVariable",
                                   "MyRenamedSceneStructureVariable");
-    changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project, originalSerializedLayoutVariables, layout1.GetVariables());
+    changeset = gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+        project,
+        originalSerializedLayoutVariables,
+        layout1.GetVariables());
     gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, layout1.GetVariables(), changeset);
+        project,
+        layout1.GetVariables(),
+        changeset);
 
     object1.GetVariables().Rename("MyObjectVariable",
                                   "MyRenamedObjectVariable");
     object1.GetVariables().Rename("MyObjectStructureVariable",
                                   "MyRenamedObjectStructureVariable");
-    changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project,
-            originalSerializedObject1Variables,
-            object1.GetVariables());
+    changeset = gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+        project,
+        originalSerializedObject1Variables,
+        object1.GetVariables());
     gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object1.GetVariables(), changeset);
+        project,
+        object1.GetVariables(),
+        changeset);
 
     // Check the first layout is updated.
     // clang-format off
@@ -324,182 +329,6 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
               gd::Serializer::ToJSON(originalSerializedLayout2));
     }
   }
-
-  SECTION("Variable renamed (object group)") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-    auto &layout1 = project.InsertNewLayout("Layout1", 0);
-    gd::StandardEvent &event =
-        dynamic_cast<gd::StandardEvent &>(layout1.GetEvents().InsertNewEvent(
-            project, "BuiltinCommonInstructions::Standard"));
-    gd::RepeatEvent &repeatEvent =
-        dynamic_cast<gd::RepeatEvent &>(layout1.GetEvents().InsertNewEvent(
-            project, "BuiltinCommonInstructions::Repeat"));
-
-    // Declare variables in objects.
-    auto &object1 =
-        layout1.InsertNewObject(project, "MyExtension::Sprite", "Object1", 0);
-    object1.GetVariables().InsertNew("MyObjectVariable");
-    object1.GetVariables()
-        .InsertNew("MyObjectStructureVariable")
-        .GetChild("MyChild")
-        .SetValue(123);
-    auto &object2 =
-        layout1.InsertNewObject(project, "MyExtension::Sprite", "Object2", 0);
-    object2.GetVariables().InsertNew("MyObjectVariable");
-    object2.GetVariables()
-        .InsertNew("MyObjectStructureVariable")
-        .GetChild("MyChild")
-        .SetValue(123);
-
-    auto& group = layout1.GetObjectGroups().InsertNew("MyObjectGroup");
-    group.AddObject("Object1");
-    group.AddObject("Object2");
-
-    // Create an event using the variables.
-    // clang-format off
-    {
-      gd::Instruction action;
-      action.SetType("MyExtension::DoSomething");
-      action.SetParametersCount(1);
-      action.SetParameter(
-          0,
-          gd::Expression(
-              "1 + "
-              "Object1.MyObjectVariable + "
-              "Object2.MyObjectVariable + "
-              "MyObjectGroup.MyObjectVariable + "
-              "Object1.MyObjectStructureVariable.MyChild + "
-              "Object2.MyObjectStructureVariable.MyChild + "
-              "MyObjectGroup.MyObjectStructureVariable.MyChild"));
-      event.GetActions().Insert(action);
-    }
-    // Expressions with "old" "scenevar", "globalvar", "objectvar":
-    {
-      gd::Instruction action;
-      action.SetType("MyExtension::DoSomething");
-      action.SetParametersCount(1);
-      action.SetParameter(
-          0,
-          gd::Expression(
-              // "objectvar" (in a free expression):
-              "1 + "
-              "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object1, MyObjectVariable, Object2, MyObjectVariable) + "
-              "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(MyObjectGroup, MyObjectVariable, MyObjectGroup, MyObjectVariable) + "
-              "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object1, MyObjectStructureVariable.MyChild, Object2, MyObjectStructureVariable.MyChild) + "
-              "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(MyObjectGroup, MyObjectStructureVariable.MyChild, MyObjectGroup, MyObjectStructureVariable.MyChild) + "
-              // "objectvar" (using the name of the object being called):
-              "Object1.GetObjectVariableAsNumber(MyObjectVariable) + "
-              "Object2.GetObjectVariableAsNumber(MyObjectVariable) + "
-              "MyObjectGroup.GetObjectVariableAsNumber(MyObjectVariable) + "
-              "Object1.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild) + "
-              "Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild) + "
-              "MyObjectGroup.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild) + "
-              "Object1.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild.GrandChild) + "
-              "Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild.GrandChild) + "
-              "MyObjectGroup.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild.GrandChild)"));
-      event.GetActions().Insert(action);
-    }
-    {
-      gd::Instruction action;
-      action.SetType("MyExtension::DoSomethingWithLegacyPreScopedVariables");
-      action.SetParametersCount(4);
-      action.SetParameter(0, gd::Expression("MySceneVariable"));
-      action.SetParameter(1, gd::Expression("MyGlobalVariable"));
-      action.SetParameter(2, gd::Expression("MyObjectGroup"));
-      action.SetParameter(3, gd::Expression("MyObjectVariable"));
-      event.GetActions().Insert(action);
-    }
-
-    repeatEvent.SetRepeatExpression("1 + Object1.MyObjectVariable + Object2.MyObjectVariable + MyObjectGroup.MyObjectVariable");
-    // clang-format on
-
-    // Do a copy of layout1 to ensure other scene is unchanged after the
-    // refactoring.
-    gd::Layout layout2 = layout1;
-    layout2.SetName("Layout2");
-    project.InsertLayout(layout2, 1);
-    gd::SerializerElement originalSerializedLayout2;
-    layout2.SerializeTo(originalSerializedLayout2);
-
-    // Do the changes and launch the refactoring.
-    project.GetVariables().ResetPersistentUuid();
-    layout1.GetVariables().ResetPersistentUuid();
-    object1.ResetPersistentUuid();
-    gd::SerializerElement originalSerializedObject1Variables;
-    object1.GetVariables().SerializeTo(originalSerializedObject1Variables);
-
-    object1.GetVariables().Rename("MyObjectVariable",
-                                  "MyRenamedObjectVariable");
-    object1.GetVariables().Rename("MyObjectStructureVariable",
-                                  "MyRenamedObjectStructureVariable");
-    auto changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project,
-            originalSerializedObject1Variables,
-            object1.GetVariables());
-    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object1.GetVariables(), changeset);
-
-    // Check the first layout is updated.
-    // clang-format off
-    {
-      // Updated direct access to variables:
-      REQUIRE(event.GetActions()[0].GetParameter(0).GetPlainString() ==
-            "1 + "
-            "Object1.MyRenamedObjectVariable + "
-            "Object2.MyObjectVariable + "
-            "MyObjectGroup.MyRenamedObjectVariable + "
-            "Object1.MyRenamedObjectStructureVariable.MyChild + "
-            "Object2.MyObjectStructureVariable.MyChild + "
-            "MyObjectGroup.MyRenamedObjectStructureVariable.MyChild"
-      );
-
-      // Updated access to variables using the legacy "pre-scoped" "scenevar",
-      // "globalvar" and "objectvar" parameters in expressions:
-      REQUIRE(event.GetActions()[1].GetParameter(0).GetPlainString() ==
-            "1 + "
-            // Multiple "objectvar" parameters in a free function:
-            "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object1, MyRenamedObjectVariable, Object2, MyObjectVariable) + "
-            "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(MyObjectGroup, MyRenamedObjectVariable, MyObjectGroup, MyRenamedObjectVariable) + "
-            // Multiple "objectvar" parameters in a free function, with child
-            // variable:
-            "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object1, MyRenamedObjectStructureVariable.MyChild, Object2, MyObjectStructureVariable.MyChild) + "
-            "MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(MyObjectGroup, MyRenamedObjectStructureVariable.MyChild, MyObjectGroup, MyRenamedObjectStructureVariable.MyChild) + "
-            // Single "objectvar" from the object being accessed:
-            "Object1.GetObjectVariableAsNumber(MyRenamedObjectVariable) + "
-            "Object2.GetObjectVariableAsNumber(MyObjectVariable) + "
-            "MyObjectGroup.GetObjectVariableAsNumber(MyRenamedObjectVariable) + "
-            // Single "objectvar" from the object being accessed, with child
-            // variales:
-            "Object1.GetObjectVariableAsNumber(MyRenamedObjectStructureVariable.MyChild) + "
-            "Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild) + "
-            "MyObjectGroup.GetObjectVariableAsNumber(MyRenamedObjectStructureVariable.MyChild) + "
-            "Object1.GetObjectVariableAsNumber(MyRenamedObjectStructureVariable.MyChild.GrandChild) + "
-            "Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild.GrandChild) + "
-            "MyObjectGroup.GetObjectVariableAsNumber(MyRenamedObjectStructureVariable.MyChild.GrandChild)");
-
-      // Updated "objectvar" parameters of an
-      // instruction:
-      REQUIRE(event.GetActions()[2].GetParameter(2).GetPlainString() ==
-              "MyObjectGroup");
-      REQUIRE(event.GetActions()[2].GetParameter(3).GetPlainString() ==
-              "MyRenamedObjectVariable");
-    }
-
-    REQUIRE(repeatEvent.GetRepeatExpression() == "1 + Object1.MyRenamedObjectVariable + Object2.MyObjectVariable + MyObjectGroup.MyRenamedObjectVariable");
-    // clang-format on
-
-    // Check the other layout is untouched.
-    {
-      gd::SerializerElement serializedLayout2;
-      layout2.SerializeTo(serializedLayout2);
-      REQUIRE(gd::Serializer::ToJSON(serializedLayout2) ==
-              gd::Serializer::ToJSON(originalSerializedLayout2));
-    }
-  }
-
   SECTION("Variable removed (project, layout, object)") {
     gd::Project project;
     gd::Platform platform;
@@ -666,31 +495,36 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     project.GetVariables().Remove("MyGlobalVariable");
     project.GetVariables().Remove("MyGlobalStructureVariable");
     project.GetVariables().Remove("SharedVariableName");
-    auto changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project,
-            originalSerializedProjectVariables,
-            project.GetVariables());
+    auto changeset = gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+        project,
+        originalSerializedProjectVariables,
+        project.GetVariables());
     gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, project.GetVariables(), changeset);
+        project,
+        project.GetVariables(),
+        changeset);
 
     layout1.GetVariables().Remove("MySceneVariable");
     layout1.GetVariables().Remove("MySceneStructureVariable");
-    changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project, originalSerializedLayoutVariables, layout1.GetVariables());
+    changeset = gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+        project,
+        originalSerializedLayoutVariables,
+        layout1.GetVariables());
     gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, layout1.GetVariables(), changeset);
+        project,
+        layout1.GetVariables(),
+        changeset);
 
     object1.GetVariables().Remove("MyObjectVariable");
     object1.GetVariables().Remove("MyObjectStructureVariable");
-    changeset =
-        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
-            project,
-            originalSerializedObject1Variables,
-            object1.GetVariables());
+    changeset = gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+        project,
+        originalSerializedObject1Variables,
+        object1.GetVariables());
     gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object1.GetVariables(), changeset);
+        project,
+        object1.GetVariables(),
+        changeset);
 
     // Check the first layout is updated.
     {

Core/tests/WholeProjectRefactorer.cpp

@@ -3474,72 +3474,6 @@ TEST_CASE("RenameLayer", "[common]") {
             "MyExtension::CameraCenterX(\"layerA\")");
   }
 
-  SECTION("Renaming a layer also moves the instances on this layer and of the associated external layouts") {
-    gd::Project project;
-    gd::Platform platform;
-    SetupProjectWithDummyPlatform(project, platform);
-
-    auto &layout = project.InsertNewLayout("My layout", 0);
-    auto &otherLayout = project.InsertNewLayout("My other layout", 1);
-
-    layout.InsertNewLayer("My layer", 0);
-    otherLayout.InsertNewLayer("My layer", 0);
-
-    auto &externalLayout =
-        project.InsertNewExternalLayout("My external layout", 0);
-    auto &otherExternalLayout =
-        project.InsertNewExternalLayout("My other external layout", 0);
-    externalLayout.SetAssociatedLayout("My layout");
-    otherExternalLayout.SetAssociatedLayout("My other layout");
-
-    auto &initialInstances = layout.GetInitialInstances();
-    auto &initialInstance1 = initialInstances.InsertNewInitialInstance();
-    initialInstance1.SetLayer("My layer");
-    auto &initialInstance2 = initialInstances.InsertNewInitialInstance();
-    initialInstance2.SetLayer("My layer");
-    auto &initialInstance3 = initialInstances.InsertNewInitialInstance();
-    initialInstance3.SetLayer("");
-
-    auto &externalInitialInstances = externalLayout.GetInitialInstances();
-    auto &externalInitialInstance1 = externalInitialInstances.InsertNewInitialInstance();
-    externalInitialInstance1.SetLayer("My layer");
-    auto &externalInitialInstance2 = externalInitialInstances.InsertNewInitialInstance();
-    externalInitialInstance2.SetLayer("My layer");
-    auto &externalInitialInstance3 = externalInitialInstances.InsertNewInitialInstance();
-    externalInitialInstance3.SetLayer("");
-
-    auto &otherInitialInstances = otherLayout.GetInitialInstances();
-    auto &otherInitialInstance1 = otherInitialInstances.InsertNewInitialInstance();
-    otherInitialInstance1.SetLayer("My layer");
-
-    auto &otherExternalInitialInstances = otherExternalLayout.GetInitialInstances();
-    auto &otherExternalInitialInstance1 = otherExternalInitialInstances.InsertNewInitialInstance();
-    otherExternalInitialInstance1.SetLayer("My layer");
-
-    REQUIRE(initialInstance1.GetLayer() == "My layer");
-    REQUIRE(initialInstance2.GetLayer() == "My layer");
-    REQUIRE(initialInstance3.GetLayer() == "");
-    REQUIRE(externalInitialInstance1.GetLayer() == "My layer");
-    REQUIRE(externalInitialInstance2.GetLayer() == "My layer");
-    REQUIRE(externalInitialInstance3.GetLayer() == "");
-    REQUIRE(otherInitialInstance1.GetLayer() == "My layer");
-    REQUIRE(otherExternalInitialInstance1.GetLayer() == "My layer");
-
-    gd::WholeProjectRefactorer::RenameLayer(project, layout, "My layer", "My new layer");
-
-    // Instances on the renamed layer are moved to the new layer.
-    REQUIRE(initialInstance1.GetLayer() == "My new layer");
-    REQUIRE(initialInstance2.GetLayer() == "My new layer");
-    REQUIRE(initialInstance3.GetLayer() == "");
-    // Instances on the renamed layer of external layouts are moved to the new layer.
-    REQUIRE(externalInitialInstance1.GetLayer() == "My new layer");
-    REQUIRE(externalInitialInstance2.GetLayer() == "My new layer");
-    REQUIRE(externalInitialInstance3.GetLayer() == "");
-    // Instances on the renamed layer of other layouts & external layouts are not moved.
-    REQUIRE(otherInitialInstance1.GetLayer() == "My layer");
-    REQUIRE(otherExternalInitialInstance1.GetLayer() == "My layer");
-  }
-
   SECTION("Can rename a layer when a layer parameter is empty") {
     gd::Project project;
     gd::Platform platform;

Core/tests/catch.hpp

@@ -5398,10 +5398,12 @@ class Runner {
     getRegistryHub().getTestCaseRegistry().getFilteredTests(
         testSpec, *m_config, testCases);
 
+    int testsRunForGroup = 0;
     for (std::vector<TestCase>::const_iterator it = testCases.begin(),
                                                itEnd = testCases.end();
          it != itEnd;
          ++it) {
+      testsRunForGroup++;
       if (m_testsAlreadyRun.find(*it) == m_testsAlreadyRun.end()) {
         if (context.aborting()) break;
 

Extensions/.gitignore

@@ -1 +0,0 @@
-Spine/pixi-spine

Extensions/3D/AmbientLight.ts

@@ -61,30 +61,13 @@ namespace gdjs {
               this.light.intensity = value;
             }
           }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'intensity') {
-              return this.light.intensity;
-            }
-            return 0;
-          }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'color') {
-              this.light.color.setHex(
+              this.light.color = new THREE.Color(
                 gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value)
               );
             }
           }
-          updateColorParameter(parameterName: string, value: number): void {
-            if (parameterName === 'color') {
-              this.light.color.setHex(value);
-            }
-          }
-          getColorParameter(parameterName: string): number {
-            if (parameterName === 'color') {
-              return this.light.color.getHex();
-            }
-            return 0;
-          }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
         })();
       }

Extensions/3D/DirectionalLight.ts

@@ -74,16 +74,6 @@ namespace gdjs {
               this.updateRotation();
             }
           }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'intensity') {
-              return this.light.intensity;
-            } else if (parameterName === 'elevation') {
-              return this.elevation;
-            } else if (parameterName === 'rotation') {
-              return this.rotation;
-            }
-            return 0;
-          }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'color') {
               this.light.color = new THREE.Color(
@@ -95,17 +85,6 @@ namespace gdjs {
               this.updateRotation();
             }
           }
-          updateColorParameter(parameterName: string, value: number): void {
-            if (parameterName === 'color') {
-              this.light.color.setHex(value);
-            }
-          }
-          getColorParameter(parameterName: string): number {
-            if (parameterName === 'color') {
-              return this.light.color.getHex();
-            }
-            return 0;
-          }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
           updateRotation() {
             if (this.top === 'Z+') {
@@ -114,7 +93,7 @@ namespace gdjs {
               this.rotationObject.rotation.y = -gdjs.toRad(this.elevation);
             } else {
               // 0° becomes a light from Z+.
-              this.rotationObject.rotation.y = gdjs.toRad(this.rotation - 90);
+              this.rotationObject.rotation.y = gdjs.toRad(this.rotation) - 90;
               this.rotationObject.rotation.z = -gdjs.toRad(this.elevation);
             }
           }

Extensions/3D/ExponentialFog.ts

@@ -58,12 +58,6 @@ namespace gdjs {
               this.fog.density = value;
             }
           }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'density') {
-              return this.fog.density;
-            }
-            return 0;
-          }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'color') {
               this.fog.color = new THREE.Color(
@@ -71,17 +65,6 @@ namespace gdjs {
               );
             }
           }
-          updateColorParameter(parameterName: string, value: number): void {
-            if (parameterName === 'color') {
-              this.fog.color.setHex(value);
-            }
-          }
-          getColorParameter(parameterName: string): number {
-            if (parameterName === 'color') {
-              return this.fog.color.getHex();
-            }
-            return 0;
-          }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
         })();
       }

Extensions/3D/HemisphereLight.ts

@@ -74,16 +74,6 @@ namespace gdjs {
               this.updateRotation();
             }
           }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'intensity') {
-              return this.light.intensity;
-            } else if (parameterName === 'elevation') {
-              return this.elevation;
-            } else if (parameterName === 'rotation') {
-              return this.rotation;
-            }
-            return 0;
-          }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'skyColor') {
               this.light.color = new THREE.Color(
@@ -100,23 +90,6 @@ namespace gdjs {
               this.updateRotation();
             }
           }
-          updateColorParameter(parameterName: string, value: number): void {
-            if (parameterName === 'skyColor') {
-              this.light.color.setHex(value);
-            }
-            if (parameterName === 'groundColor') {
-              this.light.groundColor.setHex(value);
-            }
-          }
-          getColorParameter(parameterName: string): number {
-            if (parameterName === 'skyColor') {
-              return this.light.color.getHex();
-            }
-            if (parameterName === 'groundColor') {
-              return this.light.groundColor.getHex();
-            }
-            return 0;
-          }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
           updateRotation() {
             if (this.top === 'Z+') {
@@ -125,7 +98,7 @@ namespace gdjs {
               this.rotationObject.rotation.y = -gdjs.toRad(this.elevation);
             } else {
               // 0° becomes a light from Z+.
-              this.rotationObject.rotation.y = gdjs.toRad(this.rotation - 90);
+              this.rotationObject.rotation.y = gdjs.toRad(this.rotation) - 90;
               this.rotationObject.rotation.z = -gdjs.toRad(this.elevation);
             }
           }

Extensions/3D/JsExtension.js

@@ -39,18 +39,16 @@ module.exports = {
       .setIcon('res/conditions/3d_box.svg');
 
     {
-      const base3D = extension
-        .addBehavior(
-          'Base3DBehavior',
-          _('3D capability'),
-          'Object3D',
-          _('Move the object in 3D space.'),
-          '',
-          'res/conditions/3d_box.svg',
-          'Base3DBehavior',
+      const base3D = extension.addBehavior(
+          "Base3DBehavior",
+          _("3D capability"),
+          "Object3D",
+          _("Move the object in 3D space."),
+          "",
+          "res/conditions/3d_box.svg",
+          "Base3DBehavior",
           new gd.Behavior(),
-          new gd.BehaviorsSharedData()
-        )
+          new gd.BehaviorsSharedData())
         .setHidden()
         .setIncludeFile('Extensions/3D/Base3DBehavior.js');
 
@@ -64,12 +62,12 @@ module.exports = {
           _('Position'),
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setZ')
         .setGetter('getZ');
-
+    
       base3D
         .addExpressionAndConditionAndAction(
           'number',
@@ -80,7 +78,7 @@ module.exports = {
           _('Position/Center'),
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
+        .addParameter('object', _('3D object'))
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setCenterZInScene')
@@ -96,24 +94,24 @@ module.exports = {
           _('Size'),
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setDepth')
         .setGetter('getDepth');
 
-      base3D
+        base3D
         .addExpressionAndConditionAndAction(
           'number',
           'ScaleZ',
           _('Scale on Z axis'),
-          _('the scale on Z axis of an object (default scale is 1)'),
-          _('the scale on Z axis scale'),
+          _("the scale on Z axis of an object (default scale is 1)"),
+          _("the scale on Z axis scale"),
           _('Size'),
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters(
           'number',
           gd.ParameterOptions.makeNewOptions().setDescription(
@@ -124,7 +122,7 @@ module.exports = {
         .setFunctionName('setScaleZ')
         .setGetter('getScaleZ');
 
-      base3D
+        base3D
         .addScopedAction(
           'FlipZ',
           _('Flip the object on Z'),
@@ -134,13 +132,13 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('yesorno', _('Activate flipping'))
         .markAsSimple()
         .setFunctionName('flipZ');
 
-      base3D
+        base3D
         .addScopedCondition(
           'FlippedZ',
           _('Flipped on Z'),
@@ -150,11 +148,11 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .setFunctionName('isFlippedZ');
 
-      base3D
+        base3D
         .addExpressionAndConditionAndAction(
           'number',
           'RotationX',
@@ -164,13 +162,13 @@ module.exports = {
           _('Angle'),
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationX')
         .setGetter('getRotationX');
 
-      base3D
+        base3D
         .addExpressionAndConditionAndAction(
           'number',
           'RotationY',
@@ -180,13 +178,13 @@ module.exports = {
           _('Angle'),
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationY')
         .setGetter('getRotationY');
 
-      base3D
+        base3D
         .addScopedAction(
           'TurnAroundX',
           _('Turn around X axis'),
@@ -198,13 +196,13 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundX');
 
-      base3D
+        base3D
         .addScopedAction(
           'TurnAroundY',
           _('Turn around Y axis'),
@@ -216,13 +214,13 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundY');
 
-      base3D
+        base3D
         .addScopedAction(
           'TurnAroundZ',
           _('Turn around Z axis'),
@@ -234,8 +232,8 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter('object', _('3D object'))
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundZ');
@@ -247,11 +245,11 @@ module.exports = {
           'Model3DObject',
           _('3D Model'),
           _('An animated 3D model.'),
-          'JsPlatform/Extensions/3d_model.svg',
+          'JsPlatform/Extensions/3d_box.svg',
           new gd.Model3DObjectConfiguration()
         )
         .setCategoryFullName(_('General'))
-        // Effects are unsupported because the object is not rendered with PIXI.
+         // Effects are unsupported because the object is not rendered with PIXI.
         .addDefaultBehavior('ResizableCapability::ResizableBehavior')
         .addDefaultBehavior('ScalableCapability::ScalableBehavior')
         .addDefaultBehavior('FlippableCapability::FlippableBehavior')
@@ -282,6 +280,7 @@ module.exports = {
         .setFunctionName('setZ')
         .setGetter('getZ');
 
+      
       // Deprecated
       object
         .addExpressionAndConditionAndAction(
@@ -501,7 +500,7 @@ module.exports = {
           'res/actions/flipX24.png',
           'res/actions/flipX.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .addParameter('yesorno', _('Activate flipping'))
         .setHidden()
         .markAsSimple()
@@ -518,7 +517,7 @@ module.exports = {
           'res/actions/flipY24.png',
           'res/actions/flipY.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .addParameter('yesorno', _('Activate flipping'))
         .setHidden()
         .markAsSimple()
@@ -535,7 +534,7 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .addParameter('yesorno', _('Activate flipping'))
         .markAsSimple()
         .setHidden()
@@ -552,7 +551,7 @@ module.exports = {
           'res/actions/flipX24.png',
           'res/actions/flipX.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .setHidden()
         .setFunctionName('isFlippedX');
 
@@ -567,7 +566,7 @@ module.exports = {
           'res/actions/flipY24.png',
           'res/actions/flipY.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .setHidden()
         .setFunctionName('isFlippedY');
 
@@ -582,7 +581,7 @@ module.exports = {
           'res/conditions/3d_box.svg',
           'res/conditions/3d_box.svg'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .setHidden()
         .setFunctionName('isFlippedZ');
 
@@ -690,7 +689,7 @@ module.exports = {
           _('Animations and images'),
           'res/actions/animation24.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .markAsSimple()
         .setHidden()
@@ -708,7 +707,7 @@ module.exports = {
           _('Animations and images'),
           'res/actions/animation24.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .useStandardParameters(
           'objectAnimationName',
           gd.ParameterOptions.makeNewOptions().setDescription(
@@ -731,7 +730,7 @@ module.exports = {
           'res/actions/animation24.png',
           'res/actions/animation.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .markAsSimple()
         .setHidden()
         .setFunctionName('pauseAnimation');
@@ -747,7 +746,7 @@ module.exports = {
           'res/actions/animation24.png',
           'res/actions/animation.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .markAsSimple()
         .setHidden()
         .setFunctionName('resumeAnimation');
@@ -765,7 +764,7 @@ module.exports = {
           _('Animations and images'),
           'res/actions/animation24.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .useStandardParameters(
           'number',
           gd.ParameterOptions.makeNewOptions().setDescription(_('Speed scale'))
@@ -786,7 +785,7 @@ module.exports = {
           'res/conditions/animation24.png',
           'res/conditions/animation.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .markAsSimple()
         .setHidden()
         .setFunctionName('isAnimationPaused');
@@ -804,7 +803,7 @@ module.exports = {
           'res/conditions/animation24.png',
           'res/conditions/animation.png'
         )
-        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('object', _('3D model'), 'Model3DObject')
         .markAsSimple()
         .setHidden()
         .setFunctionName('hasAnimationEnded');
@@ -1162,7 +1161,7 @@ module.exports = {
       .setFunctionName('setZ')
       .setGetter('getZ');
 
-    // Deprecated
+      // Deprecated
     object
       .addExpressionAndConditionAndAction(
         'number',
@@ -1307,7 +1306,7 @@ module.exports = {
       .setFunctionName('setScaleX')
       .setGetter('getScaleX');
 
-    // Deprecated
+      // Deprecated
     object
       .addExpressionAndConditionAndAction(
         'number',
@@ -1364,7 +1363,7 @@ module.exports = {
         'res/actions/flipX24.png',
         'res/actions/flipX.png'
       )
-      .addParameter('object', _('3D cube'), 'Cube3DObject', false)
+      .addParameter('object', _('3D cube'), 'Cube3DObject')
       .addParameter('yesorno', _('Activate flipping'))
       .markAsSimple()
       .setHidden()
@@ -1381,7 +1380,7 @@ module.exports = {
         'res/actions/flipY24.png',
         'res/actions/flipY.png'
       )
-      .addParameter('object', _('3D cube'), 'Cube3DObject', false)
+      .addParameter('object', _('3D cube'), 'Cube3DObject')
       .addParameter('yesorno', _('Activate flipping'))
       .markAsSimple()
       .setHidden()
@@ -1398,7 +1397,7 @@ module.exports = {
         'res/conditions/3d_box.svg',
         'res/conditions/3d_box.svg'
       )
-      .addParameter('object', _('3D cube'), 'Cube3DObject', false)
+      .addParameter('object', _('3D cube'), 'Cube3DObject')
       .addParameter('yesorno', _('Activate flipping'))
       .markAsSimple()
       .setHidden()
@@ -1415,7 +1414,7 @@ module.exports = {
         'res/actions/flipX24.png',
         'res/actions/flipX.png'
       )
-      .addParameter('object', _('3D cube'), 'Cube3DObject', false)
+      .addParameter('object', _('3D cube'), 'Cube3DObject')
       .setHidden()
       .setFunctionName('isFlippedX');
 
@@ -1430,7 +1429,7 @@ module.exports = {
         'res/actions/flipY24.png',
         'res/actions/flipY.png'
       )
-      .addParameter('object', _('3D cube'), 'Cube3DObject', false)
+      .addParameter('object', _('3D cube'), 'Cube3DObject')
       .setHidden()
       .setFunctionName('isFlippedY');
 
@@ -1445,7 +1444,7 @@ module.exports = {
         'res/conditions/3d_box.svg',
         'res/conditions/3d_box.svg'
       )
-      .addParameter('object', _('3D cube'), 'Cube3DObject', false)
+      .addParameter('object', _('3D cube'), 'Cube3DObject')
       .setHidden()
       .setFunctionName('isFlippedZ');
 
@@ -1665,7 +1664,7 @@ module.exports = {
           'Change the camera rotation to look at an object. The camera top always face the screen.'
         ),
         _('Change the camera rotation of _PARAM2_ to look at _PARAM1_'),
-        _("Layers and cameras"),
+        '',
         'res/conditions/3d_box.svg',
         'res/conditions/3d_box.svg'
       )
@@ -2099,12 +2098,6 @@ module.exports = {
         this.updateTexture();
       }
 
-      onRemovedFromScene() {
-        super.onRemovedFromScene();
-        // Keep textures because they are shared by all sprites.
-        this._pixiObject.destroy({ children: true });
-      }
-
       static _getResourceNameToDisplay(objectConfiguration) {
         return getFirstVisibleFaceResourceName(objectConfiguration);
       }
@@ -2169,18 +2162,17 @@ module.exports = {
       updatePIXISprite() {
         const width = this.getWidth();
         const height = this.getHeight();
-        const objectTextureFrame = this._pixiTexturedObject.texture.frame;
-        // In case the texture is not loaded yet, we don't want to crash.
-        if (!objectTextureFrame) return;
 
         this._pixiTexturedObject.anchor.x =
-          this._centerX / objectTextureFrame.width;
+          this._centerX / this._pixiTexturedObject.texture.frame.width;
         this._pixiTexturedObject.anchor.y =
-          this._centerY / objectTextureFrame.height;
+          this._centerY / this._pixiTexturedObject.texture.frame.height;
 
         this._pixiTexturedObject.angle = this._instance.getAngle();
-        this._pixiTexturedObject.scale.x = width / objectTextureFrame.width;
-        this._pixiTexturedObject.scale.y = height / objectTextureFrame.height;
+        this._pixiTexturedObject.scale.x =
+          width / this._pixiTexturedObject.texture.frame.width;
+        this._pixiTexturedObject.scale.y =
+          height / this._pixiTexturedObject.texture.frame.height;
 
         this._pixiTexturedObject.position.x =
           this._instance.getX() +
@@ -2689,13 +2681,8 @@ module.exports = {
           });
       }
 
-      onRemovedFromScene() {
-        super.onRemovedFromScene();
-        this._pixiObject.destroy({ children: true });
-      }
-
       static getThumbnail(project, resourcesLoader, objectConfiguration) {
-        return 'JsPlatform/Extensions/3d_model.svg';
+        return 'JsPlatform/Extensions/3d_box.svg';
       }
 
       getOriginX() {
@@ -2736,9 +2723,6 @@ module.exports = {
         originalDepth,
         keepAspectRatio
       ) {
-        // These formulas are also used in:
-        // - gdjs.Model3DRuntimeObject3DRenderer._updateDefaultTransformation
-        // - Model3DEditor.modelSize
         threeObject.rotation.set(
           (rotationX * Math.PI) / 180,
           (rotationY * Math.PI) / 180,

Extensions/3D/LinearFog.ts

@@ -60,14 +60,6 @@ namespace gdjs {
               this.fog.far = value;
             }
           }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'near') {
-              return this.fog.near;
-            } else if (parameterName === 'far') {
-              return this.fog.far;
-            }
-            return 0;
-          }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'color') {
               this.fog.color = new THREE.Color(
@@ -75,17 +67,6 @@ namespace gdjs {
               );
             }
           }
-          updateColorParameter(parameterName: string, value: number): void {
-            if (parameterName === 'color') {
-              this.fog.color.setHex(value);
-            }
-          }
-          getColorParameter(parameterName: string): number {
-            if (parameterName === 'color') {
-              return this.fog.color.getHex();
-            }
-            return 0;
-          }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
         })();
       }

Extensions/3D/Model3DRuntimeObject3DRenderer.ts

@@ -147,9 +147,6 @@ namespace gdjs {
       originalDepth: float,
       keepAspectRatio: boolean
     ) {
-      // These formulas are also used in:
-      // - Model3DEditor.modelSize
-      // - Model3DRendered2DInstance
       threeObject.rotation.set(
         gdjs.toRad(rotationX),
         gdjs.toRad(rotationY),

Extensions/3D/Scene3DTools.ts

@@ -11,12 +11,7 @@ namespace gdjs {
         const layer = runtimeScene.getLayer(layerName);
         const layerRenderer = layer.getRenderer();
         const threeCamera = layerRenderer.getThreeCamera();
-        const fov =
-          threeCamera instanceof THREE.OrthographicCamera
-            ? null
-            : threeCamera
-            ? threeCamera.fov
-            : assumedFovIn2D;
+        const fov = threeCamera ? threeCamera.fov : assumedFovIn2D;
         return layer.getCameraZ(fov, cameraIndex);
       };
 
@@ -29,12 +24,7 @@ namespace gdjs {
         const layer = runtimeScene.getLayer(layerName);
         const layerRenderer = layer.getRenderer();
         const threeCamera = layerRenderer.getThreeCamera();
-        const fov =
-          threeCamera instanceof THREE.OrthographicCamera
-            ? null
-            : threeCamera
-            ? threeCamera.fov
-            : assumedFovIn2D;
+        const fov = threeCamera ? threeCamera.fov : assumedFovIn2D;
         layer.setCameraZ(z, fov, cameraIndex);
       };
 
@@ -96,13 +86,11 @@ namespace gdjs {
 
       export const turnCameraTowardObject = (
         runtimeScene: RuntimeScene,
-        object: gdjs.RuntimeObject | null,
+        object: gdjs.RuntimeObject,
         layerName: string,
         cameraIndex: integer,
         isStandingOnY: boolean
       ) => {
-        if (!object) return;
-
         const layer = runtimeScene.getLayer(layerName);
         const layerRenderer = layer.getRenderer();
 
@@ -223,10 +211,8 @@ namespace gdjs {
         const layerRenderer = layer.getRenderer();
 
         const threeCamera = layerRenderer.getThreeCamera();
-        if (!threeCamera) return assumedFovIn2D;
-        return threeCamera instanceof THREE.OrthographicCamera
-          ? 0
-          : threeCamera.fov;
+        if (!threeCamera) return 45;
+        return threeCamera.fov;
       };
 
       export const setFov = (
@@ -239,8 +225,7 @@ namespace gdjs {
         const layerRenderer = layer.getRenderer();
 
         const threeCamera = layerRenderer.getThreeCamera();
-        if (!threeCamera || threeCamera instanceof THREE.OrthographicCamera)
-          return;
+        if (!threeCamera) return;
 
         threeCamera.fov = Math.min(Math.max(angle, 0), 180);
         layerRenderer.setThreeCameraDirty(true);

Extensions/AdvancedWindow/JsExtension.js

@@ -36,7 +36,7 @@ module.exports = {
     extension
       .addAction(
         'Focus',
-        _('Window focus'),
+        _('Change focus of the window'),
         _('Make the window gain or lose focus.'),
         _('Focus the window: _PARAM0_'),
         _('Windows, Linux, macOS'),
@@ -72,7 +72,7 @@ module.exports = {
     extension
       .addAction(
         'Show',
-        _('Window visibility'),
+        _('Change visibility of the window'),
         _('Make the window visible or invisible.'),
         _('Window visible: _PARAM0_'),
         _('Windows, Linux, macOS'),
@@ -624,7 +624,7 @@ module.exports = {
     extension
       .addAction(
         'SetOpacity',
-        _('Window opacity'),
+        _('Set window opacity'),
         _('Changes the window opacity.'),
         _('Set the window opacity to _PARAM0_'),
         _('Windows, Linux, macOS'),
@@ -645,7 +645,7 @@ module.exports = {
     extension
       .addAction(
         'SetWindowPosition',
-        _('Window position'),
+        _('Set window position'),
         _('Changes the window position.'),
         _('Set the window position to _PARAM0_;_PARAM1_'),
         _('Windows, Linux, macOS'),

Extensions/AnchorBehavior/tests/anchorruntimebehavior.spec.js

@@ -30,7 +30,6 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
     behaviorsSharedData: [],
     objects: [],
     instances: [],
-    usedResources: [],
   });
 
   function createObject(behaviorProperties) {

Extensions/CMakeLists.txt

@@ -26,7 +26,6 @@ set(
 	TextEntryObject
 	TextObject
 	TiledSpriteObject
-	Spine
 	TopDownMovementBehavior)
 
 # Automatically add all listed extensions

Extensions/DestroyOutsideBehavior/Extension.cpp

@@ -41,7 +41,7 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
                    _("Compare the additional border that the object must cross "
                      "before being deleted."),
                    _("the additional border"),
-                   _("Destroy outside configuration"),
+                   "",
                    "CppPlatform/Extensions/destroyoutsideicon24.png",
                    "CppPlatform/Extensions/destroyoutsideicon16.png")
       .AddParameter("object", _("Object"))
@@ -56,7 +56,7 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
                 _("Change the additional border that the object must cross "
                   "before being deleted."),
                 _("the additional border"),
-                _("Destroy outside configuration"),
+                "",
                 "CppPlatform/Extensions/destroyoutsideicon24.png",
                 "CppPlatform/Extensions/destroyoutsideicon16.png")
       .AddParameter("object", _("Object"))

Extensions/DraggableBehavior/Extension.cpp

@@ -39,7 +39,7 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
                    _("Being dragged"),
                    _("Check if the object is being dragged."),
                    _("_PARAM0_ is being dragged"),
-                   _("Draggable"),
+                   "",
                    "CppPlatform/Extensions/draggableicon24.png",
                    "CppPlatform/Extensions/draggableicon16.png")
 
@@ -51,7 +51,7 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
                    _("Was just dropped"),
                    _("Check if the object was just dropped after being dragged."),
                    _("_PARAM0_ was just dropped"),
-                   _("Draggable"),
+                   "",
                    "CppPlatform/Extensions/draggableicon24.png",
                    "CppPlatform/Extensions/draggableicon16.png")
 

Extensions/DraggableBehavior/tests/draggableruntimebehavior.spec.js

@@ -27,7 +27,6 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
     behaviorsSharedData: [],
     objects: [],
     instances: [],
-    usedResources: [],
   });
 
   var object = new gdjs.TestRuntimeObject(runtimeScene, {

Extensions/Effects/adjustment-pixi-filter.ts

@@ -31,47 +31,11 @@ namespace gdjs {
           adjustmentFilter.alpha = value;
         }
       }
-      getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
-        if (parameterName === 'gamma') {
-          return adjustmentFilter.gamma;
-        }
-        if (parameterName === 'saturation') {
-          return adjustmentFilter.saturation;
-        }
-        if (parameterName === 'contrast') {
-          return adjustmentFilter.contrast;
-        }
-        if (parameterName === 'brightness') {
-          return adjustmentFilter.brightness;
-        }
-        if (parameterName === 'red') {
-          return adjustmentFilter.red;
-        }
-        if (parameterName === 'green') {
-          return adjustmentFilter.green;
-        }
-        if (parameterName === 'blue') {
-          return adjustmentFilter.blue;
-        }
-        if (parameterName === 'alpha') {
-          return adjustmentFilter.alpha;
-        }
-        return 0;
-      }
       updateStringParameter(
         filter: PIXI.Filter,
         parameterName: string,
         value: string
       ) {}
-      updateColorParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ): void {}
-      getColorParameter(filter: PIXI.Filter, parameterName: string): number {
-        return 0;
-      }
       updateBooleanParameter(
         filter: PIXI.Filter,
         parameterName: string,

Extensions/Effects/advanced-bloom-pixi-filter.ts

@@ -27,41 +27,11 @@ namespace gdjs {
           advancedBloomFilter.padding = value;
         }
       }
-      getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
-        if (parameterName === 'threshold') {
-          return advancedBloomFilter.threshold;
-        }
-        if (parameterName === 'bloomScale') {
-          return advancedBloomFilter.bloomScale;
-        }
-        if (parameterName === 'brightness') {
-          return advancedBloomFilter.brightness;
-        }
-        if (parameterName === 'blur') {
-          return advancedBloomFilter.blur;
-        }
-        if (parameterName === 'quality') {
-          return advancedBloomFilter.quality;
-        }
-        if (parameterName === 'padding') {
-          return advancedBloomFilter.padding;
-        }
-        return 0;
-      }
       updateStringParameter(
         filter: PIXI.Filter,
         parameterName: string,
         value: string
       ) {}
-      updateColorParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ): void {}
-      getColorParameter(filter: PIXI.Filter, parameterName: string): number {
-        return 0;
-      }
       updateBooleanParameter(
         filter: PIXI.Filter,
         parameterName: string,

Extensions/Effects/ascii-pixi-filter.ts

@@ -17,26 +17,11 @@ namespace gdjs {
           asciiFilter.size = value;
         }
       }
-      getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
-        if (parameterName === 'size') {
-          return asciiFilter.size;
-        }
-        return 0;
-      }
       updateStringParameter(
         filter: PIXI.Filter,
         parameterName: string,
         value: string
       ) {}
-      updateColorParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ): void {}
-      getColorParameter(filter: PIXI.Filter, parameterName: string): number {
-        return 0;
-      }
       updateBooleanParameter(
         filter: PIXI.Filter,
         parameterName: string,

Extensions/Effects/bevel-pixi-filter.ts

@@ -1,8 +1,4 @@
 namespace gdjs {
-  interface BevelFilterExtra {
-    /** It's defined for the configuration but not for the filter. */
-    distance: number;
-  }
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Bevel',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
@@ -16,13 +12,13 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
-          BevelFilterExtra;
+        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
         if (parameterName === 'rotation') {
           bevelFilter.rotation = value;
         } else if (parameterName === 'thickness') {
           bevelFilter.thickness = value;
         } else if (parameterName === 'distance') {
+          // @ts-ignore
           bevelFilter.distance = value;
         } else if (parameterName === 'lightAlpha') {
           bevelFilter.lightAlpha = value;
@@ -30,33 +26,12 @@ namespace gdjs {
           bevelFilter.shadowAlpha = value;
         }
       }
-      getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
-          BevelFilterExtra;
-        if (parameterName === 'rotation') {
-          return bevelFilter.rotation;
-        }
-        if (parameterName === 'thickness') {
-          return bevelFilter.thickness;
-        }
-        if (parameterName === 'distance') {
-          return bevelFilter.distance;
-        }
-        if (parameterName === 'lightAlpha') {
-          return bevelFilter.lightAlpha;
-        }
-        if (parameterName === 'shadowAlpha') {
-          return bevelFilter.shadowAlpha;
-        }
-        return 0;
-      }
       updateStringParameter(
         filter: PIXI.Filter,
         parameterName: string,
         value: string
       ) {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
-          BevelFilterExtra;
+        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
         if (parameterName === 'lightColor') {
           bevelFilter.lightColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
             value
@@ -68,30 +43,6 @@ namespace gdjs {
           );
         }
       }
-      updateColorParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ): void {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
-          BevelFilterExtra;
-        if (parameterName === 'lightColor') {
-          bevelFilter.lightColor = value;
-        }
-        if (parameterName === 'shadowColor') {
-          bevelFilter.shadowColor = value;
-        }
-      }
-      getColorParameter(filter: PIXI.Filter, parameterName: string): number {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
-        if (parameterName === 'lightColor') {
-          return bevelFilter.lightColor;
-        }
-        if (parameterName === 'shadowColor') {
-          return bevelFilter.shadowColor;
-        }
-        return 0;
-      }
       updateBooleanParameter(
         filter: PIXI.Filter,
         parameterName: string,