Send error stack

.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 && cd ..
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && 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 && cd ..
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && 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)
+      - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
-          required: true
+        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",
+    "variant": "cpp"
-    "charconv": "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/EffectsCodeGenerator.cpp

@@ -46,6 +46,10 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
   // TODO Add unit tests on this function.
   
   // TODO Merge with UsedExtensionsFinder.
+  // Default lights rely on the fact that UsedExtensionsFinder doesn't find
+  // extension usages for effects. This has the happy side effect of not
+  // including Three.js when no 3D object are in the scenes.
+  // We need to make something explicit to avoid future bugs.
 
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -69,36 +69,8 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     }
   }
 
-  auto lhs = callStartString + "(" + argumentsStr + ")";
+  return callStartString + "(" + argumentsStr + ") " + relationalOperator +
-  return GenerateRelationalOperation(relationalOperator, lhs, rhs);
+         " " + rhs;
-}
-
-/**
- * @brief Generate a relational operation
- * 
- * @param relationalOperator the operator
- * @param lhs the left hand operand
- * @param rhs the right hand operand
- * @return gd::String 
- */
-gd::String EventsCodeGenerator::GenerateRelationalOperation(
-    const gd::String& relationalOperator,
-    const gd::String& lhs,
-    const gd::String& rhs) {
-  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
-}
-
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
-    if (operatorString == "=") {
-        return "==";
-    }
-    if (operatorString != "<" && operatorString != ">" &&
-        operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
-        operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      return "==";
-    }
-    return operatorString;
 }
 
 /**
@@ -666,6 +638,18 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
+}
+
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -690,7 +674,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     argOutput =
         GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
   } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += parameter.GetPlainString();
+    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
     argOutput = "\"" + argOutput + "\"";
   } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -473,15 +473,10 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
-  virtual gd::String GenerateRelationalOperation(
-      const gd::String& relationalOperator,
-      const gd::String& lhs,
-      const gd::String& rhs);
-
- protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
+ protected:
   /**
    * \brief Generate the code for a single parameter.
    *
@@ -737,7 +732,6 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::String& callStartString,
       std::size_t startFromArgument = 0);
-
   gd::String GenerateOperatorCall(const gd::InstructionMetadata& instrInfos,
                                   const std::vector<gd::String>& arguments,
                                   const gd::String& callStartString,

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -491,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();
@@ -509,6 +514,7 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
       previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
       SkipIfChar(IsParameterSeparator);
+      parameterIndex++;
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -115,23 +115,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
+          _("Get function parameter (also called \"argument\") value."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
+      .SetRelevantForFunctionEventsOnly();
-      .SetHidden();
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
+          _("Get function parameter (also called \"argument\") text."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
+      .SetRelevantForFunctionEventsOnly();
-      .SetHidden();
 
   extension
       .AddCondition(

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -49,7 +49,6 @@ class GD_CORE_API BuiltinExtensionsImplementer {
   static void ImplementsAnimatableExtension(gd::PlatformExtension& extension);
   static void ImplementsEffectExtension(gd::PlatformExtension& extension);
   static void ImplementsOpacityExtension(gd::PlatformExtension& extension);
-  static void ImplementsTextContainerExtension(gd::PlatformExtension& extension);
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -396,7 +396,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Z order"),
                 _("Modify the Z-order of an object"),
                 _("the z-order"),
-                _("Layers and cameras"),
+                _("Z order"),
                 "res/actions/planicon24.png",
                 "res/actions/planicon.png")
 
@@ -550,7 +550,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Z-order"),
                    _("Compare the Z-order of the specified object."),
                    _("the Z-order"),
-                   _("Layer"),
+                   _("Z-order"),
                    "res/conditions/planicon24.png",
                    "res/conditions/planicon.png")
 
@@ -617,7 +617,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
-  // Deprecated
   obj.AddCondition("AngleOfDisplacement",
                    _("Angle of movement (using forces)"),
                    _("Compare the angle of movement of an object according to "
@@ -627,20 +626,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/vitesse24.png",
                    "res/conditions/vitesse.png")
-      .SetHidden()
-      .AddParameter("object", _("Object"))
-      .AddParameter("expression", _("Angle, in degrees"))
-      .AddParameter("expression", _("Tolerance, in degrees"))
-      .MarkAsAdvanced();
 
-  obj.AddCondition("IsTotalForceAngleAround",
-                   _("Angle of movement (using forces)"),
-                   _("Compare the angle of movement of an object according to "
-                     "the forces applied on it."),
-                   _("Angle of movement of _PARAM0_ is _PARAM1_ ± _PARAM2_°"),
-                   _("Movement using forces"),
-                   "res/conditions/vitesse24.png",
-                   "res/conditions/vitesse.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
@@ -1151,7 +1137,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   obj.AddExpression("ZOrder",
                     _("Z-order"),
                     _("Z-order of an object"),
-                    "",
+                    _("Visibility"),
                     "res/actions/planicon.png")
       .AddParameter("object", _("Object"));
 
@@ -1624,7 +1610,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 +1641,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

@@ -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", "")
@@ -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

@@ -23,8 +23,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
-      .SetIcon("res/actions/animation24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
       .SetIcon("res/actions/animation24.png");
 
@@ -44,7 +42,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"),
@@ -55,7 +53,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation index")))
       .MarkAsSimple();
-  aut.GetAllExpressions()["Index"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "string",
@@ -72,7 +69,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation name")))
       .MarkAsSimple();
-  aut.GetAllStrExpressions()["Name"].SetGroup("");
 
   aut.AddScopedAction("PauseAnimation",
                 _("Pause the animation"),
@@ -111,7 +107,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Speed scale")))
       .MarkAsSimple();
-  aut.GetAllExpressions()["SpeedScale"].SetGroup("");
 
   aut.AddScopedCondition("IsAnimationPaused",
                    _("Animation paused"),
@@ -135,31 +130,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
       .MarkAsSimple();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "ElapsedTime",
-         _("Animation elapsed time"),
-         _("the elapsed time from the beginning of the animation (in seconds)"),
-         _("the animation elapsed time"),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .UseStandardParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Elapsed time (in seconds)")))
-      .MarkAsAdvanced();
-  aut.GetAllExpressions()["ElapsedTime"].SetGroup("");
-
-  aut.AddExpression(
-         "Duration",
-         _("Animation duration"),
-         _("Return the current animation duration (in seconds)."),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior");
 }
 
 }  // namespace gd

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

@@ -23,8 +23,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
-      .SetIcon("res/actions/opacity24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
       .SetIcon("res/actions/opacity24.png");
 
@@ -56,7 +54,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
                         _("Opacity (0-255)")))
       .SetFunctionName("setOpacity")
       .SetGetter("getOpacity");
-  aut.GetAllExpressions()["Value"].SetGroup("");
 }
 
 }  // namespace gd

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

@@ -23,8 +23,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
-      .SetIcon("res/actions/scale24_black.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
       .SetIcon("res/actions/scale24_black.png");
 
@@ -46,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale"),
          _("the scale of the object (default scale is 1)"),
          _("the scale"),
-         _("Size"),
+         _("Scale"),
          "res/actions/scale24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -55,7 +53,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
-  aut.GetAllExpressions()["Value"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -63,7 +60,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale on X axis"),
          _("the scale on X axis of the object (default scale is 1)"),
          _("the scale on X axis"),
-         _("Size"),
+         _("Scale"),
          "res/actions/scaleWidth24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -72,7 +69,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
-  aut.GetAllExpressions()["X"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -80,7 +76,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale on Y axis"),
          _("the scale on Y axis of the object (default scale is 1)"),
          _("the scale on Y axis"),
-         _("Size"),
+         _("Scale"),
          "res/actions/scaleHeight24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -89,7 +85,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
-  aut.GetAllExpressions()["Y"].SetGroup("");
 }
 
 }  // namespace gd

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

@@ -1,58 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("TextContainerCapability",
-                               _("Text capability"),
-                               _("Animate objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
-      .SetIcon("res/conditions/text24_black.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "TextContainerBehavior",
-      _("Text capability"),
-      "Text",
-      _("Access objects text."),
-      "",
-      "res/conditions/text24_black.png",
-      "TextContainerBehavior",
-      std::make_shared<gd::Behavior>(),
-      std::make_shared<gd::BehaviorsSharedData>())
-    .SetHidden();
-
-  aut.AddExpressionAndConditionAndAction(
-         "string",
-         "Value",
-         _("Text"),
-         _("the text"),
-         _("the text"),
-         "",
-         "res/conditions/text24_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "TextContainerBehavior")
-      .UseStandardParameters(
-          "string", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Text")))
-      .MarkAsSimple();
-  aut.GetAllStrExpressions()["Value"].SetGroup("");
-}
-
-}  // namespace gd

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/replaceScene24.png",
-                 "res/actions/replaceScene.png")
-      .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/replaceScene24.png")
-      .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/replaceScene24.png",
-                    "res/actions/replaceScene.png")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp

@@ -30,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .AddObject<SpriteObject>("Sprite",
                                    _("Sprite"),
                                    _("Animated object which can be used for "
-                                     "most elements of a game."),
+                                     "most elements of a game"),
                                    "CppPlatform/Extensions/spriteicon.png")
           .SetCategoryFullName(_("General"))
           .AddDefaultBehavior("EffectCapability::EffectBehavior")
@@ -408,7 +408,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .SetHidden()
       .MarkAsSimple();
 
-  // Deprecated
   obj.AddCondition("ScaleWidth",
                    _("Scale on X axis"),
                    _("Compare the scale of the width of an object."),
@@ -416,7 +415,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Size"),
                    "res/conditions/scaleWidth24_black.png",
                    "res/conditions/scaleWidth_black.png")
-      .SetHidden()
+
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters(
           "number",
@@ -424,7 +423,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
-  // Deprecated
   obj.AddCondition("ScaleHeight",
                    _("Scale on Y axis"),
                    _("Compare the scale of the height of an object."),
@@ -432,7 +430,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Size"),
                    "res/conditions/scaleHeight24_black.png",
                    "res/conditions/scaleHeight_black.png")
-      .SetHidden()
+
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters(
           "number",

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -87,8 +87,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
   extension
       .AddAction(
           "SetWindowSize",
-          _("Game window size"),
+          _("Change the size of the game window"),
-          _("Changes the size of the game window. Note that this "
+          _("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/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/ObjectMetadata.h

@@ -303,24 +303,12 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
     return *this;
   }
 
+
   /**
-   * \brief Return true if the object must be hidden in the IDE.
+   * \brief Return true if the instruction must be hidden in the IDE.
    */
   bool IsHidden() const { return hidden; }
 
-  /**
-   * \brief Declare a usage of the 3D renderer.
-   */
-  ObjectMetadata &MarkAsRenderedIn3D() {
-    isRenderedIn3D = true;
-    return *this;
-  }
-
-  /**
-   * \brief Return true if the object uses the 3D renderer.
-   */
-  bool IsRenderedIn3D() const { return isRenderedIn3D; }
-
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -341,7 +329,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   gd::String categoryFullName;
   std::set<gd::String> defaultBehaviorTypes;
   bool hidden = false;
-  bool isRenderedIn3D = false;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new

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()) {
+                      linked) != parentExternalEvents.end())
-          // Circular dependency!
+          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()) {
+            parentScenes.end())
-          // Circular dependency!
+          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) {
+      // Update with indirect dependencies.
-          parentScenes.push_back(linked);
+      scenesDependencies.insert(analyzer.GetScenesDependencies().begin(),
-          if (!Analyze(project.GetLayout(linked).GetEvents()))
+                                analyzer.GetScenesDependencies().end());
-            return false;
+      externalEventsDependencies.insert(
-          parentScenes.pop_back();
+          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/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/UsedExtensionsFinder.cpp

@@ -25,9 +25,6 @@ const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& projec
 void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
   auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
       project.GetCurrentPlatform(), object.GetType());
-  if (metadata.GetMetadata().IsRenderedIn3D()) {
-    result.MarkAsHaving3DObjects();
-  }
   result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
     result.GetUsedIncludeFiles().insert(includeFile);

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -44,13 +44,6 @@ public:
     return usedRequiredFiles;
   }
 
-  /**
-   * \brief Return true when at least 1 object uses the 3D renderer.
-   */
-  bool Has3DObjects() const {
-    return has3DObjects;
-  }
-
   /**
    * The extensions used by the project (or part of it).
    */
@@ -66,15 +59,10 @@ public:
    */
   std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
 
-  void MarkAsHaving3DObjects() {
-    has3DObjects = true;
-  }
-
 private:
   std::set<gd::String> usedExtensions;
   std::set<gd::String> usedIncludeFiles;
   std::set<gd::String> usedRequiredFiles;
-  bool has3DObjects = false;
 };
 
 class GD_CORE_API UsedExtensionsFinder

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/Project/ArbitraryResourceWorker.cpp

@@ -262,6 +262,13 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
   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) {
@@ -286,8 +293,8 @@ void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
 gd::ResourceWorkerInObjectsWorker
 GetResourceWorkerOnObjects(const gd::Project &project,
                            gd::ArbitraryResourceWorker &worker) {
-  gd::ResourceWorkerInObjectsWorker resourcesWorker(project, worker);
+  gd::ResourceWorkerInObjectsWorker eventsWorker(project, worker);
-  return resourcesWorker;
+  return eventsWorker;
 }
 
 }  // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -37,7 +37,7 @@ namespace gd {
  * \see ResourcesMergingHelper
  * \see gd::ResourcesInUseHelper
  *
- * \see gd::GetResourceWorkerOnEvents
+ * \see gd::LaunchResourceWorkerOnEvents
  *
  * \ingroup IDE
  */

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.cpp

@@ -1,19 +0,0 @@
-#include "ObjectsUsingResourceCollector.h"
-
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-
-void ObjectsUsingResourceCollector::DoVisitObject(gd::Object& object) {
-  gd::ResourceNameMatcher resourceNameMatcher(resourceName);
-
-  object.GetConfiguration().ExposeResources(resourceNameMatcher);
-  if (resourceNameMatcher.AnyResourceMatches()) {
-    objectNames.push_back(object.GetName());
-  }
-};
-
-ObjectsUsingResourceCollector::~ObjectsUsingResourceCollector() {}
-
-}  // namespace gd

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h

@@ -1,89 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef ProjectObjectsUsingResourceCollector_H
-#define ProjectObjectsUsingResourceCollector_H
-
-#include <vector>
-
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Object;
-}  // namespace gd
-
-namespace gd {
-
-class GD_CORE_API ObjectsUsingResourceCollector
-    : public ArbitraryObjectsWorker {
- public:
-  ObjectsUsingResourceCollector(const gd::String& resourceName_)
-      : resourceName(resourceName_){};
-  virtual ~ObjectsUsingResourceCollector();
-
-  std::vector<gd::String>& GetObjectNames() { return objectNames; }
-
- private:
-  void DoVisitObject(gd::Object& object) override;
-
-  std::vector<gd::String> objectNames;
-  gd::String resourceName;
-};
-
-class GD_CORE_API ResourceNameMatcher : public ArbitraryResourceWorker {
- public:
-  ResourceNameMatcher(const gd::String& resourceName_)
-      : resourceName(resourceName_), matchesResourceName(false){};
-  virtual ~ResourceNameMatcher(){};
-
-  bool AnyResourceMatches() { return matchesResourceName; }
-  void Reset() { matchesResourceName = false; }
-
- private:
-  virtual void ExposeFile(gd::String& resource) override{
-      /*Don't care, we just read resource names*/
-  };
-  virtual void ExposeImage(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeAudio(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeFont(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeJson(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeTilemap(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeTileset(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeVideo(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeBitmapFont(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeModel3D(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-
-  void MatchResourceName(gd::String& otherResourceName) {
-    if (otherResourceName == resourceName) matchesResourceName = true;
-  }
-
-  gd::String resourceName;
-  bool matchesResourceName;
-};
-
-};  // namespace gd
-
-#endif  // ProjectObjectsUsingResourceCollector_H

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -51,6 +51,7 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
   // 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();
@@ -70,6 +71,8 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
                        destinationFile + _("\"."));
       }
     }
+
+    ++i;
   }
 
   return true;

Core/GDCore/IDE/Project/SceneResourcesFinder.cpp

@@ -1,35 +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;
-  gd::ResourceExposer::ExposeProjectResources(project, resourceWorker);
-  return resourceWorker.resourceNames;
-}
-
-std::set<gd::String> SceneResourcesFinder::FindSceneResources(gd::Project &project,
-    gd::Layout &layout) {
-  gd::SceneResourcesFinder resourceWorker;
-  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,86 +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::ArbitraryResourceWorker(){};
-
-  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);
-  };
-
-  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;
@@ -183,7 +140,7 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
           globalObjectsAndGroups, objectsAndGroups);
       auto projectScopedContainers =
         gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
-      projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsFunctionsExtension));
+      projectScopedContainers.AddParameters(eventsFunction->GetParameters());
 
       worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
     }
@@ -200,6 +157,7 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
          eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
       ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
     }
+  }
 }
 
 void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
@@ -225,27 +183,12 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
     projectScopedContainers.AddPropertiesContainer(eventsBasedBehavior.GetSharedPropertyDescriptors());
     projectScopedContainers.AddPropertiesContainer(eventsBasedBehavior.GetPropertyDescriptors());
-    projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsBasedBehavior.GetEventsFunctions()));
+    projectScopedContainers.AddParameters(eventsFunction->GetParameters());
 
     worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
   }
 }
 
-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) {
@@ -259,7 +202,7 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
     auto projectScopedContainers =
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
     projectScopedContainers.AddPropertiesContainer(eventsBasedObject.GetPropertyDescriptors());
-    projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsBasedObject.GetEventsFunctions()));
+    projectScopedContainers.AddParameters(eventsFunction->GetParameters());
 
     worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
   }
@@ -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.
+   * behavior
-   *
-   * 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.
    *
    * 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.
+   * event-based behavior.
-   */
-  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.
    */
   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/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 {
 
@@ -37,7 +36,6 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
 
   // Expose any project resources as files.
   worker.ExposeResources(resourcesManager);
-
   project.GetPlatformSpecificAssets().ExposeResources(worker);
 
   // Expose event resources
@@ -75,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) {
@@ -133,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;
-        gd::String potentiallyUpdatedResourceName = resourceName;
+      worker.ExposeResourceWithType(resourceType,
-        worker.ExposeResourceWithType(resourceType,
+                                    potentiallyUpdatedResourceName);
-                                      potentiallyUpdatedResourceName);
+      if (potentiallyUpdatedResourceName != resourceName) {
-        if (potentiallyUpdatedResourceName != resourceName) {
+        effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
-          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

@@ -1538,7 +1538,7 @@ void WholeProjectRefactorer::RenameLayer(gd::Project &project,
     return;
   gd::ProjectElementRenamer projectElementRenamer(project.GetCurrentPlatform(),
                                                   "layer", oldName, newName);
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout,
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
                                                projectElementRenamer);
 }
 
@@ -1552,7 +1552,7 @@ void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "layerEffectName", oldName, newName);
   projectElementRenamer.SetLayerConstraint(layer.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout,
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
                                                projectElementRenamer);
 }
 
@@ -1566,7 +1566,7 @@ void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectAnimationName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout,
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
                                                projectElementRenamer);
 }
 
@@ -1580,7 +1580,7 @@ void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectPointName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout,
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
                                                projectElementRenamer);
 }
 
@@ -1594,7 +1594,7 @@ void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectEffectName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout,
+  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
                                                projectElementRenamer);
 }
 

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 == "Color" || propertyType == "Behavior") {
-        propertyType == "resource") {
       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 == "Color" || propertyType == "Behavior") {
-          propertyType == "resource") {
         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()
+            configurationContent.GetChild(propertyName).GetBoolValue() ? "true"
-                ? "true"
+                                                                  : "false");
-                : "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 == "Color" || propertyType == "Behavior") {
-      propertyType == "resource") {
     element.SetStringValue(newValue);
   } else if (propertyType == "Number") {
     element.SetDoubleValue(newValue.To<double>());

Core/GDCore/Project/EventsBasedObject.cpp

@@ -17,7 +17,7 @@ EventsBasedObject::EventsBasedObject()
 }
 
 EventsBasedObject::~EventsBasedObject() {}
-
+    
 EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject)
         : AbstractEventsBasedEntity(_eventBasedObject) {
   // TODO Add a copy constructor in ObjectsContainer.
@@ -27,26 +27,17 @@ EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObj
 
 void EventsBasedObject::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("defaultName", defaultName);
-  if (isRenderedIn3D) {
-    element.SetBoolAttribute("is3D", true);
-  }
 
   AbstractEventsBasedEntity::SerializeTo(element);
   SerializeObjectsTo(element.AddChild("objects"));
-  SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
 }
 
 void EventsBasedObject::UnserializeFrom(gd::Project& project,
-                                        const SerializerElement& element) {
+                                          const SerializerElement& element) {
   defaultName = element.GetStringAttribute("defaultName");
-  isRenderedIn3D = element.GetBoolAttribute("is3D", false);
 
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   UnserializeObjectsFrom(project, element.GetChild("objects"));
-  if (element.HasChild("objectsFolderStructure")) {
-    UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
-  }
-  AddMissingObjectsInRootFolder();
 }
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObject.h

@@ -72,19 +72,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
     return *this;
   }
 
-  /**
-   * \brief Declare a usage of the 3D renderer.
-   */
-  EventsBasedObject& MarkAsRenderedIn3D(bool isRenderedIn3D_) {
-    isRenderedIn3D = isRenderedIn3D_;
-    return *this;
-  }
-
-  /**
-   * \brief Return true if the object uses the 3D renderer.
-   */
-  bool IsRenderedIn3D() const { return isRenderedIn3D; }
-
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,
@@ -92,7 +79,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
 
  private:
   gd::String defaultName;
-  bool isRenderedIn3D;
 };
 
 }  // namespace gd

Core/GDCore/Project/Layer.cpp

@@ -19,7 +19,7 @@ Layer::Layer()
       isLocked(false),
       isLightingLayer(false),
       followBaseLayerCamera(false),
-      camera3DNearPlaneDistance(3),
+      camera3DNearPlaneDistance(0.1),
       camera3DFarPlaneDistance(10000),
       camera3DFieldOfView(45),
       ambientLightColorR(200),

Core/GDCore/Project/Layout.cpp

@@ -294,7 +294,6 @@ void Layout::SerializeTo(SerializerElement& element) const {
   GetVariables().SerializeTo(element.AddChild("variables"));
   GetInitialInstances().SerializeTo(element.AddChild("instances"));
   SerializeObjectsTo(element.AddChild("objects"));
-  SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
   gd::EventsListSerialization::SerializeEventsTo(events,
                                                  element.AddChild("events"));
 
@@ -354,11 +353,6 @@ void Layout::UnserializeFrom(gd::Project& project,
       project, GetEvents(), element.GetChild("events", 0, "Events"));
 
   UnserializeObjectsFrom(project, element.GetChild("objects", 0, "Objets"));
-  if (element.HasChild("objectsFolderStructure")) {
-    UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
-  }
-  AddMissingObjectsInRootFolder();
-
   initialInstances.UnserializeFrom(
       element.GetChild("instances", 0, "Positions"));
   variables.UnserializeFrom(element.GetChild("variables", 0, "Variables"));

Core/GDCore/Project/Object.cpp

@@ -40,6 +40,7 @@ void Object::Init(const gd::Object& object) {
   name = object.name;
   assetStoreId = object.assetStoreId;
   objectVariables = object.objectVariables;
+  tags = object.tags;
   effectsContainer = object.effectsContainer;
 
   behaviors.clear();
@@ -133,6 +134,7 @@ void Object::UnserializeFrom(gd::Project& project,
   SetType(element.GetStringAttribute("type"));
   assetStoreId = element.GetStringAttribute("assetStoreId");
   name = element.GetStringAttribute("name", name, "nom");
+  tags = element.GetStringAttribute("tags");
 
   objectVariables.UnserializeFrom(
       element.GetChild("variables", 0, "Variables"));
@@ -205,6 +207,7 @@ void Object::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("assetStoreId", GetAssetStoreId());
   element.SetAttribute("type", GetType());
+  element.SetAttribute("tags", GetTags());
   objectVariables.SerializeTo(element.AddChild("variables"));
   effectsContainer.SerializeTo(element.AddChild("effects"));
 

Core/GDCore/Project/Object.h

@@ -120,6 +120,14 @@ class GD_CORE_API Object {
    */
   const gd::String& GetType() const { return configuration->GetType(); }
 
+  /** \brief Change the tags of the object.
+   */
+  void SetTags(const gd::String& tags_) { tags = tags_; }
+
+  /** \brief Return the tags of the object.
+   */
+  const gd::String& GetTags() const { return tags; }
+
   /** \brief Shortcut to check if the object is a 3D object.
    */
   bool Is3DObject() const { return configuration->Is3DObject(); }
@@ -260,6 +268,7 @@ class GD_CORE_API Object {
                   ///< object.
   gd::VariablesContainer
       objectVariables;  ///< List of the variables of the object
+  gd::String tags;      ///< Comma-separated list of tags
   gd::EffectsContainer
       effectsContainer;  ///< The effects container for the object.
   mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,

Core/GDCore/Project/ObjectFolderOrObject.cpp

@@ -1,248 +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 "GDCore/Project/ObjectFolderOrObject.h"
-
-#include <memory>
-
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Log.h"
-
-using namespace std;
-
-namespace gd {
-
-ObjectFolderOrObject ObjectFolderOrObject::badObjectFolderOrObject;
-
-ObjectFolderOrObject::ObjectFolderOrObject()
-    : folderName("__NULL"), object(nullptr) {}
-ObjectFolderOrObject::ObjectFolderOrObject(gd::String folderName_,
-                                           ObjectFolderOrObject* parent_)
-    : folderName(folderName_), parent(parent_), object(nullptr) {}
-ObjectFolderOrObject::ObjectFolderOrObject(gd::Object* object_,
-                                           ObjectFolderOrObject* parent_)
-    : object(object_), parent(parent_) {}
-ObjectFolderOrObject::~ObjectFolderOrObject() {}
-
-bool ObjectFolderOrObject::HasObjectNamed(const gd::String& name) {
-  if (IsFolder()) {
-    return std::any_of(
-        children.begin(),
-        children.end(),
-        [&name](
-            std::unique_ptr<gd::ObjectFolderOrObject>& objectFolderOrObject) {
-          return objectFolderOrObject->HasObjectNamed(name);
-        });
-  }
-  if (!object) return false;
-  return object->GetName() == name;
-}
-ObjectFolderOrObject& ObjectFolderOrObject::GetObjectNamed(
-    const gd::String& name) {
-  if (object && object->GetName() == name) {
-    return *this;
-  }
-  if (IsFolder()) {
-    for (std::size_t j = 0; j < children.size(); j++) {
-      ObjectFolderOrObject& foundInChild = children[j]->GetObjectNamed(name);
-      if (&(foundInChild) != &badObjectFolderOrObject) {
-        return foundInChild;
-      }
-    }
-  }
-  return badObjectFolderOrObject;
-}
-
-void ObjectFolderOrObject::SetFolderName(const gd::String& name) {
-  if (!IsFolder()) return;
-  folderName = name;
-}
-
-ObjectFolderOrObject& ObjectFolderOrObject::GetChildAt(std::size_t index) {
-  if (index >= children.size()) return badObjectFolderOrObject;
-  return *children[index];
-}
-const ObjectFolderOrObject& ObjectFolderOrObject::GetChildAt(std::size_t index) const {
-  if (index >= children.size()) return badObjectFolderOrObject;
-  return *children[index];
-}
-ObjectFolderOrObject& ObjectFolderOrObject::GetObjectChild(
-    const gd::String& name) {
-  for (std::size_t j = 0; j < children.size(); j++) {
-    if (!children[j]->IsFolder()) {
-      if (children[j]->GetObject().GetName() == name) return *children[j];
-    };
-  }
-  return badObjectFolderOrObject;
-}
-
-void ObjectFolderOrObject::InsertObject(gd::Object* insertedObject,
-                                        std::size_t position) {
-  auto objectFolderOrObject =
-      gd::make_unique<ObjectFolderOrObject>(insertedObject, this);
-  if (position < children.size()) {
-    children.insert(children.begin() + position,
-                    std::move(objectFolderOrObject));
-  } else {
-    children.push_back(std::move(objectFolderOrObject));
-  }
-}
-
-std::size_t ObjectFolderOrObject::GetChildPosition(
-    const ObjectFolderOrObject& child) const {
-  for (std::size_t j = 0; j < children.size(); j++) {
-    if (children[j].get() == &child) return j;
-  }
-  return gd::String::npos;
-}
-
-ObjectFolderOrObject& ObjectFolderOrObject::InsertNewFolder(
-    const gd::String& newFolderName, std::size_t position) {
-  auto newFolderPtr =
-      gd::make_unique<ObjectFolderOrObject>(newFolderName, this);
-  gd::ObjectFolderOrObject& newFolder = *(*(children.insert(
-      position < children.size() ? children.begin() + position : children.end(),
-      std::move(newFolderPtr))));
-  return newFolder;
-};
-
-void ObjectFolderOrObject::RemoveRecursivelyObjectNamed(
-    const gd::String& name) {
-  if (IsFolder()) {
-    children.erase(
-        std::remove_if(children.begin(),
-                       children.end(),
-                       [&name](std::unique_ptr<gd::ObjectFolderOrObject>&
-                                   objectFolderOrObject) {
-                         return !objectFolderOrObject->IsFolder() &&
-                                objectFolderOrObject->GetObject().GetName() ==
-                                    name;
-                       }),
-        children.end());
-    for (auto& it : children) {
-      it->RemoveRecursivelyObjectNamed(name);
-    }
-  }
-};
-
-bool ObjectFolderOrObject::IsADescendantOf(
-    const ObjectFolderOrObject& otherObjectFolderOrObject) {
-  if (parent == nullptr) return false;
-  if (&(*parent) == &otherObjectFolderOrObject) return true;
-  return parent->IsADescendantOf(otherObjectFolderOrObject);
-}
-
-void ObjectFolderOrObject::MoveChild(std::size_t oldIndex,
-                                     std::size_t newIndex) {
-  if (!IsFolder()) return;
-  if (oldIndex >= children.size() || newIndex >= children.size()) return;
-
-  std::unique_ptr<gd::ObjectFolderOrObject> objectFolderOrObject =
-      std::move(children[oldIndex]);
-  children.erase(children.begin() + oldIndex);
-  children.insert(children.begin() + newIndex, std::move(objectFolderOrObject));
-}
-
-void ObjectFolderOrObject::RemoveFolderChild(
-    const ObjectFolderOrObject& childToRemove) {
-  if (!IsFolder() || !childToRemove.IsFolder() ||
-      childToRemove.GetChildrenCount() > 0) {
-    return;
-  }
-  std::vector<std::unique_ptr<gd::ObjectFolderOrObject>>::iterator it = find_if(
-      children.begin(),
-      children.end(),
-      [&childToRemove](std::unique_ptr<gd::ObjectFolderOrObject>& child) {
-        return child.get() == &childToRemove;
-      });
-  if (it == children.end()) return;
-
-  children.erase(it);
-}
-
-void ObjectFolderOrObject::MoveObjectFolderOrObjectToAnotherFolder(
-    gd::ObjectFolderOrObject& objectFolderOrObject,
-    gd::ObjectFolderOrObject& newParentFolder,
-    std::size_t newPosition) {
-  if (!newParentFolder.IsFolder()) return;
-  if (newParentFolder.IsADescendantOf(objectFolderOrObject)) return;
-
-  std::vector<std::unique_ptr<gd::ObjectFolderOrObject>>::iterator it =
-      find_if(children.begin(),
-              children.end(),
-              [&objectFolderOrObject](std::unique_ptr<gd::ObjectFolderOrObject>&
-                                          childObjectFolderOrObject) {
-                return childObjectFolderOrObject.get() == &objectFolderOrObject;
-              });
-  if (it == children.end()) return;
-
-  std::unique_ptr<gd::ObjectFolderOrObject> objectFolderOrObjectPtr =
-      std::move(*it);
-  children.erase(it);
-
-  objectFolderOrObjectPtr->parent = &newParentFolder;
-  newParentFolder.children.insert(
-      newPosition < newParentFolder.children.size()
-          ? newParentFolder.children.begin() + newPosition
-          : newParentFolder.children.end(),
-      std::move(objectFolderOrObjectPtr));
-}
-
-void ObjectFolderOrObject::SerializeTo(SerializerElement& element) const {
-  if (IsFolder()) {
-    element.SetAttribute("folderName", GetFolderName());
-    if (children.size() > 0) {
-      SerializerElement& childrenElement = element.AddChild("children");
-      childrenElement.ConsiderAsArrayOf("objectFolderOrObject");
-      for (std::size_t j = 0; j < children.size(); j++) {
-        children[j]->SerializeTo(
-            childrenElement.AddChild("objectFolderOrObject"));
-      }
-    }
-  } else {
-    element.SetAttribute("objectName", GetObject().GetName());
-  }
-}
-
-void ObjectFolderOrObject::UnserializeFrom(
-    gd::Project& project,
-    const SerializerElement& element,
-    gd::ObjectsContainer& objectsContainer) {
-  children.clear();
-  gd::String potentialFolderName = element.GetStringAttribute("folderName", "");
-
-  if (!potentialFolderName.empty()) {
-    object = nullptr;
-    folderName = potentialFolderName;
-
-    if (element.HasChild("children")) {
-      const SerializerElement& childrenElements =
-          element.GetChild("children", 0);
-      childrenElements.ConsiderAsArrayOf("objectFolderOrObject");
-      for (std::size_t i = 0; i < childrenElements.GetChildrenCount(); ++i) {
-        std::unique_ptr<ObjectFolderOrObject> childObjectFolderOrObject =
-            make_unique<ObjectFolderOrObject>();
-        childObjectFolderOrObject->UnserializeFrom(
-            project, childrenElements.GetChild(i), objectsContainer);
-        childObjectFolderOrObject->parent = this;
-        children.push_back(std::move(childObjectFolderOrObject));
-      }
-    }
-  } else {
-    folderName = "";
-    gd::String objectName = element.GetStringAttribute("objectName");
-    if (objectsContainer.HasObjectNamed(objectName)) {
-      object = &objectsContainer.GetObject(objectName);
-    } else {
-      gd::LogError("Object with name " + objectName +
-                   " not found in objects container.");
-      object = nullptr;
-    }
-  }
-};
-
-}  // namespace gd

Core/GDCore/Project/ObjectFolderOrObject.h

@@ -1,203 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_OBJECTFOLDEROROBJECT_H
-#define GDCORE_OBJECTFOLDEROROBJECT_H
-#include <memory>
-#include <vector>
-
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class Object;
-class SerializerElement;
-class ObjectsContainer;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Class representing a folder structure in order to organize objects
- * in folders (to be used with an ObjectsContainer.)
- *
- * \see gd::ObjectsContainer
- */
-class GD_CORE_API ObjectFolderOrObject {
- public:
-  /**
-   * \brief Default constructor creating an empty instance. Useful for the null
-   * object pattern.
-   */
-  ObjectFolderOrObject();
-  virtual ~ObjectFolderOrObject();
-  /**
-   * \brief Constructor for creating an instance representing a folder.
-   */
-  ObjectFolderOrObject(gd::String folderName_,
-                       ObjectFolderOrObject* parent_ = nullptr);
-  /**
-   * \brief Constructor for creating an instance representing an object.
-   */
-  ObjectFolderOrObject(gd::Object* object_,
-                       ObjectFolderOrObject* parent_ = nullptr);
-
-  /**
-   * \brief Returns the object behind the instance.
-   */
-  gd::Object& GetObject() const { return *object; }
-
-  /**
-   * \brief Returns true if the instance represents a folder.
-   */
-  bool IsFolder() const { return !folderName.empty(); }
-  /**
-   * \brief Returns the name of the folder.
-   */
-  const gd::String& GetFolderName() const { return folderName; }
-
-  /**
-   * \brief Set the folder name. Does nothing if called on an instance not
-   * representing a folder.
-   */
-  void SetFolderName(const gd::String& name);
-
-  /**
-   * \brief Returns true if the instance represents the object with the given
-   * name or if any of the children does (recursive search).
-   */
-  bool HasObjectNamed(const gd::String& name);
-  /**
-   * \brief Returns the child instance holding the object with the given name
-   * (recursive search).
-   */
-  ObjectFolderOrObject& GetObjectNamed(const gd::String& name);
-
-  /**
-   * \brief Returns the number of children. Returns 0 if the instance represents
-   * an object.
-   */
-  std::size_t GetChildrenCount() const {
-    if (IsFolder()) return children.size();
-    return 0;
-  }
-  /**
-   * \brief Returns the child ObjectFolderOrObject at the given index.
-   */
-  ObjectFolderOrObject& GetChildAt(std::size_t index);
-  /**
-   * \brief Returns the child ObjectFolderOrObject at the given index.
-   */
-  const ObjectFolderOrObject& GetChildAt(std::size_t index) const;
-  /**
-   * \brief Returns the child ObjectFolderOrObject that represents the object
-   * with the given name. To use only if sure that the instance holds the object
-   * in its direct children (no recursive search).
-   *
-   * \note The equivalent method to get a folder by its name cannot be
-   * implemented because there is no unicity enforced on the folder name.
-   */
-  ObjectFolderOrObject& GetObjectChild(const gd::String& name);
-
-  /**
-   * \brief Returns the parent of the instance. If the instance has no parent
-   * (root folder), the null object is returned.
-   */
-  ObjectFolderOrObject& GetParent() {
-    if (parent == nullptr) {
-      return badObjectFolderOrObject;
-    }
-    return *parent;
-  };
-
-  /**
-   * \brief Returns true if the instance is a root folder (that's to say it
-   * has no parent).
-   */
-  bool IsRootFolder() { return !object && !parent; }
-
-  /**
-   * \brief Moves a child from a position to a new one.
-   */
-  void MoveChild(std::size_t oldIndex, std::size_t newIndex);
-  /**
-   * \brief Removes the given child from the instance's children. If the given
-   * child contains children of its own, does nothing.
-   */
-  void RemoveFolderChild(const ObjectFolderOrObject& childToRemove);
-  /**
-   * \brief Removes the child representing the object with the given name from
-   * the instance children and recursively does it for every folder children.
-   */
-  void RemoveRecursivelyObjectNamed(const gd::String& name);
-
-  /**
-   * \brief Inserts an instance representing the given object at the given
-   * position.
-   */
-  void InsertObject(gd::Object* insertedObject,
-                    std::size_t position = (size_t)-1);
-  /**
-   * \brief Inserts an instance representing a folder with the given name at the
-   * given position.
-   */
-  ObjectFolderOrObject& InsertNewFolder(const gd::String& newFolderName,
-                                        std::size_t position);
-  /**
-   * \brief Returns true if the instance is a descendant of the given instance
-   * of ObjectFolderOrObject.
-   */
-  bool IsADescendantOf(const ObjectFolderOrObject& otherObjectFolderOrObject);
-
-  /**
-   * \brief Returns the position of the given instance of ObjectFolderOrObject
-   * in the instance's children.
-   */
-  std::size_t GetChildPosition(const ObjectFolderOrObject& child) const;
-  /**
-   * \brief Moves the given child ObjectFolderOrObject to the given folder at
-   * the given position.
-   */
-  void MoveObjectFolderOrObjectToAnotherFolder(
-      gd::ObjectFolderOrObject& objectFolderOrObject,
-      gd::ObjectFolderOrObject& newParentFolder,
-      std::size_t newPosition);
-
-  /** \name Saving and loading
-   * Members functions related to saving and loading the objects of the class.
-   */
-  ///@{
-  /**
-   * \brief Serialize the ObjectFolderOrObject instance.
-   */
-  void SerializeTo(SerializerElement& element) const;
-
-  /**
-   * \brief Unserialize the ObjectFolderOrObject instance.
-   */
-  void UnserializeFrom(gd::Project& project,
-                       const SerializerElement& element,
-                       ObjectsContainer& objectsContainer);
-  ///@}
-
- private:
-  static gd::ObjectFolderOrObject badObjectFolderOrObject;
-
-  gd::ObjectFolderOrObject*
-      parent;  // nullptr if root folder, points to the parent folder otherwise.
-
-  // Representing an object:
-  gd::Object* object;  // nullptr if folderName is set.
-
-  // or representing a folder:
-  gd::String folderName;  // Empty if object is set.
-  std::vector<std::unique_ptr<ObjectFolderOrObject>>
-      children;  // Folder children.
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_OBJECTFOLDEROROBJECT_H

Core/GDCore/Project/ObjectsContainer.cpp

@@ -9,15 +9,12 @@
 
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectFolderOrObject.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
 namespace gd {
 
-ObjectsContainer::ObjectsContainer() {
+ObjectsContainer::ObjectsContainer() {}
-  rootFolder = gd::make_unique<gd::ObjectFolderOrObject>("__ROOT");
-}
 
 ObjectsContainer::~ObjectsContainer() {}
 
@@ -27,22 +24,6 @@ void ObjectsContainer::SerializeObjectsTo(SerializerElement& element) const {
     initialObjects[j]->SerializeTo(element.AddChild("object"));
   }
 }
-void ObjectsContainer::SerializeFoldersTo(SerializerElement& element) const {
-  rootFolder->SerializeTo(element);
-}
-
-void ObjectsContainer::UnserializeFoldersFrom(
-    gd::Project& project, const SerializerElement& element) {
-  rootFolder->UnserializeFrom(project, element, *this);
-}
-
-void ObjectsContainer::AddMissingObjectsInRootFolder() {
-  for (std::size_t i = 0; i < initialObjects.size(); ++i) {
-    if (!rootFolder->HasObjectNamed(initialObjects[i]->GetName())) {
-      rootFolder->InsertObject(&(*initialObjects[i]));
-    }
-  }
-}
 
 void ObjectsContainer::UnserializeObjectsFrom(
     gd::Project& project, const SerializerElement& element) {
@@ -67,23 +48,17 @@ void ObjectsContainer::UnserializeObjectsFrom(
 bool ObjectsContainer::HasObjectNamed(const gd::String& name) const {
   return (find_if(initialObjects.begin(),
                   initialObjects.end(),
-                  [&](const std::unique_ptr<gd::Object>& object) {
+                  [&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }) != initialObjects.end());
-                    return object->GetName() == name;
-                  }) != initialObjects.end());
 }
 gd::Object& ObjectsContainer::GetObject(const gd::String& name) {
   return *(*find_if(initialObjects.begin(),
                     initialObjects.end(),
-                    [&](const std::unique_ptr<gd::Object>& object) {
+                    [&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }));
-                      return object->GetName() == name;
-                    }));
 }
 const gd::Object& ObjectsContainer::GetObject(const gd::String& name) const {
   return *(*find_if(initialObjects.begin(),
                     initialObjects.end(),
-                    [&](const std::unique_ptr<gd::Object>& object) {
+                    [&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }));
-                      return object->GetName() == name;
-                    }));
 }
 gd::Object& ObjectsContainer::GetObject(std::size_t index) {
   return *initialObjects[index];
@@ -109,22 +84,6 @@ gd::Object& ObjectsContainer::InsertNewObject(const gd::Project& project,
                                        : initialObjects.end(),
       project.CreateObject(objectType, name))));
 
-  rootFolder->InsertObject(&newlyCreatedObject);
-
-  return newlyCreatedObject;
-}
-
-gd::Object& ObjectsContainer::InsertNewObjectInFolder(
-    const gd::Project& project,
-    const gd::String& objectType,
-    const gd::String& name,
-    gd::ObjectFolderOrObject& objectFolderOrObject,
-    std::size_t position) {
-  gd::Object& newlyCreatedObject = *(*(initialObjects.insert(
-      initialObjects.end(), project.CreateObject(objectType, name))));
-
-  objectFolderOrObject.InsertObject(&newlyCreatedObject, position);
-
   return newlyCreatedObject;
 }
 
@@ -138,6 +97,16 @@ gd::Object& ObjectsContainer::InsertObject(const gd::Object& object,
   return newlyCreatedObject;
 }
 
+void ObjectsContainer::SwapObjects(std::size_t firstObjectIndex,
+                                   std::size_t secondObjectIndex) {
+  if (firstObjectIndex >= initialObjects.size() ||
+      secondObjectIndex >= initialObjects.size())
+    return;
+
+  std::iter_swap(initialObjects.begin() + firstObjectIndex,
+                 initialObjects.begin() + secondObjectIndex);
+}
+
 void ObjectsContainer::MoveObject(std::size_t oldIndex, std::size_t newIndex) {
   if (oldIndex >= initialObjects.size() || newIndex >= initialObjects.size())
     return;
@@ -151,59 +120,30 @@ void ObjectsContainer::RemoveObject(const gd::String& name) {
   std::vector<std::unique_ptr<gd::Object>>::iterator objectIt =
       find_if(initialObjects.begin(),
               initialObjects.end(),
-              [&](const std::unique_ptr<gd::Object>& object) {
+              [&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; });
-                return object->GetName() == name;
-              });
   if (objectIt == initialObjects.end()) return;
 
-  rootFolder->RemoveRecursivelyObjectNamed(name);
-
   initialObjects.erase(objectIt);
 }
 
-void ObjectsContainer::MoveObjectFolderOrObjectToAnotherContainerInFolder(
+void ObjectsContainer::MoveObjectToAnotherContainer(
-    gd::ObjectFolderOrObject& objectFolderOrObject,
+    const gd::String& name,
     gd::ObjectsContainer& newContainer,
-    gd::ObjectFolderOrObject& newParentFolder,
     std::size_t newPosition) {
-  if (objectFolderOrObject.IsFolder() || !newParentFolder.IsFolder()) return;
+  std::vector<std::unique_ptr<gd::Object>>::iterator objectIt =
-
+      find_if(initialObjects.begin(),
-  std::vector<std::unique_ptr<gd::Object>>::iterator objectIt = find_if(
+              initialObjects.end(),
-      initialObjects.begin(),
+              [&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; });
-      initialObjects.end(),
-      [&objectFolderOrObject](std::unique_ptr<gd::Object>& object) {
-        return object->GetName() == objectFolderOrObject.GetObject().GetName();
-      });
   if (objectIt == initialObjects.end()) return;
 
   std::unique_ptr<gd::Object> object = std::move(*objectIt);
   initialObjects.erase(objectIt);
 
-  newContainer.initialObjects.push_back(std::move(object));
+  newContainer.initialObjects.insert(
-
+      newPosition < newContainer.initialObjects.size()
-  objectFolderOrObject.GetParent().MoveObjectFolderOrObjectToAnotherFolder(
+          ? newContainer.initialObjects.begin() + newPosition
-      objectFolderOrObject, newParentFolder, newPosition);
+          : newContainer.initialObjects.end(),
-}
+      std::move(object));
-
-std::vector<const ObjectFolderOrObject*>
-ObjectsContainer::GetAllObjectFolderOrObjects() const {
-  std::vector<const ObjectFolderOrObject*> results;
-
-  std::function<void(const ObjectFolderOrObject& folder)> addChildrenOfFolder =
-      [&](const ObjectFolderOrObject& folder) {
-        for (size_t i = 0; i < folder.GetChildrenCount(); ++i) {
-          const auto& child = folder.GetChildAt(i);
-          results.push_back(&child);
-
-          if (child.IsFolder()) {
-            addChildrenOfFolder(child);
-          }
-        }
-      };
-
-  addChildrenOfFolder(*rootFolder);
-
-  return results;
 }
 
 }  // namespace gd

Core/GDCore/Project/ObjectsContainer.h

@@ -9,12 +9,11 @@
 #include <vector>
 #include "GDCore/String.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
-#include "GDCore/Project/ObjectFolderOrObject.h"
 namespace gd {
 class Object;
 class Project;
 class SerializerElement;
-}  // namespace gd
+}
 #undef GetObject  // Disable an annoying macro
 
 namespace gd {
@@ -99,19 +98,6 @@ class GD_CORE_API ObjectsContainer {
                               const gd::String& objectType,
                               const gd::String& name,
                               std::size_t position);
-  /**
-   * \brief Add a new empty object of type \a objectType called \a name in the
-   * given folder at the specified position.<br>
-   *
-   * \note The object is created using the project's current platform.
-   * \return A reference to the object in the list.
-   */
-  gd::Object& InsertNewObjectInFolder(
-      const gd::Project& project,
-      const gd::String& objectType,
-      const gd::String& name,
-      gd::ObjectFolderOrObject& objectFolderOrObject,
-      std::size_t position);
 
   /**
    * \brief Add a new object to the list
@@ -139,18 +125,18 @@ class GD_CORE_API ObjectsContainer {
   void MoveObject(std::size_t oldIndex, std::size_t newIndex);
 
   /**
-   * Move the specified object to another container, removing it from the
+   * \brief Swap the position of the specified objects.
-   * current one and adding it to the new one at the specified position in the
-   * given folder.
-   *
-   * \note This does not invalidate the references to the object (object is not
-   * moved in memory, as referenced by smart pointers internally).
    */
-  void MoveObjectFolderOrObjectToAnotherContainerInFolder(
+  void SwapObjects(std::size_t firstObjectIndex, std::size_t secondObjectIndex);
-      gd::ObjectFolderOrObject& objectFolderOrObject,
+
-      gd::ObjectsContainer& newContainer,
+  /**
-      gd::ObjectFolderOrObject& newParentFolder,
+   * Move the specified object to another container, removing it from the current one
-      std::size_t newPosition);
+   * and adding it to the new one at the specified position.
+   *
+   * \note This does not invalidate the references to the object (object is not moved in memory,
+   * as referenced by smart pointers internally).
+   */
+  void MoveObjectToAnotherContainer(const gd::String& name, gd::ObjectsContainer & newContainer, std::size_t newPosition);
 
   /**
    * Provide a raw access to the vector containing the objects
@@ -167,43 +153,20 @@ class GD_CORE_API ObjectsContainer {
   }
   ///@}
 
-  /**
-   * Returns a vector containing all object and folders in this container.
-   * Only use this for checking if you hold a valid `ObjectFolderOrObject` -
-   * don't use this for rendering or anything else.
-   */
-  std::vector<const ObjectFolderOrObject*> GetAllObjectFolderOrObjects() const;
-
-  gd::ObjectFolderOrObject& GetRootFolder() {
-      return *rootFolder;
-  }
-
-  void AddMissingObjectsInRootFolder();
-
   /** \name Saving and loading
    * Members functions related to saving and loading the objects of the class.
    */
   ///@{
   /**
-   * \brief Serialize the objects container.
+   * \brief Serialize instances container.
    */
   void SerializeObjectsTo(SerializerElement& element) const;
 
   /**
-   * \brief Unserialize the objects container.
+   * \brief Unserialize the instances container.
    */
   void UnserializeObjectsFrom(gd::Project& project,
                               const SerializerElement& element);
-  /**
-   * \brief Serialize folder structure.
-   */
-  void SerializeFoldersTo(SerializerElement& element) const;
-
-  /**
-   * \brief Unserialize folder structure.
-   */
-  void UnserializeFoldersFrom(gd::Project& project,
-                              const SerializerElement& element);
   ///@}
 
   /** \name Objects groups management
@@ -227,9 +190,6 @@ class GD_CORE_API ObjectsContainer {
   std::vector<std::unique_ptr<gd::Object> >
       initialObjects;  ///< Objects contained.
   gd::ObjectGroupsContainer objectGroups;
-
- private:
-  std::unique_ptr<gd::ObjectFolderOrObject> rootFolder;
 };
 
 }  // namespace gd

Core/GDCore/Project/Project.cpp

@@ -48,6 +48,11 @@ using namespace std;
 
 namespace gd {
 
+// By default, disallow unicode in identifiers, but this can be set to true
+// by the IDE. In the future, this will be set to true by default, keeping backward compatibility.
+// We keep it disabled by default to progressively ask users to test it in real projects.
+bool Project::allowUsageOfUnicodeIdentifierNames = false;
+
 Project::Project()
     : name(_("Project")),
       version("1.0.0"),
@@ -81,24 +86,26 @@ Project::~Project() {}
 
 void Project::ResetProjectUuid() { projectUuid = UUID::MakeUuid4(); }
 
-std::unique_ptr<gd::Object> Project::CreateObject(
+std::unique_ptr<gd::Object>
-    const gd::String& objectType, const gd::String& name) const {
+Project::CreateObject(const gd::String &objectType, const gd::String &name) const {
-  std::unique_ptr<gd::Object> object = gd::make_unique<Object>(
+  std::unique_ptr<gd::Object> object =
-      name, objectType, CreateObjectConfiguration(objectType));
+      gd::make_unique<Object>(name, objectType, CreateObjectConfiguration(objectType));
 
-  auto& platform = GetCurrentPlatform();
+  auto &platform = GetCurrentPlatform();
-  auto& project = *this;
+  auto &project = *this;
-  auto addDefaultBehavior = [&platform, &project, &object, &objectType](
+  auto addDefaultBehavior =
-                                const gd::String& behaviorType) {
+      [&platform,
-    auto& behaviorMetadata =
+       &project,
+       &object,
+       &objectType](const gd::String& behaviorType) {
+    auto &behaviorMetadata =
         gd::MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
     if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-      gd::LogWarning("Object: " + objectType +
+      gd::LogWarning("Object: " + objectType + " has an unknown default behavior: " + behaviorType);
-                     " has an unknown default behavior: " + behaviorType);
       return;
     }
-    auto* behavior = object->AddNewBehavior(
+    auto* behavior = object->AddNewBehavior(project, behaviorType,
-        project, behaviorType, behaviorMetadata.GetDefaultName());
+                          behaviorMetadata.GetDefaultName());
     behavior->SetDefaultBehavior(true);
   };
 
@@ -107,17 +114,18 @@ std::unique_ptr<gd::Object> Project::CreateObject(
     addDefaultBehavior("ResizableCapability::ResizableBehavior");
     addDefaultBehavior("ScalableCapability::ScalableBehavior");
     addDefaultBehavior("FlippableCapability::FlippableBehavior");
-  } else {
+  }
-    auto& objectMetadata =
+  else {
-        gd::MetadataProvider::GetObjectMetadata(platform, objectType);
+    auto &objectMetadata = gd::MetadataProvider::GetObjectMetadata(platform, objectType);
     if (MetadataProvider::IsBadObjectMetadata(objectMetadata)) {
       gd::LogWarning("Object: " + name + " has an unknown type: " + objectType);
     }
-    for (auto& behaviorType : objectMetadata.GetDefaultBehaviors()) {
+    for (auto &behaviorType : objectMetadata.GetDefaultBehaviors()) {
       addDefaultBehavior(behaviorType);
     }
   }
 
+  
   return std::move(object);
 }
 
@@ -841,11 +849,6 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   resourcesManager.UnserializeFrom(
       element.GetChild("resources", 0, "Resources"));
   UnserializeObjectsFrom(*this, element.GetChild("objects", 0, "Objects"));
-  if (element.HasChild("objectsFolderStructure")) {
-    UnserializeFoldersFrom(*this, element.GetChild("objectsFolderStructure", 0));
-  }
-  AddMissingObjectsInRootFolder();
-
   GetVariables().UnserializeFrom(element.GetChild("variables", 0, "Variables"));
 
   scenes.clear();
@@ -997,7 +1000,6 @@ void Project::SerializeTo(SerializerElement& element) const {
 
   resourcesManager.SerializeTo(element.AddChild("resources"));
   SerializeObjectsTo(element.AddChild("objects"));
-  SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
   GetObjectGroups().SerializeTo(element.AddChild("objectsGroups"));
   GetVariables().SerializeTo(element.AddChild("variables"));
 
@@ -1036,18 +1038,28 @@ void Project::SerializeTo(SerializerElement& element) const {
         externalSourceFilesElement.AddChild("sourceFile"));
 }
 
+void Project::AllowUsageOfUnicodeIdentifierNames(bool enable) {
+  allowUsageOfUnicodeIdentifierNames = enable;
+}
+
 bool Project::IsNameSafe(const gd::String& name) {
   if (name.empty()) return false;
 
   if (isdigit(name[0])) return false;
 
-  for (auto character : name) {
+  if (!allowUsageOfUnicodeIdentifierNames) {
-    if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
+    gd::String legacyAllowedCharacters =
-      return false;
+        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+    return !(name.find_first_not_of(legacyAllowedCharacters) != gd::String::npos);
+  } else {
+    for (auto character : name) {
+      if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
+        return false;
+      }
     }
-  }
 
-  return true;
+    return true;
+  }
 }
 
 gd::String Project::GetSafeName(const gd::String& name) {
@@ -1057,13 +1069,18 @@ gd::String Project::GetSafeName(const gd::String& name) {
 
   if (isdigit(name[0])) newName = "_" + newName;
 
-  for (size_t i = 0; i < newName.size(); ++i) {
+  gd::String legacyAllowedCharacters =
-    // Note that iterating on the characters is not super efficient (O(n^2),
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-    // which could be avoided with an iterator), but this function is not
+
-    // critical for performance (only used to generate a name when a user
+  for (size_t i = 0;i < newName.size();++i) {
-    // creates a new entity or rename one).
+    // Note that iterating on the characters is not super efficient (O(n^2), which
+    // could be avoided with an iterator), but this function is not critical for performance
+    // (only used to generate a name when a user creates a new entity or rename one).
     auto character = newName[i];
-    bool isAllowed = GrammarTerminals::IsAllowedInIdentifier(character);
+    bool isAllowed =
+        allowUsageOfUnicodeIdentifierNames
+            ? GrammarTerminals::IsAllowedInIdentifier(character)
+            : legacyAllowedCharacters.find(character) != gd::String::npos;
 
     // Replace all unallowed letters by an underscore.
     if (!isAllowed) {

Core/GDCore/Project/Project.h

@@ -11,12 +11,12 @@
 
 #include "GDCore/Project/ExtensionProperties.h"
 #include "GDCore/Project/LoadingScreen.h"
+#include "GDCore/Project/Watermark.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/PlatformSpecificAssets.h"
 #include "GDCore/Project/ResourcesManager.h"
 #include "GDCore/Project/VariablesContainer.h"
-#include "GDCore/Project/Watermark.h"
 #include "GDCore/String.h"
 namespace gd {
 class Platform;
@@ -82,9 +82,7 @@ class GD_CORE_API Project : public ObjectsContainer {
   /**
    * \brief Change the project description
    */
-  void SetDescription(const gd::String& description_) {
+  void SetDescription(const gd::String& description_) { description = description_; };
-    description = description_;
-  };
 
   /**
    * \brief Get the project description
@@ -126,9 +124,7 @@ class GD_CORE_API Project : public ObjectsContainer {
   /**
    * \brief Get the author usernames of the project.
    */
-  const std::vector<gd::String>& GetAuthorUsernames() const {
+  const std::vector<gd::String>& GetAuthorUsernames() const { return authorUsernames; };
-    return authorUsernames;
-  };
 
   /**
    * \brief Get the author usernames of the project, to modify them (non-const).
@@ -139,9 +135,7 @@ class GD_CORE_API Project : public ObjectsContainer {
    * Define the project as playable with a keyboard.
    * \param enable True to define the project as playable with a keyboard.
    */
-  void SetPlayableWithKeyboard(bool playable = true) {
+  void SetPlayableWithKeyboard(bool playable = true) { isPlayableWithKeyboard = playable; }
-    isPlayableWithKeyboard = playable;
-  }
 
   /**
    * Check if the project is defined as playable with a keyboard.
@@ -152,9 +146,7 @@ class GD_CORE_API Project : public ObjectsContainer {
    * Define the project as playable with a gamepad.
    * \param enable True to define the project as playable with a gamepad.
    */
-  void SetPlayableWithGamepad(bool playable = true) {
+  void SetPlayableWithGamepad(bool playable = true) { isPlayableWithGamepad = playable; }
-    isPlayableWithGamepad = playable;
-  }
 
   /**
    * Check if the project is defined as playable with a gamepad.
@@ -165,9 +157,7 @@ class GD_CORE_API Project : public ObjectsContainer {
    * Define the project as playable on a mobile.
    * \param enable True to define the project as playable on a mobile.
    */
-  void SetPlayableWithMobile(bool playable = true) {
+  void SetPlayableWithMobile(bool playable = true) { isPlayableWithMobile = playable; }
-    isPlayableWithMobile = playable;
-  }
 
   /**
    * Check if the project is defined as playable on a mobile.
@@ -401,23 +391,17 @@ class GD_CORE_API Project : public ObjectsContainer {
   /**
    * Set the antialiasing mode used by the game ("none" or "MSAA").
    */
-  void SetAntialiasingMode(const gd::String& antialiasingMode_) {
+  void SetAntialiasingMode(const gd::String& antialiasingMode_) { antialiasingMode = antialiasingMode_; }
-    antialiasingMode = antialiasingMode_;
-  }
 
   /**
    * Return true if antialising is enabled on mobiles.
    */
-  bool IsAntialisingEnabledOnMobile() const {
+  bool IsAntialisingEnabledOnMobile() const { return isAntialisingEnabledOnMobile; }
-    return isAntialisingEnabledOnMobile;
-  }
 
   /**
    * Set whether antialising is enabled on mobiles or not.
    */
-  void SetAntialisingEnabledOnMobile(bool enable) {
+  void SetAntialisingEnabledOnMobile(bool enable) { isAntialisingEnabledOnMobile = enable; }
-    isAntialisingEnabledOnMobile = enable;
-  }
 
   /**
    * \brief Return if the project should set 0 as Z-order for objects created
@@ -921,8 +905,7 @@ class GD_CORE_API Project : public ObjectsContainer {
   /**
    * \brief Return the events based object with a given type.
    */
-  const gd::EventsBasedObject& GetEventsBasedObject(
+  const gd::EventsBasedObject& GetEventsBasedObject(const gd::String& type) const;
-      const gd::String& type) const;
 
   /**
    * \brief  Check if events based behavior with a given type exists.
@@ -937,8 +920,7 @@ class GD_CORE_API Project : public ObjectsContainer {
   /**
    * \brief Return the events based behavior with a given type.
    */
-  const gd::EventsBasedBehavior& GetEventsBasedBehavior(
+  const gd::EventsBasedBehavior& GetEventsBasedBehavior(const gd::String& type) const;
-      const gd::String& type) const;
 
   ///@}
 
@@ -987,6 +969,20 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   ///@{
 
+  /**
+   * Check if unicode names are allowed in identifier names.
+   * \see IsNameSafe
+   * \see GetSafeName
+   */
+  static bool IsUsageOfUnicodeIdentifierNamesAllowed() { return allowUsageOfUnicodeIdentifierNames; };
+
+  /**
+   * Set if unicode names are allowed in identifier names.
+   * \see IsNameSafe
+   * \see GetSafeName
+   */
+  static void AllowUsageOfUnicodeIdentifierNames(bool enable);
+
   /**
    * Return true if \a name is valid (can be used safely for an object,
    * behavior, events function name, etc...).
@@ -994,8 +990,8 @@ class GD_CORE_API Project : public ObjectsContainer {
   static bool IsNameSafe(const gd::String& name);
 
   /**
-   * Return a name, based on the one passed in parameter, that can be safely
+   * Return a name, based on the one passed in parameter, that can be safely used
-   * used for an object, behavior, events function name, etc...
+   * for an object, behavior, events function name, etc...
    */
   static gd::String GetSafeName(const gd::String& name);
   ///@}
@@ -1072,8 +1068,8 @@ class GD_CORE_API Project : public ObjectsContainer {
   bool adaptGameResolutionAtRuntime;  ///< Should the game resolution be adapted
                                       ///< to the window size at runtime
   gd::String
-      sizeOnStartupMode;  ///< How to adapt the game size to the screen. Can be
+      sizeOnStartupMode;   ///< How to adapt the game size to the screen. Can be
-                          ///< "adaptWidth", "adaptHeight" or empty
+                           ///< "adaptWidth", "adaptHeight" or empty
   gd::String antialiasingMode;
   bool isAntialisingEnabledOnMobile;
   gd::String projectUuid;  ///< UUID useful to identify the game in online
@@ -1099,18 +1095,19 @@ class GD_CORE_API Project : public ObjectsContainer {
       externalSourceFiles;  ///< List of external source files used.
   gd::String author;        ///< Game author name, for publishing purpose.
   std::vector<gd::String>
-      authorIds;  ///< Game author ids, from GDevelop users DB.
+      authorIds;           ///< Game author ids, from GDevelop users DB.
   std::vector<gd::String>
-      authorUsernames;  ///< Game author usernames, from GDevelop users DB.
+      authorUsernames;     ///< Game author usernames, from GDevelop users DB.
-  std::vector<gd::String> categories;  ///< Game categories
+  std::vector<gd::String>
-  bool isPlayableWithKeyboard;  ///< The project is playable with a keyboard.
+      categories;           ///< Game categories
-  bool isPlayableWithGamepad;   ///< The project is playable with a gamepad.
+  bool isPlayableWithKeyboard; ///< The project is playable with a keyboard.
-  bool isPlayableWithMobile;    ///< The project is playable on a mobile.
+  bool isPlayableWithGamepad;  ///< The project is playable with a gamepad.
-  gd::String packageName;       ///< Game package name
+  bool isPlayableWithMobile;   ///< The project is playable on a mobile.
-  gd::String templateSlug;  ///< The slug of the template from which the game is
+  gd::String packageName;  ///< Game package name
-                            ///< created.
+  gd::String templateSlug; ///< The slug of the template from which the game is
-  gd::String orientation;   ///< Lock game orientation (on mobile devices).
+                           ///< created.
-                            ///< "default", "landscape" or "portrait".
+  gd::String orientation;  ///< Lock game orientation (on mobile devices).
+                           ///< "default", "landscape" or "portrait".
   bool
       folderProject;  ///< True if folder project, false if single file project.
   gd::String
@@ -1131,6 +1128,8 @@ class GD_CORE_API Project : public ObjectsContainer {
                                         ///< time the project was saved.
   mutable unsigned int gdBuildVersion;  ///< The GD build version used the last
                                         ///< time the project was saved.
+
+  static bool allowUsageOfUnicodeIdentifierNames;
 };
 
 }  // namespace gd

Core/GDCore/Project/ResourcesManager.cpp

@@ -534,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 =
@@ -544,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);
 }

Core/GDCore/Project/ResourcesManager.h

@@ -662,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/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/3D/JsExtension.js

@@ -39,18 +39,16 @@ module.exports = {
       .setIcon('res/conditions/3d_box.svg');
 
     {
-      const base3D = extension
+      const base3D = extension.addBehavior(
-        .addBehavior(
+          "Base3DBehavior",
-          'Base3DBehavior',
+          _("3D capability"),
-          _('3D capability'),
+          "Object3D",
-          'Object3D',
+          _("Move the object in 3D space."),
-          _('Move the object in 3D space.'),
+          "",
-          '',
+          "res/conditions/3d_box.svg",
-          'res/conditions/3d_box.svg',
+          "Base3DBehavior",
-          'Base3DBehavior',
           new gd.Behavior(),
-          new gd.BehaviorsSharedData()
+          new gd.BehaviorsSharedData())
-        )
         .setHidden()
         .setIncludeFile('Extensions/3D/Base3DBehavior.js');
 
@@ -65,11 +63,11 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setZ')
         .setGetter('getZ');
-
+    
       base3D
         .addExpressionAndConditionAndAction(
           'number',
@@ -97,23 +95,23 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .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 of an object (default scale is 1)"),
-          _('the scale on Z axis scale'),
+          _("the scale on Z axis scale"),
-          _('Size'),
+          _('Scale'),
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .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'),
@@ -135,12 +133,12 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('yesorno', _('Activate flipping'))
         .markAsSimple()
         .setFunctionName('flipZ');
 
-      base3D
+        base3D
         .addScopedCondition(
           'FlippedZ',
           _('Flipped on Z'),
@@ -151,10 +149,10 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .setFunctionName('isFlippedZ');
 
-      base3D
+        base3D
         .addExpressionAndConditionAndAction(
           'number',
           'RotationX',
@@ -165,12 +163,12 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationX')
         .setGetter('getRotationX');
 
-      base3D
+        base3D
         .addExpressionAndConditionAndAction(
           'number',
           'RotationY',
@@ -181,12 +179,12 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationY')
         .setGetter('getRotationY');
 
-      base3D
+        base3D
         .addScopedAction(
           'TurnAroundX',
           _('Turn around X axis'),
@@ -199,12 +197,12 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundX');
 
-      base3D
+        base3D
         .addScopedAction(
           'TurnAroundY',
           _('Turn around Y axis'),
@@ -217,12 +215,12 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundY');
 
-      base3D
+        base3D
         .addScopedAction(
           'TurnAroundZ',
           _('Turn around Z axis'),
@@ -235,7 +233,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'))
-        .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
+        .addParameter("behavior", _("Behavior"), "Base3DBehavior")
         .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundZ');
@@ -246,18 +244,17 @@ module.exports = {
         .addObject(
           'Model3DObject',
           _('3D Model'),
-          _('An animated 3D model.'),
+          _('A 3D model.'),
           'JsPlatform/Extensions/3d_box.svg',
           new gd.Model3DObjectConfiguration()
         )
-        .setCategoryFullName(_('General'))
+        .setCategoryFullName(_('3D'))
-        // 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')
         .addDefaultBehavior('AnimatableCapability::AnimatableBehavior')
         .addDefaultBehavior('Scene3D::Base3DBehavior')
-        .markAsRenderedIn3D()
         .setIncludeFile('Extensions/3D/A_RuntimeObject3D.js')
         .addIncludeFile('Extensions/3D/A_RuntimeObject3DRenderer.js')
         .addIncludeFile('Extensions/3D/Model3DRuntimeObject.js')
@@ -282,6 +279,7 @@ module.exports = {
         .setFunctionName('setZ')
         .setGetter('getZ');
 
+      
       // Deprecated
       object
         .addExpressionAndConditionAndAction(
@@ -1127,17 +1125,16 @@ module.exports = {
       .addObject(
         'Cube3DObject',
         _('3D Box'),
-        _('A box with images for each face'),
+        _('A 3D box.'),
         'JsPlatform/Extensions/3d_box.svg',
         Cube3DObject
       )
-      .setCategoryFullName(_('General'))
+      .setCategoryFullName(_('3D'))
       // Effects are unsupported because the object is not rendered with PIXI.
       .addDefaultBehavior('ResizableCapability::ResizableBehavior')
       .addDefaultBehavior('ScalableCapability::ScalableBehavior')
       .addDefaultBehavior('FlippableCapability::FlippableBehavior')
       .addDefaultBehavior('Scene3D::Base3DBehavior')
-      .markAsRenderedIn3D()
       .setIncludeFile('Extensions/3D/A_RuntimeObject3D.js')
       .addIncludeFile('Extensions/3D/A_RuntimeObject3DRenderer.js')
       .addIncludeFile('Extensions/3D/Cube3DRuntimeObject.js')
@@ -1162,7 +1159,7 @@ module.exports = {
       .setFunctionName('setZ')
       .setGetter('getZ');
 
-    // Deprecated
+      // Deprecated
     object
       .addExpressionAndConditionAndAction(
         'number',
@@ -1307,7 +1304,7 @@ module.exports = {
       .setFunctionName('setScaleX')
       .setGetter('getScaleX');
 
-    // Deprecated
+      // Deprecated
     object
       .addExpressionAndConditionAndAction(
         'number',
@@ -1665,7 +1662,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 +2096,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 +2160,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.x =
-        this._pixiTexturedObject.scale.y = height / objectTextureFrame.height;
+          width / this._pixiTexturedObject.texture.frame.width;
+        this._pixiTexturedObject.scale.y =
+          height / this._pixiTexturedObject.texture.frame.height;
 
         this._pixiTexturedObject.position.x =
           this._instance.getX() +
@@ -2689,11 +2679,6 @@ module.exports = {
           });
       }
 
-      onRemovedFromScene() {
-        super.onRemovedFromScene();
-        this._pixiObject.destroy({ children: true });
-      }
-
       static getThumbnail(project, resourcesLoader, objectConfiguration) {
         return 'JsPlatform/Extensions/3d_box.svg';
       }

Extensions/3D/Model3DRuntimeObject.ts

@@ -113,10 +113,6 @@ namespace gdjs {
         );
       }
 
-      if (this.isNeedingLifecycleFunctions()) {
-        this.getLifecycleSleepState().wakeUp();
-      }
-
       // *ALWAYS* call `this.onCreated()` at the very end of your object constructor.
       this.onCreated();
     }
@@ -198,10 +194,6 @@ namespace gdjs {
       }
     }
 
-    isNeedingLifecycleFunctions(): boolean {
-      return super.isNeedingLifecycleFunctions() || this._animations.length > 0;
-    }
-
     update(instanceContainer: gdjs.RuntimeInstanceContainer): void {
       const elapsedTime = this.getElapsedTime() / 1000;
       this._renderer.updateAnimation(elapsedTime * this._animationSpeedScale);
@@ -229,9 +221,6 @@ namespace gdjs {
         const animation = this._animations[animationIndex];
         this._currentAnimationIndex = animationIndex;
         this._renderer.playAnimation(animation.source, animation.loop);
-        if (this._animationPaused) {
-          this._renderer.pauseAnimation();
-        }
       }
     }
 
@@ -283,12 +272,12 @@ namespace gdjs {
 
     pauseAnimation() {
       this._animationPaused = true;
-      this._renderer.pauseAnimation();
+      return this._renderer.pauseAnimation();
     }
 
     resumeAnimation() {
       this._animationPaused = false;
-      this._renderer.resumeAnimation();
+      return this._renderer.resumeAnimation();
     }
 
     getAnimationSpeedScale() {
@@ -299,20 +288,6 @@ namespace gdjs {
       this._animationSpeedScale = ratio;
     }
 
-    getAnimationElapsedTime(): float {
-      return this._renderer.getAnimationElapsedTime();
-    }
-
-    setAnimationElapsedTime(time: float): void {
-      this._renderer.setAnimationElapsedTime(time);
-    }
-
-    getAnimationDuration(): float {
-      return this._renderer.getAnimationDuration(
-        this._animations[this._currentAnimationIndex].source
-      );
-    }
-
     getCenterX(): float {
       const centerPoint = this._renderer.getCenterPoint();
       return this.getWidth() * centerPoint[0];

Extensions/3D/Model3DRuntimeObject3DRenderer.ts

@@ -348,24 +348,6 @@ namespace gdjs {
       // Make sure the first frame is displayed.
       this._animationMixer.update(0);
     }
-
-    getAnimationElapsedTime(): float {
-      return this._action ? this._action.time : 0;
-    }
-
-    setAnimationElapsedTime(time: float): void {
-      if (this._action) {
-        this._action.time = time;
-      }
-    }
-
-    getAnimationDuration(animationName: string): float {
-      const clip = THREE.AnimationClip.findByName(
-        this._originalModel.animations,
-        animationName
-      );
-      return clip ? clip.duration : 0;
-    }
   }
 
   export const Model3DRuntimeObjectRenderer = Model3DRuntimeObject3DRenderer;

Extensions/3D/Scene3DTools.ts

@@ -86,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();
 

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/BBText/bbtextruntimeobject-pixi-renderer.ts

@@ -126,10 +126,6 @@ namespace gdjs {
     getHeight(): float {
       return this._pixiObject.height;
     }
-
-    destroy(): void {
-      this._pixiObject.destroy(true);
-    }
   }
 
   export const BBTextRuntimeObjectRenderer = BBTextRuntimeObjectPixiRenderer;

Extensions/BBText/bbtextruntimeobject.ts

@@ -130,9 +130,8 @@ namespace gdjs {
       }
     }
 
-    onDestroyed(): void {
+    onDestroyFromScene(instanceContainer: gdjs.RuntimeInstanceContainer): void {
-      super.onDestroyed();
+      super.onDestroyFromScene(instanceContainer);
-      this._renderer.destroy();
     }
 
     /**

Extensions/BitmapText/JsExtension.js

@@ -176,12 +176,10 @@ module.exports = {
         'Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.js'
       )
       .setCategoryFullName(_('Text'))
-      .addDefaultBehavior("TextContainerCapability::TextContainerBehavior")
       .addDefaultBehavior('EffectCapability::EffectBehavior')
       .addDefaultBehavior('OpacityCapability::OpacityBehavior')
       .addDefaultBehavior('ScalableCapability::ScalableBehavior');
 
-    // Deprecated
     object
       .addExpressionAndConditionAndAction(
         'string',
@@ -192,23 +190,11 @@ module.exports = {
         '',
         'res/conditions/text24_black.png'
       )
-      .setHidden()
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
       .useStandardParameters('string', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setText')
       .setGetter('getText');
 
-    object
-      .addStrExpression(
-        'Text',
-        _('Text'),
-        _('Return the text.'),
-        '',
-        'res/conditions/text24_black.png'
-      )
-      .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .setFunctionName('getText');
-
     // Deprecated
     object
       .addExpressionAndConditionAndAction(
@@ -296,7 +282,6 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('setTint');
 
-    // Deprecated
     object
       .addAction(
         'SetBitmapFontAndTextureAtlasResourceName',
@@ -309,7 +294,6 @@ module.exports = {
         'res/actions/font24.png',
         'res/actions/font.png'
       )
-      .setHidden()
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
       .addParameter(
         'bitmapFontResource',
@@ -327,34 +311,6 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('setBitmapFontAndTextureAtlasResourceName');
 
-      object
-        .addAction(
-          'SetBitmapFontAndTextureAtlasResourceName2',
-          _('Bitmap files resources'),
-          _('Change the Bitmap Font and/or the atlas image used by the object.'),
-          _(
-            'Set the bitmap font of _PARAM0_ to _PARAM1_ and the atlas to _PARAM2_'
-          ),
-          '',
-          'res/actions/font24.png',
-          'res/actions/font.png'
-        )
-        .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-        .addParameter(
-          'bitmapFontResource',
-          _('Bitmap font resource name'),
-          '',
-          false
-        )
-        .addParameter(
-          'imageResource',
-          _('Texture atlas resource name'),
-          '',
-          false
-        )
-        .getCodeExtraInformation()
-        .setFunctionName('setBitmapFontAndTextureAtlasResourceName');
-
     object
       .addExpressionAndCondition(
         'string',

Extensions/BitmapText/bitmaptextruntimeobject.ts

@@ -37,7 +37,7 @@ namespace gdjs {
    */
   export class BitmapTextRuntimeObject
     extends gdjs.RuntimeObject
-    implements gdjs.TextContainer, gdjs.OpacityHandler, gdjs.Scalable {
+    implements gdjs.OpacityHandler, gdjs.Scalable {
     _opacity: float;
     _text: string;
     /** color in format [r, g, b], where each component is in the range [0, 255] */
@@ -141,8 +141,8 @@ namespace gdjs {
       }
     }
 
-    onDestroyed(): void {
+    onDestroyFromScene(instanceContainer: gdjs.RuntimeInstanceContainer): void {
-      super.onDestroyed();
+      super.onDestroyFromScene(instanceContainer);
       this._renderer.onDestroy();
     }
 

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/JsExtension.js

@@ -725,44 +725,6 @@ module.exports = {
       .setType('number')
       .setDescription(_('Padding for the visual effect area'));
 
-    const hslAdjustmentEffect = extension
-      .addEffect('HslAdjustment')
-      .setFullName(_('HSL Adjustment'))
-      .setDescription(
-        _(
-          'Adjust hue, saturation and lightness.'
-        )
-      )
-      .markAsOnlyWorkingFor2D()
-      .addIncludeFile('Extensions/Effects/pixi-filters/filter-hsl-adjustment.js')
-      .addIncludeFile('Extensions/Effects/hsl-adjustment-pixi-filter.js');
-    const hslAdjustmentProperties = hslAdjustmentEffect.getProperties();
-    hslAdjustmentProperties
-      .getOrCreate('hue')
-      .setValue('0')
-      .setLabel(_('Hue in degrees (between -180 and 180)'))
-      .setType('number');
-    hslAdjustmentProperties
-      .getOrCreate('saturation')
-      .setValue('0')
-      .setLabel(_('Saturation (between -1 and 1)'))
-      .setType('number');
-    hslAdjustmentProperties
-      .getOrCreate('lightness')
-      .setValue('0')
-      .setLabel(_('Lightness (between -1 and 1)'))
-      .setType('number');
-    hslAdjustmentProperties
-      .getOrCreate('colorize')
-      .setValue('false')
-      .setLabel(_('Colorize from the grayscale image'))
-      .setType('boolean');
-    hslAdjustmentProperties
-      .getOrCreate('alpha')
-      .setValue('1')
-      .setLabel(_('Alpha (between 0 and 1, 0 is transparent)'))
-      .setType('number');
-
     const kawaseBlurEffect = extension
       .addEffect('KawaseBlur')
       .setFullName(_('Blur (Kawase, fast)'))
@@ -813,38 +775,6 @@ module.exports = {
       .setLabel(_('Opacity (between 0 and 1)'))
       .setType('number');
 
-    const motionBlurEffect = extension
-      .addEffect('MotionBlur')
-      .setFullName(_('Motion Blur'))
-      .setDescription(
-        _('Blur the rendered image to give a feeling of speed.')
-      )
-      .markAsOnlyWorkingFor2D()
-      .addIncludeFile('Extensions/Effects/pixi-filters/filter-motion-blur.js')
-      .addIncludeFile('Extensions/Effects/motion-blur-pixi-filter.js');
-    const motionBlurProperties = motionBlurEffect.getProperties();
-    motionBlurProperties
-      .getOrCreate('velocityX')
-      .setValue('0')
-      .setLabel(_('Velocity on X axis'))
-      .setType('number');
-    motionBlurProperties
-      .getOrCreate('velocityY')
-      .setValue('0')
-      .setLabel(_('Velocity on Y axis'))
-      .setType('number');
-    motionBlurProperties
-      .getOrCreate('kernelSize')
-      .setValue('5')
-      .setLabel(_('Kernel size (odd number between 3 and 25)'))
-      .setType('number')
-      .setDescription(_('Quality of the blur.'));
-    motionBlurProperties
-      .getOrCreate('offset')
-      .setValue('0')
-      .setLabel(_('Offset'))
-      .setType('number');
-
     const nightEffect = extension
       .addEffect('Night')
       .setFullName(_('Dark Night'))
@@ -1159,59 +1089,6 @@ module.exports = {
       .setLabel(_('Opacity (between 0 and 1)'))
       .setType('number');
 
-    const shockwaveEffect = extension
-      .addEffect('Shockwave')
-      .setFullName(_('Shockwave'))
-      .setDescription(
-        _('Deform the image the way a drop deforms a water surface.')
-      )
-      .markAsOnlyWorkingFor2D()
-      .addIncludeFile('Extensions/Effects/pixi-filters/filter-shockwave.js')
-      .addIncludeFile('Extensions/Effects/shockwave-pixi-filter.js');
-    const shockwaveEffectProperties = shockwaveEffect.getProperties();
-    shockwaveEffectProperties
-      .getOrCreate('time')
-      .setValue('0')
-      .setLabel(_('Elapsed time'))
-      .setType('number')
-      .setDescription('It can be set back to 0 to play the shockwave animation again.');
-    shockwaveEffectProperties
-      .getOrCreate('speed')
-      .setValue('500')
-      .setLabel(_('Spreading speed (in pixels per second)'))
-      .setType('number');
-    shockwaveEffectProperties
-      .getOrCreate('amplitude')
-      .setValue('50')
-      .setLabel(_('Amplitude'))
-      .setType('number');
-    shockwaveEffectProperties
-      .getOrCreate('wavelength')
-      .setValue('200')
-      .setLabel(_('Wavelength'))
-      .setType('number');
-    shockwaveEffectProperties
-      .getOrCreate('brightness')
-      .setValue('1')
-      .setLabel(_('Brightness'))
-      .setType('number');
-    shockwaveEffectProperties
-      .getOrCreate('radius')
-      .setValue('0')
-      .setLabel(_('Maximum radius (0 for infinity)'))
-      .setType('number');
-    shockwaveEffectProperties
-      .getOrCreate('centerX')
-      .setValue('0.5')
-      .setLabel(_('Center on X axis'))
-      .setType('number');
-    shockwaveEffectProperties
-      .getOrCreate('centerY')
-      .setValue('0.5')
-      .setLabel(_('Center on Y axis'))
-      .setType('number')
-      .setDescription('(0,0) is the top-left and (1,1) is the bottom right.');
-
     const tiltShiftEffect = extension
       .addEffect('TiltShift')
       .setFullName(_('Tilt shift'))

Extensions/Effects/adjustment-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Adjustment',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const adjustmentFilter = new PIXI.filters.AdjustmentFilter();
         return adjustmentFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
         if (parameterName === 'gamma') {
           adjustmentFilter.gamma = value;
@@ -31,16 +27,8 @@ namespace gdjs {
           adjustmentFilter.alpha = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

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

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'AdvancedBloom',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const advancedBloomFilter = new PIXI.filters.AdvancedBloomFilter();
         return advancedBloomFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
         if (parameterName === 'threshold') {
           advancedBloomFilter.threshold = value;
@@ -27,16 +23,8 @@ namespace gdjs {
           advancedBloomFilter.padding = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/ascii-pixi-filter.ts

@@ -2,31 +2,19 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Ascii',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const asciiFilter = new PIXI.filters.AsciiFilter();
         return asciiFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
         if (parameterName === 'size') {
           asciiFilter.size = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/bevel-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Bevel',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const bevelFilter = new PIXI.filters.BevelFilter();
         return bevelFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
         if (parameterName === 'rotation') {
           bevelFilter.rotation = value;
@@ -26,11 +22,7 @@ namespace gdjs {
           bevelFilter.shadowAlpha = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {
         const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
         if (parameterName === 'lightColor') {
           bevelFilter.lightColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
@@ -43,11 +35,7 @@ namespace gdjs {
           );
         }
       }
-      updateBooleanParameter(
+      updateBooleanParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/black-and-white-pixi-filter.ts

@@ -2,33 +2,21 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'BlackAndWhite',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const colorMatrix = new PIXI.ColorMatrixFilter();
         colorMatrix.blackAndWhite(false);
         return colorMatrix;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const colorMatrix = (filter as unknown) as PIXI.ColorMatrixFilter;
         if (parameterName !== 'opacity') {
           return;
         }
         colorMatrix.alpha = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/blending-mode-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'BlendingMode',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const blendingModeFilter = new PIXI.AlphaFilter();
         return blendingModeFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const blendingModeFilter = (filter as unknown) as PIXI.AlphaFilter;
         if (parameterName === 'alpha') {
           blendingModeFilter.alpha = value;
@@ -19,16 +15,8 @@ namespace gdjs {
           blendingModeFilter.blendMode = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/blur-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Blur',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const blur = new PIXI.BlurFilter();
         return blur;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (
           parameterName !== 'blur' &&
           parameterName !== 'quality' &&
@@ -25,16 +21,8 @@ namespace gdjs {
         }
         filter[parameterName] = value;
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/brightness-pixi-filter.ts

@@ -2,17 +2,13 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Brightness',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const brightness = new PIXI.ColorMatrixFilter();
         brightness.brightness(1, false);
         return brightness;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const brightnessFilter = (filter as unknown) as PIXI.ColorMatrixFilter;
         if (parameterName !== 'brightness') {
           return;
@@ -22,16 +18,8 @@ namespace gdjs {
           false
         );
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/bulge-pinch-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'BulgePinch',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const bulgePinchFilter = new PIXI.filters.BulgePinchFilter();
         return bulgePinchFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const bulgePinchFilter = (filter as unknown) as PIXI.filters.BulgePinchFilter;
         if (parameterName === 'centerX') {
           bulgePinchFilter.center[0] = value;
@@ -27,16 +23,8 @@ namespace gdjs {
           );
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/color-map-pixi-filter.ts

@@ -2,7 +2,7 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'ColorMap',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const colorMapTexture = target
           .getRuntimeScene()
           .getGame()
@@ -19,12 +19,8 @@ namespace gdjs {
         );
         return colorMapFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
         if (parameterName === 'mix') {
           colorMapFilter.mix = gdjs.PixiFiltersTools.clampValue(
@@ -34,16 +30,8 @@ namespace gdjs {
           );
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {
         const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
         if (parameterName === 'nearest') {
           colorMapFilter.nearest = value;

Extensions/Effects/color-replace-pixi-filter.ts

@@ -2,26 +2,18 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'ColorReplace',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const colorReplaceFilter = new PIXI.filters.ColorReplaceFilter();
         return colorReplaceFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter;
         if (parameterName === 'epsilon') {
           colorReplaceFilter.epsilon = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {
         const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter;
         if (parameterName === 'originalColor') {
           colorReplaceFilter.originalColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
@@ -33,11 +25,7 @@ namespace gdjs {
           );
         }
       }
-      updateBooleanParameter(
+      updateBooleanParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/crt-pixi-filter.ts

@@ -9,7 +9,7 @@ namespace gdjs {
         crtFilter._animationTimer = 0;
         return crtFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
+      updatePreRender(filter, target) {
         if (filter.animationSpeed !== 0) {
           // Multiply by 10 so that the default value is a sensible speed
           filter.time +=
@@ -23,11 +23,7 @@ namespace gdjs {
           }
         }
       }
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (parameterName === 'lineWidth') {
           filter.lineWidth = value;
         } else if (parameterName === 'lineContrast') {
@@ -52,16 +48,8 @@ namespace gdjs {
           filter.padding = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {
         if (parameterName === 'verticalLine') {
           filter.verticalLine = value;
         }

Extensions/Effects/displacement-pixi-filter.ts

@@ -2,7 +2,7 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Displacement',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const displacementMapTexture = target
           .getRuntimeScene()
           .getGame()
@@ -15,12 +15,8 @@ namespace gdjs {
         );
         return displacementFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const displacementFilter = (filter as unknown) as PIXI.DisplacementFilter;
         if (parameterName === 'scaleX') {
           displacementFilter.scale.x = value;
@@ -29,16 +25,8 @@ namespace gdjs {
           displacementFilter.scale.y = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/dot-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Dot',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const dotFilter = new PIXI.filters.DotFilter();
         return dotFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const dotFilter = (filter as unknown) as PIXI.filters.DotFilter;
         if (parameterName === 'scale') {
           dotFilter.scale = value;
@@ -19,16 +15,8 @@ namespace gdjs {
           dotFilter.angle = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/drop-shadow-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'DropShadow',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const dropShadowFilter = new PIXI.filters.DropShadowFilter();
         return dropShadowFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const dropShadowFilter = (filter as unknown) as PIXI.filters.DropShadowFilter;
         if (parameterName === 'blur') {
           dropShadowFilter.blur = value;
@@ -27,11 +23,7 @@ namespace gdjs {
           dropShadowFilter.padding = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {
         const dropShadowFilter = (filter as unknown) as PIXI.filters.DropShadowFilter;
         if (parameterName === 'color') {
           dropShadowFilter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
@@ -39,11 +31,7 @@ namespace gdjs {
           );
         }
       }
-      updateBooleanParameter(
+      updateBooleanParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {
         const dropShadowFilter = (filter as unknown) as PIXI.filters.DropShadowFilter;
         if (parameterName === 'shadowOnly') {
           dropShadowFilter.shadowOnly = value;

Extensions/Effects/glitch-pixi-filter.ts

@@ -9,7 +9,7 @@ namespace gdjs {
         glitchFilter._animationTimer = 0;
         return glitchFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
+      updatePreRender(filter, target) {
         if (filter.animationFrequency !== 0) {
           filter._animationTimer += target.getElapsedTime() / 1000;
           if (filter._animationTimer >= 1 / filter.animationFrequency) {
@@ -18,11 +18,7 @@ namespace gdjs {
           }
         }
       }
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (parameterName === 'slices') {
           filter.slices = value;
         } else if (parameterName === 'offset') {
@@ -51,16 +47,8 @@ namespace gdjs {
           filter.animationFrequency = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {
         if (parameterName === 'average') {
           filter.average = value;
         }

Extensions/Effects/glow-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Glow',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const glowFilter = new PIXI.filters.GlowFilter();
         return glowFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const glowFilter = (filter as unknown) as PIXI.filters.GlowFilter;
         if (parameterName === 'innerStrength') {
           glowFilter.innerStrength = value;
@@ -22,21 +18,13 @@ namespace gdjs {
           glowFilter.distance = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {
         const glowFilter = (filter as unknown) as PIXI.filters.GlowFilter;
         if (parameterName === 'color') {
           glowFilter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
         }
       }
-      updateBooleanParameter(
+      updateBooleanParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/godray-pixi-filter.ts

@@ -8,17 +8,13 @@ namespace gdjs {
         const godrayFilter = new PIXI.filters.GodrayFilter();
         return godrayFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
+      updatePreRender(filter, target) {
         if (filter.animationSpeed !== 0) {
           filter.time +=
             (target.getElapsedTime() / 1000) * filter.animationSpeed;
         }
       }
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (parameterName === 'lacunarity') {
           filter.lacunarity = value;
         } else if (parameterName === 'angle') {
@@ -37,16 +33,8 @@ namespace gdjs {
           filter.padding = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {
         if (parameterName === 'parallel') {
           filter.parallel = value;
         }

Extensions/Effects/hsl-adjustment-pixi-filter.ts

@@ -1,43 +0,0 @@
-namespace gdjs {
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'HslAdjustment',
-    new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
-        const hslAdjustmentFilter = new PIXI.filters.HslAdjustmentFilter();
-        return hslAdjustmentFilter;
-      }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
-      updateDoubleParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
-        const hslAdjustmentFilter = filter as PIXI.filters.HslAdjustmentFilter;
-        if (parameterName === 'hue') {
-          hslAdjustmentFilter.hue = value;
-        } else if (parameterName === 'saturation') {
-          hslAdjustmentFilter.saturation = value;
-        } else if (parameterName === 'lightness') {
-          hslAdjustmentFilter.lightness = value;
-        } else if (parameterName === 'alpha') {
-          hslAdjustmentFilter.alpha = value;
-        }
-      }
-      updateStringParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {
-        const hslAdjustmentFilter = filter as PIXI.filters.HslAdjustmentFilter;
-        if (parameterName === 'colorize') {
-          hslAdjustmentFilter.colorize = value;
-        }
-      }
-    })()
-  );
-}

Extensions/Effects/kawase-blur-pixi-filter.ts

@@ -2,37 +2,27 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'KawaseBlur',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const kawaseBlurFilter = new PIXI.filters.KawaseBlurFilter();
         return kawaseBlurFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const kawaseBlurFilter = (filter as unknown) as PIXI.filters.KawaseBlurFilter;
         if (parameterName === 'pixelizeX') {
-          kawaseBlurFilter.pixelSize[0] = value;
+          // @ts-ignore: fix these wrong parameters
+          kawaseBlurFilter.pixelizeX = value;
         } else if (parameterName === 'pixelizeY') {
-          kawaseBlurFilter.pixelSize[1] = value;
+          // @ts-ignore: fix these wrong parameters
+          kawaseBlurFilter.pixelizeY = value;
         } else if (parameterName === 'blur') {
           kawaseBlurFilter.blur = value;
         } else if (parameterName === 'quality') {
           kawaseBlurFilter.quality = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/light-night-pixi-filter.ts

@@ -24,31 +24,19 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'LightNight',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const filter = new gdjs.LightNightPixiFilter();
         return filter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (parameterName !== 'opacity') {
           return;
         }
         filter.uniforms.opacity = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/motion-blur-pixi-filter.ts

@@ -1,40 +0,0 @@
-namespace gdjs {
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'MotionBlur',
-    new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
-        const motionBlurFilter = new PIXI.filters.MotionBlurFilter([0, 0]);
-        return motionBlurFilter;
-      }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
-      updateDoubleParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
-        const motionBlurFilter = filter as PIXI.filters.MotionBlurFilter;
-        if (parameterName === 'velocityX') {
-          // @ts-ignore Using the private member avoids to instantiate Arrays.
-          motionBlurFilter._velocity.x = value;
-        } else if (parameterName === 'velocityY') {
-          // @ts-ignore Using the private member avoids to instantiate Arrays.
-          motionBlurFilter._velocity.y = value;
-        } else if (parameterName === 'kernelSize') {
-          motionBlurFilter.kernelSize = value;
-        } else if (parameterName === 'offset') {
-          motionBlurFilter.offset = value;
-        }
-      }
-      updateStringParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
-    })()
-  );
-}

Extensions/Effects/night-pixi-filter.ts

@@ -28,16 +28,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Night',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const filter = new gdjs.NightPixiFilter();
         return filter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (parameterName !== 'intensity' && parameterName !== 'opacity') {
           return;
         }
@@ -47,16 +43,8 @@ namespace gdjs {
           1
         );
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/noise-pixi-filter.ts

@@ -2,32 +2,20 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Noise',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const noiseFilter = new PIXI.NoiseFilter();
         return noiseFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const noiseFilter = (filter as unknown) as PIXI.NoiseFilter;
         if (parameterName !== 'noise') {
           return;
         }
         noiseFilter.noise = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/old-film-pixi-filter.ts

@@ -9,7 +9,7 @@ namespace gdjs {
         oldFilmFilter._animationTimer = 0;
         return oldFilmFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
+      updatePreRender(filter, target) {
         if (filter.animationFrequency !== 0) {
           filter._animationTimer += target.getElapsedTime() / 1000;
           if (filter._animationTimer >= 1 / filter.animationFrequency) {
@@ -18,11 +18,7 @@ namespace gdjs {
           }
         }
       }
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         if (parameterName === 'sepia') {
           filter.sepia = value;
         } else if (parameterName === 'noise') {
@@ -45,16 +41,8 @@ namespace gdjs {
           filter.animationFrequency = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
+      updateBooleanParameter(filter, parameterName, value) {}
-        parameterName: string,
-        value: string
-      ) {}
-      updateBooleanParameter(
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }

Extensions/Effects/outline-pixi-filter.ts

@@ -2,16 +2,12 @@ namespace gdjs {
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Outline',
     new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
-      makePIXIFilter(target: EffectsTarget, effectData) {
+      makePIXIFilter(target, effectData) {
         const outlineFilter = new PIXI.filters.OutlineFilter();
         return outlineFilter;
       }
-      updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
+      updatePreRender(filter, target) {}
-      updateDoubleParameter(
+      updateDoubleParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: number
-      ) {
         const outlineFilter = (filter as unknown) as PIXI.filters.OutlineFilter;
         if (parameterName === 'thickness') {
           outlineFilter.thickness = value;
@@ -19,11 +15,7 @@ namespace gdjs {
           outlineFilter.padding = value;
         }
       }
-      updateStringParameter(
+      updateStringParameter(filter, parameterName, value) {
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: string
-      ) {
         const outlineFilter = (filter as unknown) as PIXI.filters.OutlineFilter;
         if (parameterName === 'color') {
           outlineFilter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
@@ -31,11 +23,7 @@ namespace gdjs {
           );
         }
       }
-      updateBooleanParameter(
+      updateBooleanParameter(filter, parameterName, value) {}
-        filter: PIXI.Filter,
-        parameterName: string,
-        value: boolean
-      ) {}
     })()
   );
 }