Use top bar on mobile to signify version is checkout

.github/workflows/update-translations.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 16
           cache: "npm"
           cache-dependency-path: "newIDE/app/package-lock.json"
 
@@ -58,7 +58,7 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations

.semaphore/semaphore.yml

@@ -56,7 +56,6 @@ blocks:
         - name: GDJS typing and documentation generation
           commands:
             - checkout
-            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
             - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
             - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
             - cd GDJS

.vscode/tasks.json

@@ -8,7 +8,6 @@
       "group": "build",
       "label": "Start development server",
       "detail": "Starts the GDevelop development server.",
-      "options": { "env": { "NODE_OPTIONS": "--max-old-space-size=8192" } },
       "problemMatcher": [
         {
           "owner": "cra",

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -714,8 +714,6 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
              metadata.GetType() == "model3DResource" ||
-             metadata.GetType() == "atlasResource" ||
-             metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -1281,8 +1281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM1_ on _PARAM0_: _PARAM2_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable?"))
@@ -1297,8 +1297,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1315,8 +1315,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1332,8 +1332,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM2_ for effect _PARAM1_ of _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1347,8 +1347,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM1_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect_black.svg",
-                   "res/actions/effect_black.svg")
+                   "res/actions/effect24.png",
+                   "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .MarkAsSimple()

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -450,8 +450,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -469,8 +469,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -488,8 +488,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -504,8 +504,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
                     _(""),
-                    "res/actions/effect_black.svg",
-                    "res/actions/effect_black.svg")
+                    "res/actions/effect24.png",
+                    "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -518,8 +518,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/actions/effect_black.svg",
-                 "res/actions/effect_black.svg")
+                 "res/actions/effect24.png",
+                 "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")

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

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

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

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

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

@@ -6,6 +6,8 @@
 
 #include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
 #include <vector>
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/String.h"
 
 namespace gd {

Core/GDCore/Extensions/Builtin/SpriteExtension/Animation.h

@@ -4,11 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#ifndef GDCORE_ANIMATION_H
+#define GDCORE_ANIMATION_H
 #include <vector>
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+namespace gd {
+class Direction;
+}
 
 namespace gd {
 
@@ -91,3 +93,4 @@ class GD_CORE_API Animation {
 };
 
 }  // namespace gd
+#endif  // GDCORE_ANIMATION_H

Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.h

@@ -3,12 +3,12 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef GDCORE_DIRECTION_H
+#define GDCORE_DIRECTION_H
 #include <vector>
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 namespace gd {
+class Sprite;
 class SerializerElement;
 }
 
@@ -142,3 +142,4 @@ class GD_CORE_API Direction {
 };
 
 }  // namespace gd
+#endif  // GDCORE_DIRECTION_H

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

@@ -1,157 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
-
-#include <algorithm>
-
-#include "GDCore/CommonTools.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/InitialInstance.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Localization.h"
-
-namespace gd {
-
-Animation SpriteAnimationList::badAnimation;
-
-SpriteAnimationList::SpriteAnimationList()
-    : adaptCollisionMaskAutomatically(true) {}
-
-SpriteAnimationList::~SpriteAnimationList(){};
-
-void SpriteAnimationList::UnserializeFrom(const gd::SerializerElement& element) {
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
-
-  RemoveAllAnimations();
-  const gd::SerializerElement& animationsElement =
-      element.GetChild("animations", 0, "Animations");
-  animationsElement.ConsiderAsArrayOf("animation", "Animation");
-  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
-    const gd::SerializerElement& animationElement =
-        animationsElement.GetChild(i);
-    Animation newAnimation;
-
-    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
-        "useMultipleDirections", false, "typeNormal");
-    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
-
-    // Compatibility with GD <= 3.3
-    if (animationElement.HasChild("Direction")) {
-      for (std::size_t j = 0;
-           j < animationElement.GetChildrenCount("Direction");
-           ++j) {
-        Direction direction;
-        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-    // End of compatibility code
-    else {
-      const gd::SerializerElement& directionsElement =
-          animationElement.GetChild("directions");
-      directionsElement.ConsiderAsArrayOf("direction");
-      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
-        Direction direction;
-        direction.UnserializeFrom(directionsElement.GetChild(j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-
-    AddAnimation(newAnimation);
-  }
-}
-
-void SpriteAnimationList::SerializeTo(gd::SerializerElement& element) const {
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);
-
-  // Animations
-  gd::SerializerElement& animationsElement = element.AddChild("animations");
-  animationsElement.ConsiderAsArrayOf("animation");
-  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
-    gd::SerializerElement& animationElement =
-        animationsElement.AddChild("animation");
-
-    animationElement.SetAttribute("useMultipleDirections",
-                                  GetAnimation(k).useMultipleDirections);
-    animationElement.SetAttribute("name", GetAnimation(k).GetName());
-
-    gd::SerializerElement& directionsElement =
-        animationElement.AddChild("directions");
-    directionsElement.ConsiderAsArrayOf("direction");
-    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
-      GetAnimation(k).GetDirection(l).SerializeTo(
-          directionsElement.AddChild("direction"));
-    }
-  }
-}
-
-void SpriteAnimationList::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
-    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
-      for (std::size_t l = 0;
-           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
-           l++) {
-        worker.ExposeImage(
-            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
-      }
-    }
-  }
-}
-
-const Animation& SpriteAnimationList::GetAnimation(std::size_t nb) const {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
-}
-
-Animation& SpriteAnimationList::GetAnimation(std::size_t nb) {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
-}
-
-void SpriteAnimationList::AddAnimation(const Animation& animation) {
-  animations.push_back(animation);
-}
-
-bool SpriteAnimationList::RemoveAnimation(std::size_t nb) {
-  if (nb >= GetAnimationsCount()) return false;
-
-  animations.erase(animations.begin() + nb);
-  return true;
-}
-
-void SpriteAnimationList::SwapAnimations(std::size_t firstIndex,
-                                  std::size_t secondIndex) {
-  if (firstIndex < animations.size() && secondIndex < animations.size() &&
-      firstIndex != secondIndex)
-    std::swap(animations[firstIndex], animations[secondIndex]);
-}
-
-void SpriteAnimationList::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
-  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
-
-  auto animation = animations[oldIndex];
-  animations.erase(animations.begin() + oldIndex);
-  animations.insert(animations.begin() + newIndex, animation);
-}
-
-}  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h

@@ -1,119 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
-
-namespace gd {
-class InitialInstance;
-class SerializerElement;
-class PropertyDescriptor;
-class ArbitraryResourceWorker;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief A list of animations, containing directions with images and collision mask.
- * 
- * It's used in the configuration of object that implements image-based animations.
- *
- * \see Animation
- * \see Direction
- * \see Sprite
- * \ingroup SpriteObjectExtension
- */
-class GD_CORE_API SpriteAnimationList {
- public:
-  SpriteAnimationList();
-  virtual ~SpriteAnimationList();
-
-  void ExposeResources(gd::ArbitraryResourceWorker& worker);
-
-  /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
-   */
-  const Animation& GetAnimation(std::size_t nb) const;
-
-  /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
-   */
-  Animation& GetAnimation(std::size_t nb);
-
-  /**
-   * \brief Return the number of animations this object has.
-   */
-  std::size_t GetAnimationsCount() const { return animations.size(); };
-
-  /**
-   * \brief Add an animation at the end of the existing ones.
-   */
-  void AddAnimation(const Animation& animation);
-
-  /**
-   * \brief Remove an animation.
-   */
-  bool RemoveAnimation(std::size_t nb);
-
-  /**
-   * \brief Remove all animations.
-   */
-  void RemoveAllAnimations() { animations.clear(); }
-
-  /**
-   * \brief Return true if the object hasn't any animation.
-   */
-  bool HasNoAnimations() const { return animations.empty(); }
-
-  /**
-   * \brief Swap the position of two animations
-   */
-  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
-
-  /**
-   * \brief Change the position of the specified animation
-   */
-  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
-
-  /**
-   * \brief Return a read-only reference to the vector containing all the
-   * animation of the object.
-   */
-  const std::vector<Animation>& GetAllAnimations() const { return animations; }
-
-  /**
-   * @brief Check if the collision mask adapts automatically to the animation.
-   */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
-
-  /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
-
-  void UnserializeFrom(const gd::SerializerElement& element);
-  void SerializeTo(gd::SerializerElement& element) const;
-
- private:
-
-  mutable std::vector<Animation> animations;
-
-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
-};
-
-}  // namespace gd

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

@@ -23,20 +23,88 @@
 
 namespace gd {
 
+Animation SpriteObject::badAnimation;
+
 SpriteObject::SpriteObject()
-    : updateIfNotVisible(false) {}
+    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  animations.UnserializeFrom(element);
+  adaptCollisionMaskAutomatically =
+      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
+
+  RemoveAllAnimations();
+  const gd::SerializerElement& animationsElement =
+      element.GetChild("animations", 0, "Animations");
+  animationsElement.ConsiderAsArrayOf("animation", "Animation");
+  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
+    const gd::SerializerElement& animationElement =
+        animationsElement.GetChild(i);
+    Animation newAnimation;
+
+    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
+        "useMultipleDirections", false, "typeNormal");
+    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
+
+    // Compatibility with GD <= 3.3
+    if (animationElement.HasChild("Direction")) {
+      for (std::size_t j = 0;
+           j < animationElement.GetChildrenCount("Direction");
+           ++j) {
+        Direction direction;
+        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+    // End of compatibility code
+    else {
+      const gd::SerializerElement& directionsElement =
+          animationElement.GetChild("directions");
+      directionsElement.ConsiderAsArrayOf("direction");
+      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
+        Direction direction;
+        direction.UnserializeFrom(directionsElement.GetChild(j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+
+    AddAnimation(newAnimation);
+  }
 }
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  animations.SerializeTo(element);
+  element.SetAttribute("adaptCollisionMaskAutomatically",
+                       adaptCollisionMaskAutomatically);
+
+  // Animations
+  gd::SerializerElement& animationsElement = element.AddChild("animations");
+  animationsElement.ConsiderAsArrayOf("animation");
+  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
+    gd::SerializerElement& animationElement =
+        animationsElement.AddChild("animation");
+
+    animationElement.SetAttribute("useMultipleDirections",
+                                  GetAnimation(k).useMultipleDirections);
+    animationElement.SetAttribute("name", GetAnimation(k).GetName());
+
+    gd::SerializerElement& directionsElement =
+        animationElement.AddChild("directions");
+    directionsElement.ConsiderAsArrayOf("direction");
+    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
+      GetAnimation(k).GetDirection(l).SerializeTo(
+          directionsElement.AddChild("direction"));
+    }
+  }
 }
 
 std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
@@ -59,7 +127,16 @@ bool SpriteObject::UpdateProperty(const gd::String& name,
 }
 
 void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  animations.ExposeResources(worker);
+  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
+    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
+      for (std::size_t l = 0;
+           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
+           l++) {
+        worker.ExposeImage(
+            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
+      }
+    }
+  }
 }
 
 std::map<gd::String, gd::PropertyDescriptor>
@@ -91,12 +168,42 @@ bool SpriteObject::UpdateInitialInstanceProperty(
   return true;
 }
 
-const SpriteAnimationList& SpriteObject::GetAnimations() const {
-  return animations;
+const Animation& SpriteObject::GetAnimation(std::size_t nb) const {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
 }
 
-SpriteAnimationList& SpriteObject::GetAnimations() {
-  return animations;
+Animation& SpriteObject::GetAnimation(std::size_t nb) {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
+}
+
+void SpriteObject::AddAnimation(const Animation& animation) {
+  animations.push_back(animation);
+}
+
+bool SpriteObject::RemoveAnimation(std::size_t nb) {
+  if (nb >= GetAnimationsCount()) return false;
+
+  animations.erase(animations.begin() + nb);
+  return true;
+}
+
+void SpriteObject::SwapAnimations(std::size_t firstIndex,
+                                  std::size_t secondIndex) {
+  if (firstIndex < animations.size() && secondIndex < animations.size() &&
+      firstIndex != secondIndex)
+    std::swap(animations[firstIndex], animations[secondIndex]);
+}
+
+void SpriteObject::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
+
+  auto animation = animations[oldIndex];
+  animations.erase(animations.begin() + oldIndex);
+  animations.insert(animations.begin() + newIndex, animation);
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -4,15 +4,18 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
+#ifndef GDCORE_SPRITEOBJECT_H
+#define GDCORE_SPRITEOBJECT_H
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/Project/Object.h"
-
 namespace gd {
 class InitialInstance;
 class Object;
 class Layout;
+class Sprite;
+class Animation;
 class SerializerElement;
 class PropertyDescriptor;
 }  // namespace gd
@@ -56,15 +59,76 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
                                      gd::Project& project,
                                      gd::Layout& scene) override;
 
-  /**
-   * \brief Return the animation configuration.
+  /** \name Animations
+   * Methods related to animations management
    */
-  const SpriteAnimationList& GetAnimations() const;
+  ///@{
+  /**
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
+   */
+  const Animation& GetAnimation(std::size_t nb) const;
 
   /**
-   * @brief Return the animation configuration.
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
    */
-  SpriteAnimationList& GetAnimations();
+  Animation& GetAnimation(std::size_t nb);
+
+  /**
+   * \brief Return the number of animations this object has.
+   */
+  std::size_t GetAnimationsCount() const { return animations.size(); };
+
+  /**
+   * \brief Add an animation at the end of the existing ones.
+   */
+  void AddAnimation(const Animation& animation);
+
+  /**
+   * \brief Remove an animation.
+   */
+  bool RemoveAnimation(std::size_t nb);
+
+  /**
+   * \brief Remove all animations.
+   */
+  void RemoveAllAnimations() { animations.clear(); }
+
+  /**
+   * \brief Return true if the object hasn't any animation.
+   */
+  bool HasNoAnimations() const { return animations.empty(); }
+
+  /**
+   * \brief Swap the position of two animations
+   */
+  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
+
+  /**
+   * \brief Change the position of the specified animation
+   */
+  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
+
+  /**
+   * \brief Return a read-only reference to the vector containing all the
+   * animation of the object.
+   */
+  const std::vector<Animation>& GetAllAnimations() const { return animations; }
+
+  /**
+   * @brief Check if the collision mask adapts automatically to the animation.
+   */
+  bool AdaptCollisionMaskAutomatically() const {
+    return adaptCollisionMaskAutomatically;
+  }
+
+  /**
+   * @brief Set if the collision mask adapts automatically to the animation.
+   */
+  void SetAdaptCollisionMaskAutomatically(bool enable) {
+    adaptCollisionMaskAutomatically = enable;
+  }
 
   /**
    * \brief Set if the object animation should be played even if the object is
@@ -79,17 +143,25 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
    * is hidden or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
+  ///@}
 
  private:
   void DoUnserializeFrom(gd::Project& project,
                          const gd::SerializerElement& element) override;
   void DoSerializeTo(gd::SerializerElement& element) const override;
 
-  SpriteAnimationList animations;
-
+  mutable std::vector<Animation> animations;
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
                             ///< object animation even if hidden or far from
                             ///< the screen.
+
+  static Animation badAnimation;         //< Bad animation when an out of bound
+                                         // animation is requested.
+  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
+                                         ///< mask will be automatically
+                                         ///< adapted to the animation of the
+                                         ///< object.
 };
 
 }  // namespace gd
+#endif  // GDCORE_SPRITEOBJECT_H

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -114,8 +114,6 @@ public:
 
   /**
    * \brief Erase any existing include file and add the specified include.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   virtual AbstractFunctionMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -13,15 +13,12 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
 #include "GDCore/Tools/Log.h"
 
 namespace gd {
 
-const std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::badProperties;
-
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace_,
     const gd::String& nameWithNamespace,
@@ -50,14 +47,8 @@ BehaviorMetadata::BehaviorMetadata(
         "BehaviorMetadata is valid for: " + nameWithNamespace);
   }
 
-  if (instance) {
-    instance->SetTypeName(nameWithNamespace);
-    instance->InitializeContent();
-  }
-  if (sharedDatasInstance) {
-    sharedDatasInstance->SetTypeName(nameWithNamespace);
-    sharedDatasInstance->InitializeContent();
-  }
+  if (instance) instance->SetTypeName(nameWithNamespace);
+  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddCondition(
@@ -414,30 +405,10 @@ gd::Behavior& BehaviorMetadata::Get() const {
   return *instance;
 }
 
-std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetProperties() const {
-  if (!instance) {
-    return badProperties;
-  }
-  // TODO Properties should be declared on BehaviorMetadata directly.
-  // - Add 2 `properties` members (one for shared properties)
-  // - Add methods to declare new properties
-  return instance->GetProperties();
-}
-
 gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
   return sharedDatasInstance.get();
 }
 
-std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetSharedProperties() const {
-  if (!sharedDatasInstance) {
-    return badProperties;
-  }
-  // TODO Properties should be declared on BehaviorMetadata directly.
-  // - Add 2 `properties` members (one for shared properties)
-  // - Add methods to declare new properties
-  return sharedDatasInstance->GetProperties();
-}
-
 const std::vector<gd::String>& BehaviorMetadata::GetRequiredBehaviorTypes() const {
   requiredBehaviors.clear();
   for (auto& property : Get().GetProperties()) {

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -18,7 +18,6 @@ class BehaviorsSharedData;
 class MultipleInstructionMetadata;
 class InstructionMetadata;
 class ExpressionMetadata;
-class PropertyDescriptor;
 }  // namespace gd
 
 namespace gd {
@@ -205,8 +204,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
@@ -305,15 +302,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::Behavior& Get() const;
 
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of the
-   * behavior.
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
-
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
    * shared data, if any (nullptr if none).
@@ -323,15 +311,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::BehaviorsSharedData* GetSharedDataInstance() const;
 
-  /**
-   * \brief Called when the IDE wants to know about the custom shared properties
-   * of the behavior.
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  std::map<gd::String, gd::PropertyDescriptor> GetSharedProperties() const;
-
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
@@ -378,8 +357,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;
   std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance;
-
-  static const std::map<gd::String, gd::PropertyDescriptor> badProperties;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -65,8 +65,6 @@ class GD_CORE_API EffectMetadata {
 
   /**
    * \brief Clear any existing include file and add the specified include file.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   EffectMetadata& SetIncludeFile(const gd::String& includeFile);
 

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -50,11 +50,11 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
         gd::ParameterMetadata::IsBehavior(type))
                // Prefix with the namespace if it's not already there.
                && (supplementaryInformation.find(
-                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
-           ? (supplementaryInformation.empty()
+                       PlatformExtension::GetNamespaceSeparator()) != gd::String::npos)
+           ? supplementaryInformation
+           : (supplementaryInformation.empty()
                   ? ""
-                  : extensionNamespace + supplementaryInformation)
-           : supplementaryInformation));
+                  : extensionNamespace + supplementaryInformation)));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -288,8 +288,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   ExpressionMetadata& SetIncludeFile(
       const gd::String& includeFile) override {

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -68,11 +68,11 @@ InstructionMetadata& InstructionMetadata::AddParameter(
         gd::ParameterMetadata::IsBehavior(type))
                // Prefix with the namespace if it's not already there.
                && (supplementaryInformation.find(
-                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
-           ? (supplementaryInformation.empty()
+                       PlatformExtension::GetNamespaceSeparator()) != gd::String::npos)
+           ? supplementaryInformation
+           : (supplementaryInformation.empty()
                   ? ""
-                  : extensionNamespace + supplementaryInformation)
-           : supplementaryInformation));
+                  : extensionNamespace + supplementaryInformation)));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -494,8 +494,6 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   InstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     codeExtraInformation.includeFiles.clear();

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -142,8 +142,6 @@ public:
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   virtual InstructionOrExpressionContainerMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -150,10 +150,6 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  /**
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
-   */
   MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     if (expression)
       expression->SetIncludeFile(includeFile);

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -264,8 +264,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
 

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

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

Core/GDCore/Extensions/PlatformExtension.h

@@ -285,6 +285,22 @@ class GD_CORE_API PlatformExtension {
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
 
+  /**
+   * \brief Declare a new events based behavior as being part of the extension.
+   *
+   * \param name The name of the behavior
+   * \param fullname The user friendly name of the behavior
+   * \param description The user friendly description of the behavior
+   * \param group The behavior category label
+   * \param icon The icon of the behavior.
+   */
+  gd::BehaviorMetadata& AddEventsBasedBehavior(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& group_,
+      const gd::String& icon_);
+
   /**
    * \brief Declare a new effect as being part of the extension.
    * \param name The internal name of the effect (also called effect type).

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -86,10 +86,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitOperatorNode(OperatorNode& node) override {
     ReportAnyError(node);
 
-    // The "required" type ("parentType")  will be used when visiting the first operand.
-    // Note that it may be refined thanks to this first operand (see later).
     node.leftHandSide->Visit(*this);
-    const Type leftType = childType; // Store the type of the first operand.
+    const Type leftType = childType;
 
     if (leftType == Type::Number) {
       if (node.op == ' ') {
@@ -122,19 +120,15 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
             node.rightHandSide->location);
     }
 
-    // The "required" type ("parentType") of the second operator is decided by:
-    // - the parent type. Unless it can (`number|string`) or should (`unknown`) be refined, then:
-    // - the first operand.
-    parentType = ShouldTypeBeRefined(parentType) ? leftType : parentType;
+    parentType = leftType;
     node.rightHandSide->Visit(*this);
     const Type rightType = childType;
 
-    // The type of the overall operator ("childType") is decided by:
-    // - the parent type. Unless it can (`number|string`) or should (`unknown`) be refined, then:
-    // - the first operand. Unless it can (`number|string`) or should (`unknown`) be refined, then:
-    // - the right operand (which got visited knowing the type of the first operand, so it's
+    // The type is decided by the first operand, unless it can (`number|string`)
+    // or should (`unknown`) be refined, in which case we go for the right
+    // operand (which got visited knowing the type of the first operand, so it's
     // equal or strictly more precise than the left operand).
-    childType = ShouldTypeBeRefined(parentType) ? (ShouldTypeBeRefined(leftType) ? leftType : rightType) : parentType;
+    childType = (leftType == Type::Unknown || leftType == Type::NumberOrString) ? leftType : rightType;
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
     ReportAnyError(node);
@@ -401,10 +395,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     }
   }
 
-  static bool ShouldTypeBeRefined(Type type) {
-    return (type == Type::Unknown || type == Type::NumberOrString);
-  }
-
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;

Core/GDCore/IDE/Events/ExpressionVariableParentFinder.h

@@ -39,8 +39,7 @@ struct VariableAndItsParent {
 };
 
 /**
- * \brief Find the last parent (i.e: the variables container) of a node
- * representing a variable.
+ * \brief Find the last parent (i.e: the variables container) of a node representing a variable.
  *
  * Useful for completions, to know which variables can be entered in a node.
  *
@@ -49,12 +48,13 @@ struct VariableAndItsParent {
 class GD_CORE_API ExpressionVariableParentFinder
     : public ExpressionParser2NodeWorker {
  public:
+
   static VariableAndItsParent GetLastParentOfNode(
       const gd::Platform& platform,
       const gd::ProjectScopedContainers& projectScopedContainers,
       gd::ExpressionNode& node) {
-    gd::ExpressionVariableParentFinder typeFinder(platform,
-                                                  projectScopedContainers);
+    gd::ExpressionVariableParentFinder typeFinder(
+        platform, projectScopedContainers);
     node.Visit(typeFinder);
     return typeFinder.variableAndItsParent;
   }
@@ -70,8 +70,7 @@ class GD_CORE_API ExpressionVariableParentFinder
         variableNode(nullptr),
         thisIsALegacyPrescopedVariable(false),
         bailOutBecauseEmptyVariableName(false),
-        legacyPrescopedVariablesContainer(nullptr),
-        variableAndItsParent{} {};
+        legacyPrescopedVariablesContainer(nullptr){};
 
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {}
   void OnVisitOperatorNode(OperatorNode& node) override {}
@@ -136,10 +135,10 @@ class GD_CORE_API ExpressionVariableParentFinder
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     if (node.name.empty() && node.child) {
-      // A variable accessor should always have a name if it has a child (i.e:
-      // another accessor). While the parser may have generated an empty name,
-      // flag this so we avoid finding a wrong parent (and so, run the risk of
-      // giving wrong autocompletions).
+      // A variable accessor should always have a name if it has a child (i.e: another accessor).
+      // While the parser may have generated an empty name,
+      // flag this so we avoid finding a wrong parent (and so, run the risk of giving
+      // wrong autocompletions).
       bailOutBecauseEmptyVariableName = true;
     }
     childVariableNames.insert(childVariableNames.begin(), node.name);
@@ -301,8 +300,7 @@ class GD_CORE_API ExpressionVariableParentFinder
       const std::vector<gd::String>& childVariableNames,
       size_t startIndex = 0) {
     if (bailOutBecauseEmptyVariableName)
-      return {};  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
+      return {}; // Do not even attempt to find the parent if we had an issue when visiting nodes.
 
     const gd::Variable* currentVariable = &variable;
 
@@ -334,8 +332,8 @@ class GD_CORE_API ExpressionVariableParentFinder
       }
     }
 
-    // Return the last parent of the chain of variables (so not the last
-    // variable but the one before it).
+    // Return the last parent of the chain of variables (so not the last variable
+    // but the one before it).
     return {.parentVariable = currentVariable};
   }
 
@@ -343,16 +341,14 @@ class GD_CORE_API ExpressionVariableParentFinder
       const gd::VariablesContainer& variablesContainer,
       const std::vector<gd::String>& childVariableNames) {
     if (bailOutBecauseEmptyVariableName)
-      return {};  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
+      return {}; // Do not even attempt to find the parent if we had an issue when visiting nodes.
     if (childVariableNames.empty())
       return {};  // There is no "parent" to the variables container itself.
 
     const gd::String& firstChildName = *childVariableNames.begin();
 
-    const gd::Variable* variable = variablesContainer.Has(firstChildName)
-                                       ? &variablesContainer.Get(firstChildName)
-                                       : nullptr;
+    const gd::Variable* variable = variablesContainer.Has(firstChildName) ?
+      &variablesContainer.Get(firstChildName) : nullptr;
     if (childVariableNames.size() == 1 || !variable)
       return {// Only one child: the parent is the variables container itself.
               .parentVariablesContainer = &variablesContainer};

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -1,111 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "ObjectAssetSerializer.h"
-
-#include <algorithm>
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
-#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Project/AssetResourcePathCleaner.h"
-#include "GDCore/IDE/Project/ResourcesInUseHelper.h"
-#include "GDCore/IDE/Project/ResourcesRenamer.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/CustomBehavior.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-gd::String
-ObjectAssetSerializer::GetObjectExtensionName(const gd::Object &object) {
-  const gd::String &type = object.GetType();
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  return separatorIndex != std::string::npos ? type.substr(0, separatorIndex)
-                                             : "";
-}
-
-void ObjectAssetSerializer::SerializeTo(
-    gd::Project &project, const gd::Object &object,
-    const gd::String &objectFullName, SerializerElement &element,
-    std::vector<gd::String> &usedResourceNames) {
-  auto cleanObject = object.Clone();
-  cleanObject->GetVariables().Clear();
-  cleanObject->GetEffects().Clear();
-  for (auto &&behaviorName : cleanObject->GetAllBehaviorNames()) {
-    cleanObject->RemoveBehavior(behaviorName);
-  }
-
-  gd::String extensionName = GetObjectExtensionName(*cleanObject);
-
-  element.SetAttribute("id", "");
-  element.SetAttribute("name", "");
-  element.SetAttribute("license", "");
-  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
-    auto &extension = project.GetEventsFunctionsExtension(extensionName);
-    element.SetAttribute("description", extension.GetShortDescription());
-  }
-  element.SetAttribute("gdevelopVersion", "");
-  element.SetAttribute("version", "");
-  element.SetIntAttribute("animationsCount", 1);
-  element.SetIntAttribute("maxFramesCount", 1);
-  // TODO Find the right object dimensions.
-  element.SetIntAttribute("width", 0);
-  element.SetIntAttribute("height", 0);
-  SerializerElement &authorsElement = element.AddChild("authors");
-  authorsElement.ConsiderAsArrayOf("author");
-  SerializerElement &tagsElement = element.AddChild("tags");
-  tagsElement.ConsiderAsArrayOf("tag");
-
-  SerializerElement &objectAssetsElement = element.AddChild("objectAssets");
-  objectAssetsElement.ConsiderAsArrayOf("objectAsset");
-  SerializerElement &objectAssetElement =
-      objectAssetsElement.AddChild("objectAsset");
-
-  cleanObject->SerializeTo(objectAssetElement.AddChild("object"));
-
-  SerializerElement &resourcesElement =
-      objectAssetElement.AddChild("resources");
-  resourcesElement.ConsiderAsArrayOf("resource");
-  auto &resourcesManager = project.GetResourcesManager();
-  gd::ResourcesInUseHelper resourcesInUse(resourcesManager);
-  cleanObject->GetConfiguration().ExposeResources(resourcesInUse);
-  for (auto &&resourceName : resourcesInUse.GetAllResources()) {
-    if (resourceName.length() == 0) {
-      continue;
-    }
-    usedResourceNames.push_back(resourceName);
-    auto &resource = resourcesManager.GetResource(resourceName);
-    SerializerElement &resourceElement = resourcesElement.AddChild("resource");
-    resource.SerializeTo(resourceElement);
-    resourceElement.SetAttribute("kind", resource.GetKind());
-    resourceElement.SetAttribute("name", resource.GetName());
-  }
-
-  SerializerElement &requiredExtensionsElement =
-      objectAssetElement.AddChild("requiredExtensions");
-  requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
-  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
-    SerializerElement &requiredExtensionElement =
-        requiredExtensionsElement.AddChild("requiredExtension");
-    requiredExtensionElement.SetAttribute("extensionName", extensionName);
-    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
-  }
-
-  // TODO This can be removed when the asset script no longer require it.
-  SerializerElement &customizationElement =
-      objectAssetElement.AddChild("customization");
-  customizationElement.ConsiderAsArrayOf("empty");
-}
-} // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.h

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

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -52,16 +52,6 @@ void ArbitraryResourceWorker::ExposeModel3D(gd::String& resourceName){
     // do.
 };
 
-void ArbitraryResourceWorker::ExposeAtlas(gd::String& resourceName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
-void ArbitraryResourceWorker::ExposeSpine(gd::String& resourceName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
 void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
     // Nothing to do by default - each child class can define here the action to
     // do.
@@ -130,7 +120,6 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
 
           gd::String potentiallyUpdatedTargetResourceName = targetResourceName;
           ExposeResourceWithType(targetResource.GetKind(), potentiallyUpdatedTargetResourceName);
-          ExposeEmbeddeds(potentiallyUpdatedTargetResourceName);
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
             // The resource name was renamed. Also update the mapping.
@@ -187,14 +176,6 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
     ExposeVideo(resourceName);
     return;
   }
-  if (resourceType == "atlas") {
-    ExposeAtlas(resourceName);
-    return;
-  }
-  if (resourceType == "spine") {
-    ExposeSpine(resourceName);
-    return;
-  }
   gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
   return;
 }
@@ -263,14 +244,6 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeModel3D(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
-        } else if (parameterMetadata.GetType() == "atlasResource") {
-          gd::String updatedParameterValue = parameterValue;
-          worker.ExposeAtlas(updatedParameterValue);
-          instruction.SetParameter(parameterIndex, updatedParameterValue);
-        } else if (parameterMetadata.GetType() == "spineResource") {
-          gd::String updatedParameterValue = parameterValue;
-          worker.ExposeSpine(updatedParameterValue);
-          instruction.SetParameter(parameterIndex, updatedParameterValue);
         }
       });
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -96,16 +96,6 @@ public:
    * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
    */
   virtual void ExposeModel3D(gd::String &resourceName);
-  
-  /**
-   * \brief Expose an atlas, which is always a reference to a "atlas" resource.
-   */
-  virtual void ExposeAtlas(gd::String &resourceName);
-
-  /**
-   * \brief Expose an spine, which is always a reference to a "spine" resource.
-   */
-  virtual void ExposeSpine(gd::String &resourceName);
 
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
@@ -133,15 +123,14 @@ public:
    */
   virtual void ExposeEmbeddeds(gd::String &resourceName);
 
-protected:
-  gd::ResourcesManager * resourcesManager;
-
  private:
   /**
    * \brief Expose a resource: resources that have a file are
    * exposed as file (see ExposeFile).
    */
   void ExposeResource(gd::Resource &resource);
+
+  gd::ResourcesManager * resourcesManager;
 };
 
 /**

Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp

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

Core/GDCore/IDE/Project/AssetResourcePathCleaner.h

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

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h

@@ -79,12 +79,6 @@ public:
   virtual void ExposeModel3D(gd::String& otherResourceName) override {
     MatchResourceName(otherResourceName);
   };
-  virtual void ExposeAtlas(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
-  virtual void ExposeSpine(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
 
   void MatchResourceName(gd::String& otherResourceName) {
     if (otherResourceName == resourceName) matchesResourceName = true;

Core/GDCore/IDE/Project/ProjectResourcesCopier.h

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

Core/GDCore/IDE/Project/ResourcesInUseHelper.cpp

@@ -1,25 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "ResourcesInUseHelper.h"
-
-namespace gd {
-
-const std::vector<gd::String> ResourcesInUseHelper::resourceTypes = {
-    "image",   "audio", "font",       "json",   "tilemap",
-    "tileset", "video", "bitmapFont", "model3D"};
-
-const std::vector<gd::String> &ResourcesInUseHelper::GetAllResources() {
-  allResources.clear();
-  for (auto &&resourceType : gd::ResourcesInUseHelper::resourceTypes) {
-    for (auto &&resourceName : GetAll(resourceType)) {
-      allResources.push_back(resourceName);
-    }
-  }
-  return allResources;
-}
-
-} // namespace gd

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

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

Core/GDCore/IDE/Project/ResourcesMergingHelper.cpp

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

Core/GDCore/IDE/Project/ResourcesMergingHelper.h

@@ -64,25 +64,19 @@ public:
    * the Base Directory.
    */
   std::map<gd::String, gd::String>& GetAllResourcesOldAndNewFilename() {
-    return newFilenames;
+    return oldFilenames;
   };
 
   /**
    * Resources merging helper collects all resources filenames and update these
    * filenames.
    */
-  void ExposeFile(gd::String& resource) override;
+  virtual void ExposeFile(gd::String& resource) override;
 
  protected:
   void SetNewFilename(gd::String oldFilename, gd::String newFilename);
 
-  /**
-   * Original file names that can be accessed by their new name.
-   */
   std::map<gd::String, gd::String> oldFilenames;
-  /**
-   * New file names that can be accessed by their original name.
-   */
   std::map<gd::String, gd::String> newFilenames;
   gd::String baseDirectory;
   bool preserveDirectoriesStructure;  ///< If set to true, the directory

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -65,12 +65,6 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeModel3D(gd::String& resourceName) override {
     RenameIfNeeded(resourceName);
   };
-  virtual void ExposeAtlas(gd::String& resourceName) override {
-    RenameIfNeeded(resourceName);
-  };
-  virtual void ExposeSpine(gd::String& resourceName) override {
-    RenameIfNeeded(resourceName);
-  };
 
  private:
   void RenameIfNeeded(gd::String& resourceName) {

Core/GDCore/IDE/Project/SceneResourcesFinder.h

@@ -80,12 +80,6 @@ private:
   void ExposeModel3D(gd::String &resourceName) override {
     AddUsedResource(resourceName);
   };
-  void ExposeAtlas(gd::String &resourceName) override {
-    AddUsedResource(resourceName);
-  };
-  void ExposeSpine(gd::String &resourceName) override {
-    AddUsedResource(resourceName);
-  };
 
   std::set<gd::String> resourceNames;
 };

Core/GDCore/IDE/WholeProjectRefactorer.cpp

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

Core/GDCore/Project/Behavior.cpp

@@ -4,6 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Project/Behavior.h"
+#include <iostream>
+#include "GDCore/Project/PropertyDescriptor.h"
 
 namespace gd {
 

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -13,14 +13,12 @@
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Log.h"
 #include "GDCore/Project/CustomConfigurationHelper.h"
-#include "GDCore/Project/InitialInstance.h"
 
 using namespace gd;
 
 void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
   project = objectConfiguration.project;
   objectContent = objectConfiguration.objectContent;
-  animations = objectConfiguration.animations;
 
   // There is no default copy for a map of unique_ptr like childObjectConfigurations.
   childObjectConfigurations.clear();
@@ -90,38 +88,23 @@ bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
 
 std::map<gd::String, gd::PropertyDescriptor>
 CustomObjectConfiguration::GetInitialInstanceProperties(
-    const gd::InitialInstance &initialInstance, gd::Project &project,
-    gd::Layout &scene) {
-  std::map<gd::String, gd::PropertyDescriptor> properties;
-  if (!animations.HasNoAnimations()) {
-    properties["animation"] =
-        gd::PropertyDescriptor(
-            gd::String::From(initialInstance.GetRawDoubleProperty("animation")))
-            .SetLabel(_("Animation"))
-            .SetType("number");
-  }
-  return properties;
+    const gd::InitialInstance& instance,
+    gd::Project& project,
+    gd::Layout& scene) {
+  return std::map<gd::String, gd::PropertyDescriptor>();
 }
 
 bool CustomObjectConfiguration::UpdateInitialInstanceProperty(
-    gd::InitialInstance &initialInstance, const gd::String &name,
-    const gd::String &value, gd::Project &project, gd::Layout &scene) {
-  if (name == "animation") {
-    initialInstance.SetRawDoubleProperty(
-        "animation", std::max(0, value.empty() ? 0 : value.To<int>()));
-  }
-
-  return true;
+    gd::InitialInstance& instance,
+    const gd::String& name,
+    const gd::String& value,
+    gd::Project& project,
+    gd::Layout& scene) {
+  return false;
 }
 
 void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const {
   element.AddChild("content") = objectContent;
-
-  if (!animations.HasNoAnimations()) {
-    auto &animatableElement = element.AddChild("animatable");
-    animations.SerializeTo(animatableElement);
-  }
-
   auto &childrenContentElement = element.AddChild("childrenContent");
   for (auto &pair : childObjectConfigurations) {
     auto &childName = pair.first;
@@ -133,12 +116,6 @@ void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const
 void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
                                                const SerializerElement& element) {
   objectContent = element.GetChild("content");
-
-  if (element.HasChild("animatable")) {
-    auto &animatableElement = element.GetChild("animatable");
-    animations.UnserializeFrom(animatableElement);
-  }
-
   auto &childrenContentElement = element.GetChild("childrenContent");
   for (auto &pair : childrenContentElement.GetAllChildren()) {
     auto &childName = pair.first;
@@ -149,8 +126,6 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
 }
 
 void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  animations.ExposeResources(worker);
-
   std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
 
   for (auto& property : properties) {
@@ -180,10 +155,6 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
         worker.ExposeBitmapFont(newPropertyValue);
       } else if (resourceType == "model3D") {
         worker.ExposeModel3D(newPropertyValue);
-      } else if (resourceType == "atlas") {
-        worker.ExposeAtlas(newPropertyValue);
-      } else if (resourceType == "spine") {
-        worker.ExposeSpine(newPropertyValue);
       }
 
       if (newPropertyValue != oldPropertyValue) {
@@ -203,11 +174,3 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
     configuration.ExposeResources(worker);
   }
 }
-
-const SpriteAnimationList& CustomObjectConfiguration::GetAnimations() const {
-  return animations;
-}
-
-SpriteAnimationList& CustomObjectConfiguration::GetAnimations() {
-  return animations;
-}

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_CUSTOMOBJECTCONFIGURATION_H
+#define GDCORE_CUSTOMOBJECTCONFIGURATION_H
 
 #include "GDCore/Project/ObjectConfiguration.h"
 
@@ -15,7 +16,7 @@
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
+
 
 using namespace gd;
 
@@ -71,17 +72,7 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
 
   gd::ObjectConfiguration &GetChildObjectConfiguration(const gd::String& objectName);
 
-  /**
-   * \brief Return the animation configuration for Animatable custom objects.
-   */
-  const SpriteAnimationList& GetAnimations() const;
-
-  /**
-   * @brief Return the animation configuration for Animatable custom objects.
-   */
-  SpriteAnimationList& GetAnimations();
-
-protected:
+ protected:
   void DoSerializeTo(SerializerElement& element) const override;
   void DoUnserializeFrom(Project& project, const SerializerElement& element) override;
 
@@ -93,8 +84,6 @@ protected:
 
   static gd::ObjectConfiguration badObjectConfiguration;
 
-  SpriteAnimationList animations;
-
   /**
    * Initialize configuration using another configuration. Used by copy-ctor
    * and assign-op.
@@ -106,5 +95,6 @@ protected:
    */
   void Init(const gd::CustomObjectConfiguration& object);
 };
-
 }  // namespace gd
+
+#endif  // GDCORE_CUSTOMOBJECTCONFIGURATION_H

Core/GDCore/Project/EventsBasedObject.cpp

@@ -13,10 +13,7 @@ EventsBasedObject::EventsBasedObject()
     : AbstractEventsBasedEntity(
         "MyObject",
         gd::EventsFunctionsContainer::FunctionOwner::Object),
-    ObjectsContainer(),
-    isRenderedIn3D(false),
-    isAnimatable(false),
-    isTextContainer(false) {
+    ObjectsContainer() {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
@@ -33,12 +30,6 @@ void EventsBasedObject::SerializeTo(SerializerElement& element) const {
   if (isRenderedIn3D) {
     element.SetBoolAttribute("is3D", true);
   }
-  if (isAnimatable) {
-    element.SetBoolAttribute("isAnimatable", true);
-  }
-  if (isTextContainer) {
-    element.SetBoolAttribute("isTextContainer", true);
-  }
 
   AbstractEventsBasedEntity::SerializeTo(element);
   SerializeObjectsTo(element.AddChild("objects"));
@@ -49,8 +40,6 @@ void EventsBasedObject::UnserializeFrom(gd::Project& project,
                                         const SerializerElement& element) {
   defaultName = element.GetStringAttribute("defaultName");
   isRenderedIn3D = element.GetBoolAttribute("is3D", false);
-  isAnimatable = element.GetBoolAttribute("isAnimatable", false);
-  isTextContainer = element.GetBoolAttribute("isTextContainer", false);
 
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   UnserializeObjectsFrom(project, element.GetChild("objects"));

Core/GDCore/Project/EventsBasedObject.h

@@ -85,32 +85,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
    */
   bool IsRenderedIn3D() const { return isRenderedIn3D; }
 
-  /**
-   * \brief Declare an Animatable capability.
-   */
-  EventsBasedObject& MarkAsAnimatable(bool isAnimatable_) {
-    isAnimatable = isAnimatable_;
-    return *this;
-  }
-
-  /**
-   * \brief Return true if the object needs an Animatable capability.
-   */
-  bool IsAnimatable() const { return isAnimatable; }
-
-  /**
-   * \brief Declare a TextContainer capability.
-   */
-  EventsBasedObject& MarkAsTextContainer(bool isTextContainer_) {
-    isTextContainer = isTextContainer_;
-    return *this;
-  }
-
-  /**
-   * \brief Return true if the object needs a TextContainer capability.
-   */
-  bool IsTextContainer() const { return isTextContainer; }
-
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,
@@ -119,8 +93,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
  private:
   gd::String defaultName;
   bool isRenderedIn3D;
-  bool isAnimatable;
-  bool isTextContainer;
 };
 
 }  // namespace gd

Core/GDCore/Project/InitialInstance.cpp

@@ -15,7 +15,7 @@
 
 namespace gd {
 
-gd::String* InitialInstance::badStringPropertyValue = NULL;
+gd::String* InitialInstance::badStringProperyValue = NULL;
 
 InitialInstance::InitialInstance()
     : objectName(""),
@@ -34,7 +34,6 @@ InitialInstance::InitialInstance()
       depth(0),
       locked(false),
       sealed(false),
-      keepRatio(true),
       persistentUuid(UUID::MakeUuid4()) {}
 
 void InitialInstance::UnserializeFrom(const SerializerElement& element) {
@@ -59,7 +58,6 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
   SetLayer(element.GetStringAttribute("layer"));
   SetLocked(element.GetBoolAttribute("locked", false));
   SetSealed(element.GetBoolAttribute("sealed", false));
-  SetShouldKeepRatio(element.GetBoolAttribute("keepRatio", false));
 
   persistentUuid = element.GetStringAttribute("persistentUuid");
   if (persistentUuid.empty()) ResetPersistentUuid();
@@ -122,7 +120,6 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   if (HasCustomDepth()) element.SetAttribute("depth", GetCustomDepth());
   if (IsLocked()) element.SetAttribute("locked", IsLocked());
   if (IsSealed()) element.SetAttribute("sealed", IsSealed());
-  if (ShouldKeepRatio()) element.SetAttribute("keepRatio", ShouldKeepRatio());
 
   if (persistentUuid.empty()) persistentUuid = UUID::MakeUuid4();
   element.SetStringAttribute("persistentUuid", persistentUuid);
@@ -191,10 +188,10 @@ double InitialInstance::GetRawDoubleProperty(const gd::String& name) const {
 
 const gd::String& InitialInstance::GetRawStringProperty(
     const gd::String& name) const {
-  if (!badStringPropertyValue) badStringPropertyValue = new gd::String("");
+  if (!badStringProperyValue) badStringProperyValue = new gd::String("");
 
   const auto& it = stringProperties.find(name);
-  return it != stringProperties.end() ? it->second : *badStringPropertyValue;
+  return it != stringProperties.end() ? it->second : *badStringProperyValue;
 }
 
 void InitialInstance::SetRawDoubleProperty(const gd::String& name,

Core/GDCore/Project/InitialInstance.h

@@ -206,17 +206,6 @@ class GD_CORE_API InitialInstance {
    */
   void SetSealed(bool enable = true) { sealed = enable; }
 
-  /**
-   * \brief Return true if the dimensions (width, height and depth) should keep
-   * the same ratio.
-   */
-  bool ShouldKeepRatio() const { return keepRatio; };
-
-  /**
-   * \brief Define if instance's dimensions should keep the same ratio.
-   */
-  void SetShouldKeepRatio(bool enable = true) { keepRatio = enable; }
-
   ///@}
 
   /** \name Variable management
@@ -351,13 +340,11 @@ class GD_CORE_API InitialInstance {
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
   bool sealed;                              ///< True if the instance is sealed
-  bool keepRatio;                           ///< True if the instance's dimensions
-                                            ///  should keep the same ratio.
   mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,
-                                      ///  useful for hot reloading.
+                                      ///< useful for hot reloading.
 
   static gd::String*
-      badStringPropertyValue;  ///< Empty string returned by GetRawStringProperty
+      badStringProperyValue;  ///< Empty string returned by GetRawStringProperty
 };
 
 }  // namespace gd

Core/GDCore/Project/Layer.cpp

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

Core/GDCore/Project/Layer.h

@@ -104,17 +104,10 @@ class GD_CORE_API Layer {
   const gd::String& GetName() const { return name; }
 
   const gd::String& GetRenderingType() const { return renderingType; }
-
   void SetRenderingType(const gd::String& renderingType_) {
     renderingType = renderingType_;
   }
 
-  const gd::String& GetCameraType() const { return cameraType; }
-
-  void SetCameraType(const gd::String& cameraType_) {
-    cameraType = cameraType_;
-  }
-
   /**
    * \brief Change if layer is displayed or not
    */
@@ -275,7 +268,6 @@ class GD_CORE_API Layer {
   gd::String name;           ///< The name of the layer
   gd::String renderingType;  ///< The rendering type: "" (empty), "2d", "3d" or
                              ///< "2d+3d".
-  gd::String cameraType;
   bool isVisible;            ///< True if the layer is visible
   bool isLocked;             ///< True if the layer is locked
   bool isLightingLayer;  ///< True if the layer is used to display lights and

Core/GDCore/Project/Object.h

@@ -120,6 +120,9 @@ class GD_CORE_API Object {
    */
   const gd::String& GetType() const { return configuration->GetType(); }
 
+  /** \brief Shortcut to check if the object is a 3D object.
+   */
+  bool Is3DObject() const { return configuration->Is3DObject(); }
   ///@}
 
   /** \name Behaviors management

Core/GDCore/Project/ObjectConfiguration.cpp

@@ -5,8 +5,11 @@
  */
 #include "GDCore/Project/ObjectConfiguration.h"
 
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/CustomBehavior.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -17,7 +20,7 @@ namespace gd {
 
 ObjectConfiguration::~ObjectConfiguration() {}
 
-ObjectConfiguration::ObjectConfiguration() {}
+ObjectConfiguration::ObjectConfiguration(): is3DObject(false) {}
 
 std::map<gd::String, gd::PropertyDescriptor> ObjectConfiguration::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;

Core/GDCore/Project/ObjectConfiguration.h

@@ -63,12 +63,20 @@ class GD_CORE_API ObjectConfiguration {
    */
   void SetType(const gd::String& type_) {
     type = type_;
+
+    // For now, as a shortcut, consider only the objects from the built-in 3D extension
+    // to be 3D object.
+    is3DObject = type.find("Scene3D::") == 0;
   }
 
   /** \brief Return the type of the object.
    */
   const gd::String& GetType() const { return type; }
 
+  /** \brief Shortcut to check if the object is a 3D object.
+   */
+  bool Is3DObject() const { return is3DObject; }
+
   /** \name Object properties
    * Reading and updating object configuration properties
    */
@@ -172,6 +180,7 @@ class GD_CORE_API ObjectConfiguration {
  protected:
   gd::String type; ///< Which type of object is represented by this
                    ///< configuration.
+  bool is3DObject;
 
   /**
    * \brief Derived object configuration can redefine this method to load

Core/GDCore/Project/Project.cpp

@@ -102,19 +102,21 @@ std::unique_ptr<gd::Object> Project::CreateObject(
     behavior->SetDefaultBehavior(true);
   };
 
-  auto &objectMetadata =
-      gd::MetadataProvider::GetObjectMetadata(platform, objectType);
-  if (!MetadataProvider::IsBadObjectMetadata(objectMetadata)) {
-    for (auto &behaviorType : objectMetadata.GetDefaultBehaviors()) {
+  if (Project::HasEventsBasedObject(objectType)) {
+    addDefaultBehavior("EffectCapability::EffectBehavior");
+    addDefaultBehavior("ResizableCapability::ResizableBehavior");
+    addDefaultBehavior("ScalableCapability::ScalableBehavior");
+    addDefaultBehavior("FlippableCapability::FlippableBehavior");
+  } else {
+    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()) {
       addDefaultBehavior(behaviorType);
     }
   }
-  // During project deserialization, event-based object metadata are not yet
-  // generated. Default behaviors will be added by
-  // MetadataDeclarationHelper::UpdateCustomObjectDefaultBehaviors
-  else if (!project.HasEventsBasedObject(objectType)) {
-    gd::LogWarning("Object: " + name + " has an unknown type: " + objectType);
-  }
 
   return std::move(object);
 }

Core/GDCore/Project/PropertyDescriptor.cpp

@@ -29,15 +29,7 @@ void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
   for (const gd::String& information : extraInformation) {
     extraInformationElement.AddChild("").SetStringValue(information);
   }
-  if (hidden) {
-    element.AddChild("hidden").SetBoolValue(hidden);
-  }
-  if (deprecated) {
-    element.AddChild("deprecated").SetBoolValue(deprecated);
-  }
-  if (advanced) {
-    element.AddChild("advanced").SetBoolValue(advanced);
-  }
+  element.AddChild("hidden").SetBoolValue(hidden);
 }
 
 void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
@@ -66,12 +58,6 @@ void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
   hidden = element.HasChild("hidden")
                ? element.GetChild("hidden").GetBoolValue()
                : false;
-  deprecated = element.HasChild("deprecated")
-               ? element.GetChild("deprecated").GetBoolValue()
-               : false;
-  advanced = element.HasChild("advanced")
-               ? element.GetChild("advanced").GetBoolValue()
-               : false;
 }
 
 void PropertyDescriptor::SerializeValuesTo(SerializerElement& element) const {

Core/GDCore/Project/PropertyDescriptor.h

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

Core/GDCore/Project/ResourcesManager.cpp

@@ -93,10 +93,6 @@ std::shared_ptr<Resource> ResourcesManager::CreateResource(
     return std::make_shared<BitmapFontResource>();
   else if (kind == "model3D")
     return std::make_shared<Model3DResource>();
-  else if (kind == "atlas")
-    return std::make_shared<AtlasResource>();
-  else if (kind == "spine")
-    return std::make_shared<SpineResource>();
 
   std::cout << "Bad resource created (type: " << kind << ")" << std::endl;
   return std::make_shared<Resource>();
@@ -760,20 +756,6 @@ void Model3DResource::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("file", GetFile());
 }
 
-void AtlasResource::SetFile(const gd::String& newFile) {
-  file = NormalizePathSeparator(newFile);
-}
-
-void AtlasResource::UnserializeFrom(const SerializerElement& element) {
-  SetUserAdded(element.GetBoolAttribute("userAdded"));
-  SetFile(element.GetStringAttribute("file"));
-}
-
-void AtlasResource::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("userAdded", IsUserAdded());
-  element.SetAttribute("file", GetFile());
-}
-
 ResourceFolder::ResourceFolder(const ResourceFolder& other) { Init(other); }
 
 ResourceFolder& ResourceFolder::operator=(const ResourceFolder& other) {

Core/GDCore/Project/ResourcesManager.h

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

Core/tests/ArbitraryResourceWorker.cpp

@@ -91,7 +91,7 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
       sprite.SetImageName("res1");
       anim.SetDirectionsCount(1);
       anim.GetDirection(0).AddSprite(sprite);
-      spriteConfiguration.GetAnimations().AddAnimation(anim);
+      spriteConfiguration.AddAnimation(anim);
 
       gd::Object obj("myObject", "", spriteConfiguration.Clone());
       project.InsertObject(obj, 0);
@@ -138,7 +138,7 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
       sprite.SetImageName("res1");
       anim.SetDirectionsCount(1);
       anim.GetDirection(0).AddSprite(sprite);
-      spriteConfiguration.GetAnimations().AddAnimation(anim);
+      spriteConfiguration.AddAnimation(anim);
 
       gd::Object obj("myObject", "", spriteConfiguration.Clone());
       layout.InsertObject(obj, 0);
@@ -437,7 +437,7 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
       sprite.SetImageName("res1");
       anim.SetDirectionsCount(1);
       anim.GetDirection(0).AddSprite(sprite);
-      spriteConfiguration.GetAnimations().AddAnimation(anim);
+      spriteConfiguration.AddAnimation(anim);
 
       gd::Object obj("myObject", "", spriteConfiguration.Clone());
       layout.InsertObject(obj, 0);

Core/tests/DummyPlatform.cpp

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

Core/tests/ExpressionCodeGenerator.cpp

@@ -30,21 +30,6 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
   layout1.GetVariables().InsertNew("MySceneBooleanVariable").SetBool(true);
   layout1.GetVariables().InsertNew("MySceneStructureVariable").GetChild("MyChild");
   layout1.GetVariables().InsertNew("MySceneStructureVariable2").GetChild("MyChild");
-  layout1.GetVariables().InsertNew("MySceneEmptyArrayVariable").CastTo(gd::Variable::Type::Array);
-  {
-    auto& variable = layout1.GetVariables().InsertNew("MySceneNumberArrayVariable");
-    variable.CastTo(gd::Variable::Type::Array);
-    variable.PushNew().SetValue(1);
-    variable.PushNew().SetValue(2);
-    variable.PushNew().SetValue(3);
-  }
-  {
-    auto& variable = layout1.GetVariables().InsertNew("MySceneStringArrayVariable");
-    variable.CastTo(gd::Variable::Type::Array);
-    variable.PushNew().SetString("1");
-    variable.PushNew().SetString("2");
-    variable.PushNew().SetString("3");
-  }
 
   auto &mySpriteObject = layout1.InsertNewObject(project, "MyExtension::Sprite", "MySpriteObject", 0);
   mySpriteObject.GetVariables().InsertNew("MyNumberVariable").SetValue(123);
@@ -1310,221 +1295,6 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(output == "getVariableForObject(MySpriteObject, MyOtherSpriteObject).getChild(\"Child\").getChild(\"Grandchild\")");
     }
   }
-  SECTION("Type conversions (valid operators with variables having different types than the expression)") {
-    SECTION("Expression/parent type is 'string'") {
-      {
-        auto node =
-          parser.ParseExpression("\"You have \" + MySceneVariable + \" points\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "\"You have \" + getLayoutVariable(MySceneVariable).getAsString() + \" points\"");
-      }
-      {
-        auto node =
-          parser.ParseExpression("MySceneVariable + MySceneStringVariable");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "getLayoutVariable(MySceneVariable).getAsString() + getLayoutVariable(MySceneStringVariable).getAsString()");
-      }
-    }
-    SECTION("Expression/parent type is 'string' (with an unknown variable)") {
-      {
-        auto node =
-          parser.ParseExpression("\"You have \" + MySceneStructureVariable.MyChild.CantKnownTheTypeSoStayGeneric + \" points\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "\"You have \" + getLayoutVariable(MySceneStructureVariable).getChild(\"MyChild\").getChild(\"CantKnownTheTypeSoStayGeneric\").getAsString() + \" points\"");
-      }
-    }
-    SECTION("Expression/parent type is 'string' (2 number variables)") {
-      {
-        auto node =
-          parser.ParseExpression("MySceneVariable + MySceneVariable2 + \"world\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "getLayoutVariable(MySceneVariable).getAsString() + getLayoutVariable(MySceneVariable2).getAsString() + \"world\"");
-      }
-      {
-        auto node =
-          parser.ParseExpression("MySceneVariable + MySceneVariable2 + MySceneStringVariable");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "getLayoutVariable(MySceneVariable).getAsString() + getLayoutVariable(MySceneVariable2).getAsString() + getLayoutVariable(MySceneStringVariable).getAsString()");
-      }
-    }
-    SECTION("Expression/parent type is 'string' (array variable)") {
-      {
-        auto node =
-          parser.ParseExpression("\"hello\" + MySceneNumberArrayVariable[2] + \"world\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "\"hello\" + getLayoutVariable(MySceneNumberArrayVariable).getChild(2).getAsString() + \"world\"");
-      }
-      {
-        auto node =
-          parser.ParseExpression("\"hello\" + MySceneEmptyArrayVariable[2] + \"world\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "\"hello\" + getLayoutVariable(MySceneEmptyArrayVariable).getChild(2).getAsString() + \"world\"");
-      }
-    }
-
-    SECTION("Expression/parent type is 'number'") {
-      {
-        auto node =
-          parser.ParseExpression("123 + MySceneVariable + 456");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "123 + getLayoutVariable(MySceneVariable).getAsNumber() + 456");
-      }
-      {
-        auto node =
-          parser.ParseExpression("MySceneStringVariable + MySceneVariable");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "getLayoutVariable(MySceneStringVariable).getAsNumber() + getLayoutVariable(MySceneVariable).getAsNumber()");
-      }
-    }
-    SECTION("Expression/parent type is 'string' (with an unknown variable)") {
-      {
-        auto node =
-          parser.ParseExpression("123 + MySceneStructureVariable.MyChild.CantKnownTheTypeSoStayGeneric + 456");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "123 + getLayoutVariable(MySceneStructureVariable).getChild(\"MyChild\").getChild(\"CantKnownTheTypeSoStayGeneric\").getAsNumber() + 456");
-      }
-    }
-    SECTION("Expression/parent type is 'number' (2 string variables)") {
-      {
-        auto node =
-          parser.ParseExpression("MySceneStringVariable + MySceneStringVariable + 456");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "getLayoutVariable(MySceneStringVariable).getAsNumber() + getLayoutVariable(MySceneStringVariable).getAsNumber() + 456");
-      }
-      {
-        auto node =
-          parser.ParseExpression("MySceneStringVariable + MySceneStringVariable + MySceneVariable");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "getLayoutVariable(MySceneStringVariable).getAsNumber() + getLayoutVariable(MySceneStringVariable).getAsNumber() + getLayoutVariable(MySceneVariable).getAsNumber()");
-      }
-    }
-    SECTION("Expression/parent type is 'number' (array variable)") {
-      {
-        auto node =
-          parser.ParseExpression("123 + MySceneNumberArrayVariable[2] + 456");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "123 + getLayoutVariable(MySceneNumberArrayVariable).getChild(2).getAsNumber() + 456");
-      }
-      {
-        auto node =
-          parser.ParseExpression("123 + MySceneEmptyArrayVariable[2] + 456");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("number",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "123 + getLayoutVariable(MySceneEmptyArrayVariable).getChild(2).getAsNumber() + 456");
-      }
-    }
-
-
-    SECTION("Multiple type conversions in sub expressions or same expression") {
-      {
-        auto node =
-          parser.ParseExpression("\"hello\" + MySceneNumberArrayVariable[2 + MySceneStringVariable] + \"world\" + MySceneVariable + \"world 2\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "\"hello\" + getLayoutVariable(MySceneNumberArrayVariable).getChild(2 + getLayoutVariable(MySceneStringVariable).getAsNumber()).getAsString() + \"world\" + getLayoutVariable(MySceneVariable).getAsString() + \"world 2\"");
-      }
-      {
-        auto node =
-          parser.ParseExpression("\"hello\" + MySceneNumberArrayVariable[\"foo\" + MySceneVariable + \"bar\"] + \"world\" + MySceneVariable + \"world 2\"");
-        gd::ExpressionCodeGenerator expressionCodeGenerator("string",
-                                                            "",
-                                                            codeGenerator,
-                                                            context);
-
-        REQUIRE(node);
-        node->Visit(expressionCodeGenerator);
-        REQUIRE(expressionCodeGenerator.GetOutput() == "\"hello\" + getLayoutVariable(MySceneNumberArrayVariable).getChild(\"foo\" + getLayoutVariable(MySceneVariable).getAsString() + \"bar\").getAsString() + \"world\" + getLayoutVariable(MySceneVariable).getAsString() + \"world 2\"");
-      }
-    }
-  }
   SECTION("Mixed test (1)") {
     {
       auto node = parser.ParseExpression("-+-MyExtension::MouseX(,)");

Core/tests/ExpressionParser2.cpp

@@ -203,23 +203,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node = parser.ParseExpression("abcd[0]");
       REQUIRE(node != nullptr);
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "No object, variable or property with this name found.");
-      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 0);
-    }
-    {
-      auto node = parser.ParseExpression("abcd[0].efg");
-      REQUIRE(node != nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -231,12 +214,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node = parser.ParseExpression("abcd.efg.hij");
       REQUIRE(node != nullptr);
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -785,12 +762,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node = parser.ParseExpression("abcd.efg.hij");
       REQUIRE(node != nullptr);
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -1524,12 +1495,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node =
           parser.ParseExpression("MyNonExistingSceneVariable");
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -1551,25 +1516,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     }
   }
 
-  SECTION("Invalid scene variables (2 levels, variable and child do not exist)") {
-    {
-      auto node =
-          parser.ParseExpression("MyNonExistingSceneVariable.MyNonExistingChild");
-
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "You must enter a number or a text, wrapped inside double quotes (example: \"Hello world\"), or a variable name.");
-    }
-  }
-
   SECTION("Valid object variables (1 level)") {
     {
       auto node =
@@ -1640,12 +1586,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto node =
           parser.ParseExpression("MyNonExistingSpriteObject.MyVariable");
 
-      // Also check that if we try to find the last parent of node, it is not defined.
-      auto lastParentOfNode = gd::ExpressionVariableParentFinder::GetLastParentOfNode(
-          platform, projectScopedContainers, *node);
-      REQUIRE(lastParentOfNode.parentVariable == nullptr);
-      REQUIRE(lastParentOfNode.parentVariablesContainer == nullptr);
-
       gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 1);
@@ -2954,238 +2894,6 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
     }
   }
 
-  SECTION("Valid operators with variables having different types than the expression") {
-    SECTION("Expression/parent type is 'string'") {
-      // A trivial test (everything is a string).
-      {
-        auto node = parser.ParseExpression("\"You have \" + MySceneStringVariable + \" points\"");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-        node->Visit(validator);
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-      // A string concatenated with a number variable (will have to be casted to a string in code generation)
-      {
-        auto node = parser.ParseExpression("\"You have \" + MySceneNumberVariable");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-        node->Visit(validator);
-
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-      // A string concatenated with a number variable (will have to be casted to a string in code generation)
-      // and then with a string again.
-      {
-        auto node = parser.ParseExpression("\"You have \" + MySceneNumberVariable + \" points\"");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-        node->Visit(validator);
-
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-      // A string concatenated with an unknown variable (will have to be casted to a string in code generation)
-      // and then with a string again.
-      {
-        auto node = parser.ParseExpression("\"You have \" + MySceneStructureVariable.MyChild.CantKnownTheTypeSoStayGeneric + \" points\"");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-        node->Visit(validator);
-
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-    }
-    SECTION("Expression/parent type is 'number'") {
-      // A trivial test (everything is a string).
-      {
-        auto node = parser.ParseExpression("123 + MySceneNumberVariable + 456");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-        node->Visit(validator);
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-      // A number concatenated with a string variable (will have to be casted to a number in code generation)
-      {
-        auto node = parser.ParseExpression("123 + MySceneStringVariable");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-        node->Visit(validator);
-
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-      // A number concatenated with a string variable (will have to be casted to a number in code generation)
-      // and then with a number again.
-      {
-        auto node = parser.ParseExpression("123 + MySceneStringVariable + 456");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-        node->Visit(validator);
-
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-      // A number concatenated with an unknown variable (will have to be casted to a number in code generation)
-      // and then with a number again.
-      {
-        auto node = parser.ParseExpression("123 + MySceneStructureVariable.MyChild.CantKnownTheTypeSoStayGeneric + 456");
-        REQUIRE(node != nullptr);
-
-        gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-        node->Visit(validator);
-
-        REQUIRE(validator.GetFatalErrors().size() == 0);
-      }
-    }
-    SECTION("Expression/parent type is 'number|string'") {
-      SECTION("Expression/parent inferred type is 'string'") {
-        // A trivial test (everything is a string).
-        {
-          auto node = parser.ParseExpression("\"You have \" + MySceneStringVariable + \" points\"");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-        // A string concatenated with a number variable (will have to be casted to a string in code generation)
-        {
-          auto node = parser.ParseExpression("\"You have \" + MySceneNumberVariable");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-        // A string concatenated with a number variable (will have to be casted to a string in code generation)
-        // and then with a string again.
-        {
-          auto node = parser.ParseExpression("\"You have \" + MySceneNumberVariable + \" points\"");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-        // A string concatenated with an unknown variable (will have to be casted to a string in code generation)
-        // and then with a string again.
-        {
-          auto node = parser.ParseExpression("\"You have \" + MySceneStructureVariable.MyChild.CantKnownTheTypeSoStayGeneric + \" points\"");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-      }
-      SECTION("Expression/parent inferred type is 'number'") {
-        // A trivial test (everything is a string).
-        {
-          auto node = parser.ParseExpression("123 + MySceneNumberVariable + 456");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-        // A number concatenated with a string variable (will have to be casted to a number in code generation)
-        {
-          auto node = parser.ParseExpression("123 + MySceneStringVariable");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-        // A number concatenated with a string variable (will have to be casted to a number in code generation)
-        // and then with a number again.
-        {
-          auto node = parser.ParseExpression("123 + MySceneStringVariable + 456");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-        // A number concatenated with an unknown variable (will have to be casted to a number in code generation)
-        // and then with a number again.
-        {
-          auto node = parser.ParseExpression("123 + MySceneStructureVariable.MyChild.CantKnownTheTypeSoStayGeneric + 456");
-          REQUIRE(node != nullptr);
-
-          gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-          node->Visit(validator);
-
-          REQUIRE(validator.GetFatalErrors().size() == 0);
-        }
-      }
-    }
-  }
-
-  SECTION("Invalid operators with variables having different types than the expression") {
-    // Try to do a sum between numbers in a string expression
-    {
-      auto node = parser.ParseExpression("\"You have \" + MySceneNumberVariable + 2 + \" points\"");
-      REQUIRE(node != nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-      node->Visit(validator);
-
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() == "You entered a number, but a text was expected (in quotes).");
-      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 38);
-      REQUIRE(validator.GetFatalErrors()[0]->GetEndPosition() == 39);
-    }
-    // Try to do a sum between numbers in a number|string expression (that is inferred as a string with the first operand)
-    {
-      auto node = parser.ParseExpression("\"You have \" + MySceneNumberVariable + 2 + \" points\"");
-      REQUIRE(node != nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "string");
-      node->Visit(validator);
-
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() == "You entered a number, but a text was expected (in quotes).");
-      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 38);
-      REQUIRE(validator.GetFatalErrors()[0]->GetEndPosition() == 39);
-    }
-    // Try to do a string concatenation in a number expression
-    {
-      auto node = parser.ParseExpression("123 + MySceneStringVariable + \"hello\" + 456");
-      REQUIRE(node != nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number");
-      node->Visit(validator);
-
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() == "You entered a text, but a number was expected.");
-      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 30);
-      REQUIRE(validator.GetFatalErrors()[0]->GetEndPosition() == 37);
-    }
-    // Try to do a string concatenation in a number|string expression (that is inferred as a number with the first operand)
-    {
-      auto node = parser.ParseExpression("123 + MySceneStringVariable + \"hello\" + 456");
-      REQUIRE(node != nullptr);
-
-      gd::ExpressionValidator validator(platform, projectScopedContainers, "number|string");
-      node->Visit(validator);
-
-      REQUIRE(validator.GetFatalErrors().size() == 1);
-      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() == "You entered a text, but a number was expected.");
-      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 30);
-      REQUIRE(validator.GetFatalErrors()[0]->GetEndPosition() == 37);
-    }
-  }
-
   SECTION("Valid function call with object variable") {
     {
       // Note that in this test we need to use an expression with "objectvar",

Core/tests/ObjectAssetSerializer.cpp

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

Core/tests/ObjectSerialization.cpp

@@ -35,7 +35,7 @@ void SetupSpriteConfiguration(gd::ObjectConfiguration &configuration) {
   REQUIRE(spriteConfiguration != nullptr);
   gd::Animation animation;
   animation.SetName("Idle");
-  spriteConfiguration->GetAnimations().AddAnimation(animation);
+  spriteConfiguration->AddAnimation(animation);
 };
 
 gd::Object &SetupProjectWithSprite(gd::Project &project,
@@ -83,9 +83,9 @@ void CheckSpriteConfigurationInProjectElement(
 void CheckSpriteConfiguration(gd::ObjectConfiguration &configuration) {
   auto *spriteConfiguration = dynamic_cast<gd::SpriteObject *>(&configuration);
   REQUIRE(spriteConfiguration);
-  REQUIRE(spriteConfiguration->GetAnimations().GetAnimationsCount() == 1);
+  REQUIRE(spriteConfiguration->GetAnimationsCount() == 1);
 
-  auto &animation = spriteConfiguration->GetAnimations().GetAnimation(0);
+  auto &animation = spriteConfiguration->GetAnimation(0);
   REQUIRE(animation.GetName() == "Idle");
 };
 

Core/tests/WholeProjectRefactorer.cpp

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

Extensions/3D/A_RuntimeObject3D.ts

@@ -154,23 +154,7 @@ namespace gdjs {
      * @return The Z position of the rendered object.
      */
     getDrawableZ(): float {
-      return this._z;
-    }
-
-    /**
-     * Return the bottom Z of the object.
-     * Rotations around X and Y are not taken into account.
-     */
-    getUnrotatedAABBMinZ(): number {
-      return this.getDrawableZ();
-    }
-
-    /**
-     * Return the top Z of the object.
-     * Rotations around X and Y are not taken into account.
-     */
-    getUnrotatedAABBMaxZ(): number {
-      return this.getDrawableZ() + this.getDepth();
+      return this.getZ();
     }
 
     /**

Extensions/3D/A_RuntimeObject3DRenderer.ts

@@ -24,8 +24,8 @@ namespace gdjs {
 
     updatePosition() {
       this._threeObject3D.position.set(
-        this._object.getX() + this._object.getWidth() / 2,
-        this._object.getY() + this._object.getHeight() / 2,
+        this._object.x + this._object.getWidth() / 2,
+        this._object.y + this._object.getHeight() / 2,
         this._object.getZ() + this._object.getDepth() / 2
       );
     }

Extensions/3D/Base3DBehavior.ts

@@ -103,27 +103,6 @@ namespace gdjs {
     flipZ(enable: boolean): void;
 
     isFlippedZ(): boolean;
-
-    /**
-     * Return the bottom Z of the object.
-     * Rotations around X and Y are not taken into account.
-     */
-    getUnrotatedAABBMinZ(): number;
-
-    /**
-     * Return the top Z of the object.
-     * Rotations around X and Y are not taken into account.
-     */
-    getUnrotatedAABBMaxZ(): number;
-  }
-
-  export namespace Base3DHandler {
-    export const is3D = (
-      object: gdjs.RuntimeObject
-    ): object is gdjs.RuntimeObject & gdjs.Base3DHandler => {
-      //@ts-ignore We are checking if the methods are present.
-      return object.getZ && object.setZ;
-    };
   }
 
   /**
@@ -223,14 +202,6 @@ namespace gdjs {
     isFlippedZ(): boolean {
       return this.object.isFlippedZ();
     }
-
-    getUnrotatedAABBMinZ(): number {
-      return this.object.getUnrotatedAABBMinZ();
-    }
-
-    getUnrotatedAABBMaxZ(): number {
-      return this.object.getUnrotatedAABBMaxZ();
-    }
   }
 
   gdjs.registerBehavior('Scene3D::Base3DBehavior', gdjs.Base3DBehavior);

Extensions/3D/BloomEffect.ts

@@ -1,89 +0,0 @@
-namespace gdjs {
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'Scene3D::Bloom',
-    new (class implements gdjs.PixiFiltersTools.FilterCreator {
-      makeFilter(
-        target: EffectsTarget,
-        effectData: EffectData
-      ): gdjs.PixiFiltersTools.Filter {
-        if (typeof THREE === 'undefined') {
-          return new gdjs.PixiFiltersTools.EmptyFilter();
-        }
-        return new (class implements gdjs.PixiFiltersTools.Filter {
-          shaderPass: THREE_ADDONS.UnrealBloomPass;
-          _isEnabled: boolean;
-
-          constructor() {
-            this.shaderPass = new THREE_ADDONS.UnrealBloomPass(
-              new THREE.Vector2(256, 256),
-              1,
-              0,
-              0
-            );
-            this._isEnabled = false;
-          }
-
-          isEnabled(target: EffectsTarget): boolean {
-            return this._isEnabled;
-          }
-          setEnabled(target: EffectsTarget, enabled: boolean): boolean {
-            if (this._isEnabled === enabled) {
-              return true;
-            }
-            if (enabled) {
-              return this.applyEffect(target);
-            } else {
-              return this.removeEffect(target);
-            }
-          }
-          applyEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().addPostProcessingPass(this.shaderPass);
-            this._isEnabled = true;
-            return true;
-          }
-          removeEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().removePostProcessingPass(this.shaderPass);
-            this._isEnabled = false;
-            return true;
-          }
-          updatePreRender(target: gdjs.EffectsTarget): any {}
-          updateDoubleParameter(parameterName: string, value: number): void {
-            if (parameterName === 'strength') {
-              this.shaderPass.strength = value;
-            }
-            if (parameterName === 'radius') {
-              this.shaderPass.radius = value;
-            }
-            if (parameterName === 'threshold') {
-              this.shaderPass.threshold = value;
-            }
-          }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'strength') {
-              return this.shaderPass.strength;
-            }
-            if (parameterName === 'radius') {
-              return this.shaderPass.radius;
-            }
-            if (parameterName === 'threshold') {
-              return this.shaderPass.threshold;
-            }
-            return 0;
-          }
-          updateStringParameter(parameterName: string, value: string): void {}
-          updateColorParameter(parameterName: string, value: number): void {}
-          getColorParameter(parameterName: string): number {
-            return 0;
-          }
-          updateBooleanParameter(parameterName: string, value: boolean): void {}
-        })();
-      }
-    })()
-  );
-}

Extensions/3D/BrightnessAndContrastEffect.ts

@@ -1,80 +0,0 @@
-namespace gdjs {
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'Scene3D::BrightnessAndContrast',
-    new (class implements gdjs.PixiFiltersTools.FilterCreator {
-      makeFilter(
-        target: EffectsTarget,
-        effectData: EffectData
-      ): gdjs.PixiFiltersTools.Filter {
-        if (typeof THREE === 'undefined') {
-          return new gdjs.PixiFiltersTools.EmptyFilter();
-        }
-        return new (class implements gdjs.PixiFiltersTools.Filter {
-          shaderPass: THREE_ADDONS.ShaderPass;
-          _isEnabled: boolean;
-
-          constructor() {
-            this.shaderPass = new THREE_ADDONS.ShaderPass(
-              THREE_ADDONS.BrightnessContrastShader
-            );
-            this._isEnabled = false;
-          }
-
-          isEnabled(target: EffectsTarget): boolean {
-            return this._isEnabled;
-          }
-          setEnabled(target: EffectsTarget, enabled: boolean): boolean {
-            if (this._isEnabled === enabled) {
-              return true;
-            }
-            if (enabled) {
-              return this.applyEffect(target);
-            } else {
-              return this.removeEffect(target);
-            }
-          }
-          applyEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().addPostProcessingPass(this.shaderPass);
-            this._isEnabled = true;
-            return true;
-          }
-          removeEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().removePostProcessingPass(this.shaderPass);
-            this._isEnabled = false;
-            return true;
-          }
-          updatePreRender(target: gdjs.EffectsTarget): any {}
-          updateDoubleParameter(parameterName: string, value: number): void {
-            if (parameterName === 'brightness') {
-              this.shaderPass.uniforms[parameterName].value = value;
-            }
-            if (parameterName === 'contrast') {
-              this.shaderPass.uniforms[parameterName].value = value;
-            }
-          }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'brightness') {
-              return this.shaderPass.uniforms[parameterName].value;
-            }
-            if (parameterName === 'contrast') {
-              return this.shaderPass.uniforms[parameterName].value;
-            }
-            return 0;
-          }
-          updateStringParameter(parameterName: string, value: string): void {}
-          updateColorParameter(parameterName: string, value: number): void {}
-          getColorParameter(parameterName: string): number {
-            return 0;
-          }
-          updateBooleanParameter(parameterName: string, value: boolean): void {}
-        })();
-      }
-    })()
-  );
-}

Extensions/3D/CustomRuntimeObject3D.ts

@@ -1,373 +0,0 @@
-namespace gdjs {
-  export interface Object3DDataContent {
-    width: float;
-    height: float;
-    depth: float;
-  }
-  /** Base parameters for {@link gdjs.RuntimeObject3D} */
-  export interface Object3DData extends ObjectData {
-    /** The base parameters of the RuntimeObject3D */
-    content: Object3DDataContent;
-  }
-
-  /**
-   * Base class for 3D custom objects.
-   */
-  export class CustomRuntimeObject3D
-    extends gdjs.CustomRuntimeObject
-    implements gdjs.Base3DHandler {
-    /**
-     * Position on the Z axis.
-     */
-    private _z: float = 0;
-    private _minZ: float = 0;
-    private _maxZ: float = 0;
-    private _scaleZ: float = 1;
-    private _flippedZ: boolean = false;
-    /**
-     * Euler angle with the `ZYX` order.
-     *
-     * Note that `_rotationZ` is `angle` from `gdjs.RuntimeObject`.
-     */
-    private _rotationX: float = 0;
-    /**
-     * Euler angle with the `ZYX` order.
-     *
-     * Note that `_rotationZ` is `angle` from `gdjs.RuntimeObject`.
-     */
-    private _rotationY: float = 0;
-    private _customCenterZ: float = 0;
-    private static _temporaryVector = new THREE.Vector3();
-
-    constructor(
-      parent: gdjs.RuntimeInstanceContainer,
-      objectData: Object3DData & CustomObjectConfiguration
-    ) {
-      super(parent, objectData);
-      this._renderer.reinitialize(this, parent);
-    }
-
-    protected _createRender() {
-      const parent = this._runtimeScene;
-      return new gdjs.CustomRuntimeObject3DRenderer(
-        this,
-        this._instanceContainer,
-        parent
-      );
-    }
-
-    protected _reinitializeRenderer(): void {
-      this.getRenderer().reinitialize(this, this.getParent());
-    }
-
-    getRenderer(): gdjs.CustomRuntimeObject3DRenderer {
-      return super.getRenderer() as gdjs.CustomRuntimeObject3DRenderer;
-    }
-
-    get3DRendererObject() {
-      // It can't be null because Three.js is always loaded
-      // when a custom 3D object is used.
-      return this.getRenderer().get3DRendererObject()!;
-    }
-
-    extraInitializationFromInitialInstance(initialInstanceData: InstanceData) {
-      super.extraInitializationFromInitialInstance(initialInstanceData);
-      if (initialInstanceData.depth !== undefined)
-        this.setDepth(initialInstanceData.depth);
-    }
-
-    /**
-     * Set the object position on the Z axis.
-     */
-    setZ(z: float): void {
-      if (z === this._z) return;
-      this._z = z;
-      this.getRenderer().updatePosition();
-    }
-
-    /**
-     * Get the object position on the Z axis.
-     */
-    getZ(): float {
-      return this._z;
-    }
-
-    /**
-     * Get the Z position of the rendered object.
-     *
-     * For most objects, this will returns the same value as getZ(). But if the
-     * object has an origin that is not the same as the point (0,0,0) of the
-     * object displayed, getDrawableZ will differ.
-     *
-     * @return The Z position of the rendered object.
-     */
-    getDrawableZ(): float {
-      if (this._isUntransformedHitBoxesDirty) {
-        this._updateUntransformedHitBoxes();
-      }
-      return this._z + this._minZ;
-    }
-
-    /**
-     * Return the Z position of the object center, **relative to the object Z
-     * position** (`getDrawableX`).
-     *
-     * Use `getCenterZInScene` to get the position of the center in the scene.
-     *
-     * @return the Z position of the object center, relative to
-     * `getDrawableZ()`.
-     */
-    getCenterZ(): float {
-      return this.getDepth() / 2;
-    }
-
-    getCenterZInScene(): float {
-      return this.getDrawableZ() + this.getCenterZ();
-    }
-
-    setCenterZInScene(z: float): void {
-      this.setZ(z + this._z - (this.getDrawableZ() + this.getCenterZ()));
-    }
-
-    /**
-     * Return the bottom Z of the object.
-     * Rotations around X and Y are not taken into account.
-     */
-    getUnrotatedAABBMinZ(): number {
-      return this.getDrawableZ();
-    }
-
-    /**
-     * Return the top Z of the object.
-     * Rotations around X and Y are not taken into account.
-     */
-    getUnrotatedAABBMaxZ(): number {
-      return this.getDrawableZ() + this.getDepth();
-    }
-
-    /**
-     * Set the object rotation on the X axis.
-     *
-     * This is an Euler angle. Objects use the `ZYX` order.
-     */
-    setRotationX(angle: float): void {
-      this._rotationX = angle;
-      this.getRenderer().updateRotation();
-    }
-
-    /**
-     * Set the object rotation on the Y axis.
-     *
-     * This is an Euler angle. Objects use the `ZYX` order.
-     */
-    setRotationY(angle: float): void {
-      this._rotationY = angle;
-      this.getRenderer().updateRotation();
-    }
-
-    /**
-     * Get the object rotation on the X axis.
-     *
-     * This is an Euler angle. Objects use the `ZYX` order.
-     */
-    getRotationX(): float {
-      return this._rotationX;
-    }
-
-    /**
-     * Get the object rotation on the Y axis.
-     *
-     * This is an Euler angle. Objects use the `ZYX` order.
-     */
-    getRotationY(): float {
-      return this._rotationY;
-    }
-
-    /**
-     * Turn the object around the scene x axis at its center.
-     * @param deltaAngle the rotation angle
-     */
-    turnAroundX(deltaAngle: float): void {
-      const axisX = gdjs.CustomRuntimeObject3D._temporaryVector;
-      axisX.set(1, 0, 0);
-
-      const mesh = this.get3DRendererObject();
-      mesh.rotateOnWorldAxis(axisX, gdjs.toRad(deltaAngle));
-      this._rotationX = gdjs.toDegrees(mesh.rotation.x);
-      this._rotationY = gdjs.toDegrees(mesh.rotation.y);
-      this.setAngle(gdjs.toDegrees(mesh.rotation.z));
-    }
-
-    /**
-     * Turn the object around the scene y axis at its center.
-     * @param deltaAngle the rotation angle
-     */
-    turnAroundY(deltaAngle: float): void {
-      const axisY = gdjs.CustomRuntimeObject3D._temporaryVector;
-      axisY.set(0, 1, 0);
-
-      const mesh = this.get3DRendererObject();
-      mesh.rotateOnWorldAxis(axisY, gdjs.toRad(deltaAngle));
-      this._rotationX = gdjs.toDegrees(mesh.rotation.x);
-      this._rotationY = gdjs.toDegrees(mesh.rotation.y);
-      this.setAngle(gdjs.toDegrees(mesh.rotation.z));
-    }
-
-    /**
-     * Turn the object around the scene z axis at its center.
-     * @param deltaAngle the rotation angle
-     */
-    turnAroundZ(deltaAngle: float): void {
-      const axisZ = gdjs.CustomRuntimeObject3D._temporaryVector;
-      axisZ.set(0, 0, 1);
-
-      const mesh = this.get3DRendererObject();
-      mesh.rotateOnWorldAxis(axisZ, gdjs.toRad(deltaAngle));
-      this._rotationX = gdjs.toDegrees(mesh.rotation.x);
-      this._rotationY = gdjs.toDegrees(mesh.rotation.y);
-      this.setAngle(gdjs.toDegrees(mesh.rotation.z));
-    }
-
-    /**
-     * @return the internal width of the object according to its children.
-     */
-    getUnscaledDepth(): float {
-      if (this._isUntransformedHitBoxesDirty) {
-        this._updateUntransformedHitBoxes();
-      }
-      return this._maxZ - this._minZ;
-    }
-
-    _updateUntransformedHitBoxes(): void {
-      super._updateUntransformedHitBoxes();
-
-      let minZ = Number.MAX_VALUE;
-      let maxZ = -Number.MAX_VALUE;
-      for (const childInstance of this._instanceContainer.getAdhocListOfAllInstances()) {
-        if (!childInstance.isIncludedInParentCollisionMask()) {
-          continue;
-        }
-        if (!gdjs.Base3DHandler.is3D(childInstance)) {
-          continue;
-        }
-        minZ = Math.min(minZ, childInstance.getUnrotatedAABBMinZ());
-        maxZ = Math.max(maxZ, childInstance.getUnrotatedAABBMaxZ());
-      }
-      if (minZ === Number.MAX_VALUE) {
-        // The unscaled size can't be 0 because setWidth and setHeight wouldn't
-        // have any effect.
-        minZ = 0;
-        maxZ = 1;
-      }
-      this._minZ = minZ;
-      this._maxZ = maxZ;
-    }
-
-    /**
-     * @returns the center Z from the local origin (0;0).
-     */
-    getUnscaledCenterZ(): float {
-      if (this.hasCustomRotationCenter()) {
-        return this._customCenterZ;
-      }
-      if (this._isUntransformedHitBoxesDirty) {
-        this._updateUntransformedHitBoxes();
-      }
-      return (this._minZ + this._maxZ) / 2;
-    }
-
-    /**
-     * The center of rotation is defined relatively to the origin (the object
-     * position).
-     * This avoids the center to move when children push the bounds.
-     *
-     * When no custom center is defined, it will move
-     * to stay at the center of the children bounds.
-     *
-     * @param x coordinate of the custom center
-     * @param y coordinate of the custom center
-     */
-    setRotationCenter3D(x: float, y: float, z: float) {
-      this._customCenterZ = z;
-      this.setRotationCenter(x, y);
-    }
-
-    /**
-     * Get the object size on the Z axis (called "depth").
-     */
-    getDepth(): float {
-      return this.getUnscaledDepth() * this.getScaleZ();
-    }
-
-    /**
-     * Set the object size on the Z axis (called "depth").
-     */
-    setDepth(depth: float): void {
-      const unscaledDepth = this.getUnscaledDepth();
-      if (unscaledDepth !== 0) {
-        this.setScaleZ(depth / unscaledDepth);
-      }
-    }
-
-    /**
-     * Change the scale on X, Y and Z axis of the object.
-     *
-     * @param newScale The new scale (must be greater than 0).
-     */
-    setScale(newScale: number): void {
-      super.setScale(newScale);
-      this.setScaleZ(newScale);
-    }
-
-    /**
-     * Change the scale on Z axis of the object (changing its height).
-     *
-     * @param newScale The new scale (must be greater than 0).
-     */
-    setScaleZ(newScale: number): void {
-      if (newScale < 0) {
-        newScale = 0;
-      }
-      if (newScale === Math.abs(this._scaleZ)) {
-        return;
-      }
-      this._scaleZ = newScale * (this._flippedZ ? -1 : 1);
-      this.getRenderer().updateSize();
-    }
-
-    /**
-     * Get the scale of the object (or the geometric average of X, Y and Z scale in case they are different).
-     *
-     * @return the scale of the object (or the geometric average of X, Y and Z scale in case they are different).
-     */
-    getScale(): number {
-      const scaleX = this.getScaleX();
-      const scaleY = this.getScaleY();
-      const scaleZ = this.getScaleZ();
-      return scaleX === scaleY && scaleX === scaleZ
-        ? scaleX
-        : Math.pow(scaleX * scaleY * scaleZ, 1 / 3);
-    }
-
-    /**
-     * Get the scale of the object on Z axis.
-     *
-     * @return the scale of the object on Z axis
-     */
-    getScaleZ(): float {
-      return Math.abs(this._scaleZ);
-    }
-
-    flipZ(enable: boolean) {
-      if (enable === this._flippedZ) {
-        return;
-      }
-      this._flippedZ = enable;
-      this.getRenderer().updateSize();
-    }
-
-    isFlippedZ(): boolean {
-      return this._flippedZ;
-    }
-  }
-}

Extensions/3D/CustomRuntimeObject3DRenderer.ts

@@ -1,179 +0,0 @@
-namespace gdjs {
-  export interface PixiImageManager {
-    _threeAnimationFrameTextureManager: ThreeAnimationFrameTextureManager;
-  }
-  /**
-   * The renderer for a {@link gdjs.CustomRuntimeObject3D} using Three.js.
-   */
-  export class CustomRuntimeObject3DRenderer
-    implements gdjs.RuntimeInstanceContainerRenderer {
-    _object: gdjs.CustomRuntimeObject3D;
-    _instanceContainer: gdjs.CustomRuntimeObjectInstanceContainer;
-    _isContainerDirty: boolean = true;
-    _threeGroup: THREE.Group;
-
-    constructor(
-      object: gdjs.CustomRuntimeObject3D,
-      instanceContainer: gdjs.CustomRuntimeObjectInstanceContainer,
-      parent: gdjs.RuntimeInstanceContainer
-    ) {
-      this._object = object;
-      this._instanceContainer = instanceContainer;
-
-      this._threeGroup = new THREE.Group();
-      this._threeGroup.rotation.order = 'ZYX';
-
-      const layer = parent.getLayer('');
-      if (layer) {
-        layer.getRenderer().add3DRendererObject(this._threeGroup);
-      }
-    }
-
-    get3DRendererObject(): THREE.Object3D {
-      return this._threeGroup;
-    }
-
-    getRendererObject() {
-      return null;
-    }
-
-    reinitialize(
-      object: gdjs.CustomRuntimeObject3D,
-      parent: gdjs.RuntimeInstanceContainer
-    ) {
-      this._object = object;
-      this._isContainerDirty = true;
-      const layer = parent.getLayer('');
-      if (layer) {
-        layer.getRenderer().add3DRendererObject(this._threeGroup);
-      }
-    }
-
-    _updateThreeGroup() {
-      const threeObject3D = this.get3DRendererObject();
-
-      const scaleX = this._object.getScaleX();
-      const scaleY = this._object.getScaleY();
-      const scaleZ = this._object.getScaleZ();
-      const pivotX = this._object.getUnscaledCenterX() * scaleX;
-      const pivotY = this._object.getUnscaledCenterY() * scaleY;
-      const pivotZ = this._object.getUnscaledCenterZ() * scaleZ;
-
-      threeObject3D.rotation.set(
-        gdjs.toRad(this._object.getRotationX()),
-        gdjs.toRad(this._object.getRotationY()),
-        gdjs.toRad(this._object.angle)
-      );
-
-      threeObject3D.position.set(
-        this._object.isFlippedX() ? pivotX : -pivotX,
-        this._object.isFlippedY() ? pivotY : -pivotY,
-        this._object.isFlippedZ() ? pivotZ : -pivotZ
-      );
-      threeObject3D.position.applyEuler(threeObject3D.rotation);
-      threeObject3D.position.x += this._object.getX() + pivotX;
-      threeObject3D.position.y += this._object.getY() + pivotY;
-      threeObject3D.position.z += this._object.getZ() + pivotZ;
-
-      threeObject3D.scale.set(
-        this._object.isFlippedX() ? -scaleX : scaleX,
-        this._object.isFlippedY() ? -scaleY : scaleY,
-        this._object.isFlippedZ() ? -scaleZ : scaleZ
-      );
-
-      threeObject3D.visible = !this._object.hidden;
-
-      this._isContainerDirty = false;
-    }
-
-    /**
-     * Call this to make sure the object is ready to be rendered.
-     */
-    ensureUpToDate() {
-      if (this._isContainerDirty) {
-        this._updateThreeGroup();
-      }
-    }
-
-    update(): void {
-      this._isContainerDirty = true;
-    }
-
-    updateX(): void {
-      this._isContainerDirty = true;
-    }
-
-    updateY(): void {
-      this._isContainerDirty = true;
-    }
-
-    updateAngle(): void {
-      this._isContainerDirty = true;
-    }
-
-    updatePosition() {
-      this._isContainerDirty = true;
-    }
-
-    updateRotation() {
-      this._isContainerDirty = true;
-    }
-
-    updateSize() {
-      this._isContainerDirty = true;
-    }
-
-    updateVisibility(): void {
-      this._threeGroup.visible = !this._object.hidden;
-    }
-
-    updateOpacity(): void {
-      // Opacity is not handled by 3D custom objects.
-    }
-
-    setLayerIndex(layer: gdjs.RuntimeLayer, index: float): void {
-      // Layers are not handled for 3D custom objects.
-    }
-
-    static getAnimationFrameTextureManager(
-      imageManager: gdjs.PixiImageManager
-    ): ThreeAnimationFrameTextureManager {
-      if (!imageManager._threeAnimationFrameTextureManager) {
-        imageManager._threeAnimationFrameTextureManager = new ThreeAnimationFrameTextureManager(
-          imageManager
-        );
-      }
-      return imageManager._threeAnimationFrameTextureManager;
-    }
-  }
-
-  class ThreeAnimationFrameTextureManager
-    implements gdjs.AnimationFrameTextureManager<THREE.Material> {
-    private _imageManager: gdjs.PixiImageManager;
-
-    constructor(imageManager: gdjs.PixiImageManager) {
-      this._imageManager = imageManager;
-    }
-
-    getAnimationFrameTexture(imageName: string) {
-      return this._imageManager.getThreeMaterial(imageName, {
-        useTransparentTexture: true,
-        forceBasicMaterial: true,
-      });
-    }
-
-    getAnimationFrameWidth(material: THREE.Material) {
-      const map = (material as
-        | THREE.MeshBasicMaterial
-        | THREE.MeshStandardMaterial).map;
-      return map ? map.image.width : 0;
-    }
-
-    getAnimationFrameHeight(material: THREE.Material) {
-      const map = (material as
-        | THREE.MeshBasicMaterial
-        | THREE.MeshStandardMaterial).map;
-      return map ? map.image.height : 0;
-    }
-  }
-}

Extensions/3D/ExposureEffect.ts

@@ -1,74 +0,0 @@
-namespace gdjs {
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'Scene3D::Exposure',
-    new (class implements gdjs.PixiFiltersTools.FilterCreator {
-      makeFilter(
-        target: EffectsTarget,
-        effectData: EffectData
-      ): gdjs.PixiFiltersTools.Filter {
-        if (typeof THREE === 'undefined') {
-          return new gdjs.PixiFiltersTools.EmptyFilter();
-        }
-        return new (class implements gdjs.PixiFiltersTools.Filter {
-          shaderPass: THREE_ADDONS.ShaderPass;
-          _isEnabled: boolean;
-
-          constructor() {
-            this.shaderPass = new THREE_ADDONS.ShaderPass(
-              THREE_ADDONS.ExposureShader
-            );
-            this._isEnabled = false;
-          }
-
-          isEnabled(target: EffectsTarget): boolean {
-            return this._isEnabled;
-          }
-          setEnabled(target: EffectsTarget, enabled: boolean): boolean {
-            if (this._isEnabled === enabled) {
-              return true;
-            }
-            if (enabled) {
-              return this.applyEffect(target);
-            } else {
-              return this.removeEffect(target);
-            }
-          }
-          applyEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().addPostProcessingPass(this.shaderPass);
-            this._isEnabled = true;
-            return true;
-          }
-          removeEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().removePostProcessingPass(this.shaderPass);
-            this._isEnabled = false;
-            return true;
-          }
-          updatePreRender(target: gdjs.EffectsTarget): any {}
-          updateDoubleParameter(parameterName: string, value: number): void {
-            if (parameterName === 'exposure') {
-              this.shaderPass.uniforms[parameterName].value = value;
-            }
-          }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'exposure') {
-              return this.shaderPass.uniforms[parameterName].value;
-            }
-            return 0;
-          }
-          updateStringParameter(parameterName: string, value: string): void {}
-          updateColorParameter(parameterName: string, value: number): void {}
-          getColorParameter(parameterName: string): number {
-            return 0;
-          }
-          updateBooleanParameter(parameterName: string, value: boolean): void {}
-        })();
-      }
-    })()
-  );
-}

Extensions/3D/HueAndSaturationEffect.ts

@@ -1,80 +0,0 @@
-namespace gdjs {
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'Scene3D::HueAndSaturation',
-    new (class implements gdjs.PixiFiltersTools.FilterCreator {
-      makeFilter(
-        target: EffectsTarget,
-        effectData: EffectData
-      ): gdjs.PixiFiltersTools.Filter {
-        if (typeof THREE === 'undefined') {
-          return new gdjs.PixiFiltersTools.EmptyFilter();
-        }
-        return new (class implements gdjs.PixiFiltersTools.Filter {
-          shaderPass: THREE_ADDONS.ShaderPass;
-          _isEnabled: boolean;
-
-          constructor() {
-            this.shaderPass = new THREE_ADDONS.ShaderPass(
-              THREE_ADDONS.HueSaturationShader
-            );
-            this._isEnabled = false;
-          }
-
-          isEnabled(target: EffectsTarget): boolean {
-            return this._isEnabled;
-          }
-          setEnabled(target: EffectsTarget, enabled: boolean): boolean {
-            if (this._isEnabled === enabled) {
-              return true;
-            }
-            if (enabled) {
-              return this.applyEffect(target);
-            } else {
-              return this.removeEffect(target);
-            }
-          }
-          applyEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().addPostProcessingPass(this.shaderPass);
-            this._isEnabled = true;
-            return true;
-          }
-          removeEffect(target: EffectsTarget): boolean {
-            if (!(target instanceof gdjs.Layer)) {
-              return false;
-            }
-            target.getRenderer().removePostProcessingPass(this.shaderPass);
-            this._isEnabled = false;
-            return true;
-          }
-          updatePreRender(target: gdjs.EffectsTarget): any {}
-          updateDoubleParameter(parameterName: string, value: number): void {
-            if (parameterName === 'hue') {
-              this.shaderPass.uniforms[parameterName].value = value / 180;
-            }
-            if (parameterName === 'saturation') {
-              this.shaderPass.uniforms[parameterName].value = value;
-            }
-          }
-          getDoubleParameter(parameterName: string): number {
-            if (parameterName === 'hue') {
-              return this.shaderPass.uniforms[parameterName].value * 180;
-            }
-            if (parameterName === 'saturation') {
-              return this.shaderPass.uniforms[parameterName].value;
-            }
-            return 0;
-          }
-          updateStringParameter(parameterName: string, value: string): void {}
-          updateColorParameter(parameterName: string, value: number): void {}
-          getColorParameter(parameterName: string): number {
-            return 0;
-          }
-          updateBooleanParameter(parameterName: string, value: boolean): void {}
-        })();
-      }
-    })()
-  );
-}

Extensions/3D/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -239,7 +247,7 @@ module.exports = {
           'Model3DObject',
           _('3D Model'),
           _('An animated 3D model.'),
-          'JsPlatform/Extensions/3d_model.svg',
+          'JsPlatform/Extensions/3d_box.svg',
           new gd.Model3DObjectConfiguration()
         )
         .setCategoryFullName(_('General'))
@@ -803,6 +811,7 @@ module.exports = {
     }
 
     const Cube3DObject = new gd.ObjectJsImplementation();
+    // $FlowExpectedError - ignore Flow warning as we're creating an object
     Cube3DObject.updateProperty = function (
       objectContent,
       propertyName,
@@ -851,6 +860,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating an object
     Cube3DObject.getProperties = function (objectContent) {
       const objectProperties = new gd.MapStringPropertyDescriptor();
 
@@ -1090,6 +1100,7 @@ module.exports = {
       })
     );
 
+    // $FlowExpectedError
     Cube3DObject.updateInitialInstanceProperty = function (
       objectContent,
       instance,
@@ -1101,6 +1112,7 @@ module.exports = {
       return false;
     };
 
+    // $FlowExpectedError
     Cube3DObject.getInitialInstanceProperties = function (
       content,
       instance,
@@ -1653,7 +1665,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'),
+        _("Layers and cameras"),
         'res/conditions/3d_box.svg',
         'res/conditions/3d_box.svg'
       )
@@ -1927,86 +1939,6 @@ module.exports = {
         .setType('number')
         .setGroup(_('Orientation'));
     }
-    {
-      const effect = extension
-        .addEffect('HueAndSaturation')
-        .setFullName(_('Hue and saturation'))
-        .setDescription(_('Adjust hue and saturation.'))
-        .markAsNotWorkingForObjects()
-        .markAsOnlyWorkingFor3D()
-        .addIncludeFile('Extensions/3D/HueAndSaturationEffect.js');
-      const properties = effect.getProperties();
-      properties
-        .getOrCreate('hue')
-        .setValue('0')
-        .setLabel(_('Hue in degrees (between -180 and 180)'))
-        .setType('number');
-      properties
-        .getOrCreate('saturation')
-        .setValue('0')
-        .setLabel(_('Saturation (between -1 and 1)'))
-        .setType('number');
-    }
-    {
-      const effect = extension
-        .addEffect('Exposure')
-        .setFullName(_('Exposure'))
-        .setDescription(_('Adjust exposure.'))
-        .markAsNotWorkingForObjects()
-        .markAsOnlyWorkingFor3D()
-        .addIncludeFile('Extensions/3D/ExposureEffect.js');
-      const properties = effect.getProperties();
-      properties
-        .getOrCreate('exposure')
-        .setValue('1')
-        .setLabel(_('Exposure (positive value)'))
-        .setType('number');
-    }
-    {
-      const effect = extension
-        .addEffect('Bloom')
-        .setFullName(_('Bloom'))
-        .setDescription(_('Apply a bloom effect.'))
-        .markAsNotWorkingForObjects()
-        .markAsOnlyWorkingFor3D()
-        .addIncludeFile('Extensions/3D/BloomEffect.js');
-      const properties = effect.getProperties();
-      properties
-        .getOrCreate('strength')
-        .setValue('1')
-        .setLabel(_('Strength (between 0 and 3)'))
-        .setType('number');
-      properties
-        .getOrCreate('radius')
-        .setValue('0')
-        .setLabel(_('Radius (between 0 and 1)'))
-        .setType('number');
-      properties
-        .getOrCreate('threshold')
-        .setValue('0')
-        .setLabel(_('Threshold (between 0 and 1)'))
-        .setType('number');
-    }
-    {
-      const effect = extension
-        .addEffect('BrightnessAndContrast')
-        .setFullName(_('Brightness and contrast.'))
-        .setDescription(_('Adjust brightness and contrast.'))
-        .markAsNotWorkingForObjects()
-        .markAsOnlyWorkingFor3D()
-        .addIncludeFile('Extensions/3D/BrightnessAndContrastEffect.js');
-      const properties = effect.getProperties();
-      properties
-        .getOrCreate('brightness')
-        .setValue('0')
-        .setLabel(_('Brightness (between -1 and 1)'))
-        .setType('number');
-      properties
-        .getOrCreate('contrast')
-        .setValue('0')
-        .setLabel(_('Contrast (between -1 and 1)'))
-        .setType('number');
-    }
     // Don't forget to update the alert condition in Model3DEditor.js when
     // adding a new light.
 
@@ -2022,7 +1954,10 @@ module.exports = {
    * But it is recommended to create tests for the behaviors/objects properties you created
    * to avoid mistakes.
    */
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
   /**
@@ -2030,13 +1965,17 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerEditorConfigurations: function (objectsEditorService) {},
+  registerEditorConfigurations: function (
+    objectsEditorService /*: ObjectsEditorService */
+  ) {},
   /**
    * Register renderers for instance of objects on the scene editor.
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerInstanceRenderers: function (objectsRenderingService) {
+  registerInstanceRenderers: function (
+    objectsRenderingService /*: ObjectsRenderingService */
+  ) {
     const RenderedInstance = objectsRenderingService.RenderedInstance;
     const Rendered3DInstance = objectsRenderingService.Rendered3DInstance;
     const PIXI = objectsRenderingService.PIXI;
@@ -2044,25 +1983,39 @@ module.exports = {
     const THREE_ADDONS = objectsRenderingService.THREE_ADDONS;
 
     const materialIndexToFaceIndex = {
+      // $FlowFixMe
       0: 3,
+      // $FlowFixMe
       1: 2,
+      // $FlowFixMe
       2: 5,
+      // $FlowFixMe
       3: 4,
+      // $FlowFixMe
       4: 0,
+      // $FlowFixMe
       5: 1,
     };
 
     const noRepeatTextureVertexIndexToUvMapping = {
+      // $FlowFixMe
       0: [0, 0],
+      // $FlowFixMe
       1: [1, 0],
+      // $FlowFixMe
       2: [0, 1],
+      // $FlowFixMe
       3: [1, 1],
     };
 
     const noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ = {
+      // $FlowFixMe
       0: [0, 1],
+      // $FlowFixMe
       1: [0, 0],
+      // $FlowFixMe
       2: [1, 1],
+      // $FlowFixMe
       3: [1, 0],
     };
 
@@ -2108,11 +2061,6 @@ module.exports = {
     };
 
     class RenderedCube3DObject2DInstance extends RenderedInstance {
-      /** @type {number} */
-      _centerX = 0;
-      /** @type {number} */
-      _centerY = 0;
-
       constructor(
         project,
         layout,
@@ -2129,9 +2077,10 @@ module.exports = {
           pixiContainer,
           pixiResourcesLoader
         );
-
-        // Name of the resource that is rendered.
-        // If no face is visible, this will be null.
+        /**
+         * Name of the resource that is rendered.
+         * If no face is visible, this will be null.
+         */
         this._renderedResourceName = undefined;
         const properties = associatedObjectConfiguration.getProperties();
         this._defaultWidth = parseFloat(properties.get('width').getValue());
@@ -2161,9 +2110,12 @@ module.exports = {
       }
 
       static getThumbnail(project, resourcesLoader, objectConfiguration) {
-        const textureResourceName = RenderedCube3DObject2DInstance._getResourceNameToDisplay(
-          objectConfiguration
-        );
+        const instance = this._instance;
+
+        const textureResourceName =
+          RenderedCube3DObject2DInstance._getResourceNameToDisplay(
+            objectConfiguration
+          );
         if (textureResourceName) {
           return resourcesLoader.getResourceFullUrl(
             project,
@@ -2175,18 +2127,20 @@ module.exports = {
       }
 
       updateTextureIfNeeded() {
-        const textureName = RenderedCube3DObject2DInstance._getResourceNameToDisplay(
-          this._associatedObjectConfiguration
-        );
+        const textureName =
+          RenderedCube3DObject2DInstance._getResourceNameToDisplay(
+            this._associatedObjectConfiguration
+          );
         if (textureName === this._renderedResourceName) return;
 
         this.updateTexture();
       }
 
       updateTexture() {
-        const textureName = RenderedCube3DObject2DInstance._getResourceNameToDisplay(
-          this._associatedObjectConfiguration
-        );
+        const textureName =
+          RenderedCube3DObject2DInstance._getResourceNameToDisplay(
+            this._associatedObjectConfiguration
+          );
 
         if (!textureName) {
           this._renderFallbackObject = true;
@@ -2444,9 +2398,10 @@ module.exports = {
             continue;
           }
 
-          const shouldRepeatTexture = this._shouldRepeatTextureOnFace[
-            materialIndexToFaceIndex[materialIndex]
-          ];
+          const shouldRepeatTexture =
+            this._shouldRepeatTextureOnFace[
+              materialIndexToFaceIndex[materialIndex]
+            ];
 
           const shouldOrientateFacesTowardsY = this._facesOrientation === 'Y';
 
@@ -2481,16 +2436,13 @@ module.exports = {
                 }
               } else {
                 if (shouldOrientateFacesTowardsY) {
-                  [x, y] = noRepeatTextureVertexIndexToUvMapping[
-                    vertexIndex % 4
-                  ];
+                  [x, y] =
+                    noRepeatTextureVertexIndexToUvMapping[vertexIndex % 4];
                 } else {
-                  [
-                    x,
-                    y,
-                  ] = noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
-                    vertexIndex % 4
-                  ];
+                  [x, y] =
+                    noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
+                      vertexIndex % 4
+                    ];
                 }
               }
               break;
@@ -2520,16 +2472,13 @@ module.exports = {
                 }
               } else {
                 if (shouldOrientateFacesTowardsY) {
-                  [x, y] = noRepeatTextureVertexIndexToUvMapping[
-                    vertexIndex % 4
-                  ];
+                  [x, y] =
+                    noRepeatTextureVertexIndexToUvMapping[vertexIndex % 4];
                 } else {
-                  [
-                    x,
-                    y,
-                  ] = noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
-                    vertexIndex % 4
-                  ];
+                  [x, y] =
+                    noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
+                      vertexIndex % 4
+                    ];
                   x = -x;
                   y = -y;
                 }
@@ -2675,8 +2624,6 @@ module.exports = {
       RenderedCube3DObject3DInstance
     );
 
-    const epsilon = 1 / (1 << 16);
-
     class Model3DRendered2DInstance extends RenderedInstance {
       _modelOriginPoint = [0, 0, 0];
 
@@ -2748,7 +2695,7 @@ module.exports = {
       }
 
       static getThumbnail(project, resourcesLoader, objectConfiguration) {
-        return 'JsPlatform/Extensions/3d_model.svg';
+        return 'JsPlatform/Extensions/3d_box.svg';
       }
 
       getOriginX() {
@@ -2799,24 +2746,13 @@ module.exports = {
         );
         threeObject.updateMatrixWorld(true);
         const boundingBox = new THREE.Box3().setFromObject(threeObject);
-        const shouldKeepModelOrigin = !this._originPoint;
-        if (shouldKeepModelOrigin) {
-          // Keep the origin as part of the model.
-          // For instance, a model can be 1 face of a cube and we want to keep the
-          // inside as part of the object even if it's just void.
-          // It also avoids to have the origin outside of the object box.
-          boundingBox.expandByPoint(new THREE.Vector3(0, 0, 0));
-        }
 
         const modelWidth = boundingBox.max.x - boundingBox.min.x;
         const modelHeight = boundingBox.max.y - boundingBox.min.y;
         const modelDepth = boundingBox.max.z - boundingBox.min.z;
-        this._modelOriginPoint[0] =
-          modelWidth < epsilon ? 0 : -boundingBox.min.x / modelWidth;
-        this._modelOriginPoint[1] =
-          modelHeight < epsilon ? 0 : -boundingBox.min.y / modelHeight;
-        this._modelOriginPoint[2] =
-          modelDepth < epsilon ? 0 : -boundingBox.min.z / modelDepth;
+        this._modelOriginPoint[0] = -boundingBox.min.x / modelWidth;
+        this._modelOriginPoint[1] = -boundingBox.min.y / modelHeight;
+        this._modelOriginPoint[2] = -boundingBox.min.z / modelDepth;
 
         // The model is flipped on Y axis.
         this._modelOriginPoint[1] = 1 - this._modelOriginPoint[1];
@@ -2825,10 +2761,19 @@ module.exports = {
         const centerPoint = this._centerPoint;
         if (centerPoint) {
           threeObject.position.set(
-            -(boundingBox.min.x + modelWidth * centerPoint[0]),
+            -(
+              boundingBox.min.x +
+              (boundingBox.max.x - boundingBox.min.x) * centerPoint[0]
+            ),
             // The model is flipped on Y axis.
-            -(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
-            -(boundingBox.min.z + modelDepth * centerPoint[2])
+            -(
+              boundingBox.min.y +
+              (boundingBox.max.y - boundingBox.min.y) * (1 - centerPoint[1])
+            ),
+            -(
+              boundingBox.min.z +
+              (boundingBox.max.z - boundingBox.min.z) * centerPoint[2]
+            )
           );
         }
 
@@ -2841,9 +2786,9 @@ module.exports = {
         );
 
         // Stretch the model in a 1x1x1 cube.
-        const scaleX = modelWidth < epsilon ? 1 : 1 / modelWidth;
-        const scaleY = modelHeight < epsilon ? 1 : 1 / modelHeight;
-        const scaleZ = modelDepth < epsilon ? 1 : 1 / modelDepth;
+        const scaleX = 1 / modelWidth;
+        const scaleY = 1 / modelHeight;
+        const scaleZ = 1 / modelDepth;
 
         const scaleMatrix = new THREE.Matrix4();
         // Flip on Y because the Y axis is on the opposite side of direct basis.
@@ -2854,22 +2799,10 @@ module.exports = {
 
         if (keepAspectRatio) {
           // Reduce the object dimensions to keep aspect ratio.
-          const widthRatio =
-            modelWidth < epsilon
-              ? Number.POSITIVE_INFINITY
-              : originalWidth / modelWidth;
-          const heightRatio =
-            modelHeight < epsilon
-              ? Number.POSITIVE_INFINITY
-              : originalHeight / modelHeight;
-          const depthRatio =
-            modelDepth < epsilon
-              ? Number.POSITIVE_INFINITY
-              : originalDepth / modelDepth;
-          let scaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
-          if (!Number.isFinite(scaleRatio)) {
-            scaleRatio = 1;
-          }
+          const widthRatio = originalWidth / modelWidth;
+          const heightRatio = originalHeight / modelHeight;
+          const depthRatio = originalDepth / modelDepth;
+          const scaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
 
           this._defaultWidth = scaleRatio * modelWidth;
           this._defaultHeight = scaleRatio * modelHeight;
@@ -3021,11 +2954,6 @@ module.exports = {
         return this.getHeight() * originPoint[1];
       }
 
-      getOriginZ() {
-        const originPoint = this.getOriginPoint();
-        return this.getDepth() * originPoint[2];
-      }
-
       getCenterX() {
         const centerPoint = this.getCenterPoint();
         return this.getWidth() * centerPoint[0];
@@ -3036,11 +2964,6 @@ module.exports = {
         return this.getHeight() * centerPoint[1];
       }
 
-      getCenterZ() {
-        const centerPoint = this.getCenterPoint();
-        return this.getDepth() * centerPoint[2];
-      }
-
       getOriginPoint() {
         return this._originPoint || this._modelOriginPoint;
       }
@@ -3067,24 +2990,12 @@ module.exports = {
         threeObject.updateMatrixWorld(true);
         const boundingBox = new THREE.Box3().setFromObject(threeObject);
 
-        const shouldKeepModelOrigin = !this._originPoint;
-        if (shouldKeepModelOrigin) {
-          // Keep the origin as part of the model.
-          // For instance, a model can be 1 face of a cube and we want to keep the
-          // inside as part of the object even if it's just void.
-          // It also avoids to have the origin outside of the object box.
-          boundingBox.expandByPoint(new THREE.Vector3(0, 0, 0));
-        }
-
         const modelWidth = boundingBox.max.x - boundingBox.min.x;
         const modelHeight = boundingBox.max.y - boundingBox.min.y;
         const modelDepth = boundingBox.max.z - boundingBox.min.z;
-        this._modelOriginPoint[0] =
-          modelWidth < epsilon ? 0 : -boundingBox.min.x / modelWidth;
-        this._modelOriginPoint[1] =
-          modelHeight < epsilon ? 0 : -boundingBox.min.y / modelHeight;
-        this._modelOriginPoint[2] =
-          modelDepth < epsilon ? 0 : -boundingBox.min.z / modelDepth;
+        this._modelOriginPoint[0] = -boundingBox.min.x / modelWidth;
+        this._modelOriginPoint[1] = -boundingBox.min.y / modelHeight;
+        this._modelOriginPoint[2] = -boundingBox.min.z / modelDepth;
 
         // The model is flipped on Y axis.
         this._modelOriginPoint[1] = 1 - this._modelOriginPoint[1];
@@ -3093,10 +3004,19 @@ module.exports = {
         const centerPoint = this._centerPoint;
         if (centerPoint) {
           threeObject.position.set(
-            -(boundingBox.min.x + modelWidth * centerPoint[0]),
+            -(
+              boundingBox.min.x +
+              (boundingBox.max.x - boundingBox.min.x) * centerPoint[0]
+            ),
             // The model is flipped on Y axis.
-            -(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
-            -(boundingBox.min.z + modelDepth * centerPoint[2])
+            -(
+              boundingBox.min.y +
+              (boundingBox.max.y - boundingBox.min.y) * (1 - centerPoint[1])
+            ),
+            -(
+              boundingBox.min.z +
+              (boundingBox.max.z - boundingBox.min.z) * centerPoint[2]
+            )
           );
         }
 
@@ -3109,9 +3029,9 @@ module.exports = {
         );
 
         // Stretch the model in a 1x1x1 cube.
-        const scaleX = modelWidth < epsilon ? 1 : 1 / modelWidth;
-        const scaleY = modelHeight < epsilon ? 1 : 1 / modelHeight;
-        const scaleZ = modelDepth < epsilon ? 1 : 1 / modelDepth;
+        const scaleX = 1 / modelWidth;
+        const scaleY = 1 / modelHeight;
+        const scaleZ = 1 / modelDepth;
 
         const scaleMatrix = new THREE.Matrix4();
         // Flip on Y because the Y axis is on the opposite side of direct basis.
@@ -3122,63 +3042,14 @@ module.exports = {
 
         if (keepAspectRatio) {
           // Reduce the object dimensions to keep aspect ratio.
-          const widthRatio =
-            modelWidth < epsilon
-              ? Number.POSITIVE_INFINITY
-              : originalWidth / modelWidth;
-          const heightRatio =
-            modelHeight < epsilon
-              ? Number.POSITIVE_INFINITY
-              : originalHeight / modelHeight;
-          const depthRatio =
-            modelDepth < epsilon
-              ? Number.POSITIVE_INFINITY
-              : originalDepth / modelDepth;
-          const minScaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
-          if (!Number.isFinite(minScaleRatio)) {
-            this._defaultWidth = modelWidth;
-            this._defaultHeight = modelHeight;
-            this._defaultDepth = modelDepth;
-          } else {
-            if (widthRatio === minScaleRatio) {
-              this._defaultWidth = originalWidth;
-              this._defaultHeight = Rendered3DInstance.applyRatio({
-                oldReferenceValue: modelWidth,
-                newReferenceValue: originalWidth,
-                valueToApplyTo: modelHeight,
-              });
-              this._defaultDepth = Rendered3DInstance.applyRatio({
-                oldReferenceValue: modelWidth,
-                newReferenceValue: originalWidth,
-                valueToApplyTo: modelDepth,
-              });
-            } else if (heightRatio === minScaleRatio) {
-              this._defaultWidth = Rendered3DInstance.applyRatio({
-                oldReferenceValue: modelHeight,
-                newReferenceValue: originalHeight,
-                valueToApplyTo: modelWidth,
-              });
+          const widthRatio = originalWidth / modelWidth;
+          const heightRatio = originalHeight / modelHeight;
+          const depthRatio = originalDepth / modelDepth;
+          const scaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
 
-              this._defaultHeight = originalHeight;
-              this._defaultDepth = Rendered3DInstance.applyRatio({
-                oldReferenceValue: modelHeight,
-                newReferenceValue: originalHeight,
-                valueToApplyTo: modelDepth,
-              });
-            } else {
-              this._defaultWidth = Rendered3DInstance.applyRatio({
-                oldReferenceValue: modelDepth,
-                newReferenceValue: originalDepth,
-                valueToApplyTo: modelWidth,
-              });
-              this._defaultHeight = Rendered3DInstance.applyRatio({
-                oldReferenceValue: modelDepth,
-                newReferenceValue: originalDepth,
-                valueToApplyTo: modelHeight,
-              });
-              this._defaultDepth = originalDepth;
-            }
-          }
+          this._defaultWidth = scaleRatio * modelWidth;
+          this._defaultHeight = scaleRatio * modelHeight;
+          this._defaultDepth = scaleRatio * modelDepth;
         }
       }
 

Extensions/3D/Model3DRuntimeObject3DRenderer.ts

@@ -1,8 +1,6 @@
 namespace gdjs {
   type FloatPoint3D = [float, float, float];
 
-  const epsilon = 1 / (1 << 16);
-
   const removeMetalness = (material: THREE.Material): void => {
     //@ts-ignore
     if (material.metalness) {
@@ -11,7 +9,7 @@ namespace gdjs {
     }
   };
 
-  const removeMetalnessFromMesh = (node: THREE.Object3D) => {
+  const removeMetalnessFromMesh = (node: THREE.Object3D<THREE.Event>) => {
     const mesh = node as THREE.Mesh;
     if (!mesh.material) {
       return;
@@ -25,8 +23,9 @@ namespace gdjs {
     }
   };
 
-  const traverseToRemoveMetalnessFromMeshes = (node: THREE.Object3D) =>
-    node.traverse(removeMetalnessFromMesh);
+  const traverseToRemoveMetalnessFromMeshes = (
+    node: THREE.Object3D<THREE.Event>
+  ) => node.traverse(removeMetalnessFromMesh);
 
   const convertToBasicMaterial = (
     material: THREE.Material
@@ -45,7 +44,7 @@ namespace gdjs {
     return basicMaterial;
   };
 
-  const setBasicMaterialTo = (node: THREE.Object3D): void => {
+  const setBasicMaterialTo = (node: THREE.Object3D<THREE.Event>): void => {
     const mesh = node as THREE.Mesh;
     if (!mesh.material) {
       return;
@@ -60,8 +59,9 @@ namespace gdjs {
     }
   };
 
-  const traverseToSetBasicMaterialFromMeshes = (node: THREE.Object3D) =>
-    node.traverse(setBasicMaterialTo);
+  const traverseToSetBasicMaterialFromMeshes = (
+    node: THREE.Object3D<THREE.Event>
+  ) => node.traverse(setBasicMaterialTo);
 
   class Model3DRuntimeObject3DRenderer extends gdjs.RuntimeObject3DRenderer {
     private _model3DRuntimeObject: gdjs.Model3DRuntimeObject;
@@ -158,24 +158,12 @@ namespace gdjs {
       threeObject.updateMatrixWorld(true);
       const boundingBox = new THREE.Box3().setFromObject(threeObject);
 
-      const shouldKeepModelOrigin = !this._model3DRuntimeObject._originPoint;
-      if (shouldKeepModelOrigin) {
-        // Keep the origin as part of the model.
-        // For instance, a model can be 1 face of a cube and we want to keep the
-        // inside as part of the object even if it's just void.
-        // It also avoids to have the origin outside of the object box.
-        boundingBox.expandByPoint(new THREE.Vector3(0, 0, 0));
-      }
-
       const modelWidth = boundingBox.max.x - boundingBox.min.x;
       const modelHeight = boundingBox.max.y - boundingBox.min.y;
       const modelDepth = boundingBox.max.z - boundingBox.min.z;
-      this._modelOriginPoint[0] =
-        modelWidth < epsilon ? 0 : -boundingBox.min.x / modelWidth;
-      this._modelOriginPoint[1] =
-        modelHeight < epsilon ? 0 : -boundingBox.min.y / modelHeight;
-      this._modelOriginPoint[2] =
-        modelDepth < epsilon ? 0 : -boundingBox.min.z / modelDepth;
+      this._modelOriginPoint[0] = -boundingBox.min.x / modelWidth;
+      this._modelOriginPoint[1] = -boundingBox.min.y / modelHeight;
+      this._modelOriginPoint[2] = -boundingBox.min.z / modelDepth;
 
       // The model is flipped on Y axis.
       this._modelOriginPoint[1] = 1 - this._modelOriginPoint[1];
@@ -184,10 +172,19 @@ namespace gdjs {
       const centerPoint = this._model3DRuntimeObject._centerPoint;
       if (centerPoint) {
         threeObject.position.set(
-          -(boundingBox.min.x + modelWidth * centerPoint[0]),
+          -(
+            boundingBox.min.x +
+            (boundingBox.max.x - boundingBox.min.x) * centerPoint[0]
+          ),
           // The model is flipped on Y axis.
-          -(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
-          -(boundingBox.min.z + modelDepth * centerPoint[2])
+          -(
+            boundingBox.min.y +
+            (boundingBox.max.y - boundingBox.min.y) * (1 - centerPoint[1])
+          ),
+          -(
+            boundingBox.min.z +
+            (boundingBox.max.z - boundingBox.min.z) * centerPoint[2]
+          )
         );
       }
 
@@ -200,9 +197,9 @@ namespace gdjs {
       );
 
       // Stretch the model in a 1x1x1 cube.
-      const scaleX = modelWidth < epsilon ? 1 : 1 / modelWidth;
-      const scaleY = modelHeight < epsilon ? 1 : 1 / modelHeight;
-      const scaleZ = modelDepth < epsilon ? 1 : 1 / modelDepth;
+      const scaleX = 1 / modelWidth;
+      const scaleY = 1 / modelHeight;
+      const scaleZ = 1 / modelDepth;
 
       const scaleMatrix = new THREE.Matrix4();
       // Flip on Y because the Y axis is on the opposite side of direct basis.
@@ -213,22 +210,10 @@ namespace gdjs {
 
       if (keepAspectRatio) {
         // Reduce the object dimensions to keep aspect ratio.
-        const widthRatio =
-          modelWidth < epsilon
-            ? Number.POSITIVE_INFINITY
-            : originalWidth / modelWidth;
-        const heightRatio =
-          modelHeight < epsilon
-            ? Number.POSITIVE_INFINITY
-            : originalHeight / modelHeight;
-        const depthRatio =
-          modelDepth < epsilon
-            ? Number.POSITIVE_INFINITY
-            : originalDepth / modelDepth;
-        let scaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
-        if (!Number.isFinite(scaleRatio)) {
-          scaleRatio = 1;
-        }
+        const widthRatio = originalWidth / modelWidth;
+        const heightRatio = originalHeight / modelHeight;
+        const depthRatio = originalDepth / modelDepth;
+        const scaleRatio = Math.min(widthRatio, heightRatio, depthRatio);
 
         this._object._setOriginalWidth(scaleRatio * modelWidth);
         this._object._setOriginalHeight(scaleRatio * modelHeight);

Extensions/3D/Scene3DTools.ts

@@ -11,11 +11,7 @@ namespace gdjs {
         const layer = runtimeScene.getLayer(layerName);
         const layerRenderer = layer.getRenderer();
         const threeCamera = layerRenderer.getThreeCamera();
-        const fov = threeCamera
-          ? threeCamera instanceof THREE.OrthographicCamera
-            ? null
-            : threeCamera.fov
-          : assumedFovIn2D;
+        const fov = threeCamera ? threeCamera.fov : assumedFovIn2D;
         return layer.getCameraZ(fov, cameraIndex);
       };
 
@@ -28,11 +24,7 @@ namespace gdjs {
         const layer = runtimeScene.getLayer(layerName);
         const layerRenderer = layer.getRenderer();
         const threeCamera = layerRenderer.getThreeCamera();
-        const fov = threeCamera
-          ? threeCamera instanceof THREE.OrthographicCamera
-            ? null
-            : threeCamera.fov
-          : assumedFovIn2D;
+        const fov = threeCamera ? threeCamera.fov : assumedFovIn2D;
         layer.setCameraZ(z, fov, cameraIndex);
       };
 
@@ -221,11 +213,8 @@ namespace gdjs {
         const layerRenderer = layer.getRenderer();
 
         const threeCamera = layerRenderer.getThreeCamera();
-        return threeCamera
-          ? threeCamera instanceof THREE.OrthographicCamera
-            ? 0
-            : threeCamera.fov
-          : assumedFovIn2D;
+        if (!threeCamera) return 45;
+        return threeCamera.fov;
       };
 
       export const setFov = (
@@ -238,8 +227,7 @@ namespace gdjs {
         const layerRenderer = layer.getRenderer();
 
         const threeCamera = layerRenderer.getThreeCamera();
-        if (!threeCamera || threeCamera instanceof THREE.OrthographicCamera)
-          return;
+        if (!threeCamera) return;
 
         threeCamera.fov = Math.min(Math.max(angle, 0), 180);
         layerRenderer.setThreeCameraDirty(true);

Extensions/AdMob/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -33,14 +41,6 @@ module.exports = {
       .addInstructionOrExpressionGroupMetadata(_('AdMob'))
       .setIcon('JsPlatform/Extensions/admobicon24.png');
 
-    extension
-      .addDependency()
-      .setName('Consent Cordova plugin')
-      .setDependencyType('cordova')
-      .setExportName('cordova-plugin-consent')
-      .setVersion('2.4.0')
-      .onlyIfOtherDependencyIsExported('AdMob Cordova plugin');
-
     extension
       .registerProperty('AdMobAppIdAndroid')
       .setLabel(_('AdMob Android App ID'))
@@ -71,6 +71,13 @@ module.exports = {
       )
       .onlyIfSomeExtraSettingsNonEmpty();
 
+    extension
+      .addDependency()
+      .setName('Consent Cordova plugin')
+      .setDependencyType('cordova')
+      .setExportName('cordova-plugin-consent')
+      .onlyIfOtherDependencyIsExported('AdMob Cordova plugin');
+
     extension
       .addAction(
         'SetTestMode',
@@ -782,7 +789,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/AdvancedWindow/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,11 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -709,7 +710,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/BBText/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,11 +12,20 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 const stringifyOptions = (options) => '["' + options.join('","') + '"]';
 
-/** @type {ExtensionModule} */
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -34,6 +42,7 @@ module.exports = {
       .setIcon('JsPlatform/Extensions/bbcode32.png');
 
     var objectBBText = new gd.ObjectJsImplementation();
+    // $FlowExpectedError
     objectBBText.updateProperty = function (
       objectContent,
       propertyName,
@@ -50,6 +59,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError
     objectBBText.getProperties = function (objectContent) {
       const objectProperties = new gd.MapStringPropertyDescriptor();
 
@@ -116,8 +126,7 @@ module.exports = {
     };
     objectBBText.setRawJSONContent(
       JSON.stringify({
-        text:
-          '[b]bold[/b] [i]italic[/i] [size=15]smaller[/size] [font=times]times[/font] font\n[spacing=12]spaced out[/spacing]\n[outline=yellow]outlined[/outline] [shadow=red]DropShadow[/shadow] ',
+        text: '[b]bold[/b] [i]italic[/i] [size=15]smaller[/size] [font=times]times[/font] font\n[spacing=12]spaced out[/spacing]\n[outline=yellow]outlined[/outline] [shadow=red]DropShadow[/shadow] ',
         opacity: 255,
         fontSize: 20,
         visible: true,
@@ -128,6 +137,7 @@ module.exports = {
       })
     );
 
+    // $FlowExpectedError
     objectBBText.updateInitialInstanceProperty = function (
       objectContent,
       instance,
@@ -138,6 +148,7 @@ module.exports = {
     ) {
       return false;
     };
+    // $FlowExpectedError
     objectBBText.getInitialInstanceProperties = function (
       content,
       instance,
@@ -212,9 +223,10 @@ module.exports = {
           parameterType === 'string' ||
           parameterType === 'stringWithSelector'
         ) {
-          const parameterOptions = gd.ParameterOptions.makeNewOptions().setDescription(
-            property.paramLabel
-          );
+          const parameterOptions =
+            gd.ParameterOptions.makeNewOptions().setDescription(
+              property.paramLabel
+            );
           if (property.options) {
             parameterOptions.setTypeExtraInfo(
               stringifyOptions(property.options)
@@ -264,9 +276,10 @@ module.exports = {
           parameterType === 'number' ||
           parameterType === 'stringWithSelector'
         ) {
-          const parameterOptions = gd.ParameterOptions.makeNewOptions().setDescription(
-            property.paramLabel
-          );
+          const parameterOptions =
+            gd.ParameterOptions.makeNewOptions().setDescription(
+              property.paramLabel
+            );
           if (property.options) {
             parameterOptions.setTypeExtraInfo(
               stringifyOptions(property.options)
@@ -423,21 +436,6 @@ module.exports = {
 
     addSettersAndGettersToObject(object, setterAndGetterProperties, 'BBText');
 
-    object
-      .addAction(
-        `SetFontFamily2`,
-        _('Font family'),
-        _('Set font family'),
-        _('Set the font of _PARAM0_ to _PARAM1_'),
-        '',
-        'res/actions/font24.png',
-        'res/actions/font24.png'
-      )
-      .addParameter('object', 'BBText', 'BBText', false)
-      .addParameter('fontResource', _('Font family'), '', false)
-      .getCodeExtraInformation()
-      .setFunctionName(`setFontFamily`);
-
     const actions = object.getAllActions();
     const conditions = object.getAllConditions();
     const expressions = object.getAllExpressions();
@@ -445,9 +443,6 @@ module.exports = {
     actions.get('BBText::SetOpacity').setHidden();
     conditions.get('BBText::IsOpacity').setHidden();
     expressions.get('GetOpacity').setHidden();
-    // Action deprecated because it's using the `string` type instead of the more
-    // user-friendly `fontResource` type.
-    actions.get('BBText::SetFontFamily').setHidden();
 
     return extension;
   },
@@ -462,7 +457,10 @@ module.exports = {
    * But it is recommended to create tests for the behaviors/objects properties you created
    * to avoid mistakes.
    */
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
   /**
@@ -470,7 +468,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerEditorConfigurations: function (objectsEditorService) {
+  registerEditorConfigurations: function (
+    objectsEditorService /*: ObjectsEditorService */
+  ) {
     objectsEditorService.registerEditorConfiguration(
       'BBText::BBText',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
@@ -483,8 +483,11 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerInstanceRenderers: function (objectsRenderingService) {
+  registerInstanceRenderers: function (
+    objectsRenderingService /*: ObjectsRenderingService */
+  ) {
     const RenderedInstance = objectsRenderingService.RenderedInstance;
+    const PIXI = objectsRenderingService.PIXI;
     const MultiStyleText = objectsRenderingService.requireModule(
       __dirname,
       'pixi-multistyle-text/dist/pixi-multistyle-text.umd'
@@ -493,145 +496,150 @@ module.exports = {
     /**
      * Renderer for instances of BBText inside the IDE.
      *
-     * @extends RenderedInstance
+     * @extends RenderedBBTextInstance
      * @class RenderedBBTextInstance
      * @constructor
      */
-    class RenderedBBTextInstance extends RenderedInstance {
-      constructor(
+    function RenderedBBTextInstance(
+      project,
+      layout,
+      instance,
+      associatedObjectConfiguration,
+      pixiContainer,
+      pixiResourcesLoader
+    ) {
+      RenderedInstance.call(
+        this,
         project,
         layout,
         instance,
         associatedObjectConfiguration,
         pixiContainer,
         pixiResourcesLoader
-      ) {
-        super(
-          project,
-          layout,
-          instance,
-          associatedObjectConfiguration,
-          pixiContainer,
-          pixiResourcesLoader
-        );
+      );
 
-        const bbTextStyles = {
-          default: {
-            // Use a default font family the time for the resource font to be loaded.
-            fontFamily: 'Arial',
-            fontSize: '24px',
-            fill: '#cccccc',
-            tagStyle: 'bbcode',
-            wordWrap: true,
-            wordWrapWidth: 250, // This value is the default wrapping width of the runtime object.
-            align: 'left',
-          },
-        };
+      const bbTextStyles = {
+        default: {
+          // Use a default font family the time for the resource font to be loaded.
+          fontFamily: 'Arial',
+          fontSize: '24px',
+          fill: '#cccccc',
+          tagStyle: 'bbcode',
+          wordWrap: true,
+          wordWrapWidth: 250, // This value is the default wrapping width of the runtime object.
+          align: 'left',
+        },
+      };
 
-        this._pixiObject = new MultiStyleText('', bbTextStyles);
+      this._pixiObject = new MultiStyleText('', bbTextStyles);
 
-        this._pixiObject.anchor.x = 0.5;
-        this._pixiObject.anchor.y = 0.5;
-        this._pixiContainer.addChild(this._pixiObject);
-        this.update();
-      }
-
-      /**
-       * Return the path to the thumbnail of the specified object.
-       */
-      static getThumbnail(project, resourcesLoader, objectConfiguration) {
-        return 'JsPlatform/Extensions/bbcode24.png';
-      }
-
-      /**
-       * This is called to update the PIXI object on the scene editor
-       */
-      update() {
-        const properties = this._associatedObjectConfiguration.getProperties();
-
-        const rawText = properties.get('text').getValue();
-        if (rawText !== this._pixiObject.text) {
-          this._pixiObject.text = rawText;
-        }
-
-        const opacity = +properties.get('opacity').getValue();
-        this._pixiObject.alpha = opacity / 255;
-
-        const color = properties.get('color').getValue();
-        this._pixiObject.textStyles.default.fill = objectsRenderingService.rgbOrHexToHexNumber(
-          color
-        );
-
-        const fontSize = properties.get('fontSize').getValue();
-        this._pixiObject.textStyles.default.fontSize = `${fontSize}px`;
-
-        const fontResourceName = properties.get('fontFamily').getValue();
-
-        if (this._fontResourceName !== fontResourceName) {
-          this._fontResourceName = fontResourceName;
-
-          this._pixiResourcesLoader
-            .loadFontFamily(this._project, fontResourceName)
-            .then((fontFamily) => {
-              // Once the font is loaded, we can use the given fontFamily.
-              this._pixiObject.textStyles.default.fontFamily = fontFamily;
-              this._pixiObject.dirty = true;
-            })
-            .catch((err) => {
-              // Ignore errors
-              console.warn(
-                'Unable to load font family for RenderedBBTextInstance',
-                err
-              );
-            });
-        }
-
-        const wordWrap = properties.get('wordWrap').getValue() === 'true';
-        if (wordWrap !== this._pixiObject._style.wordWrap) {
-          this._pixiObject._style.wordWrap = wordWrap;
-          this._pixiObject.dirty = true;
-        }
-
-        const align = properties.get('align').getValue();
-        if (align !== this._pixiObject._style.align) {
-          this._pixiObject._style.align = align;
-          this._pixiObject.dirty = true;
-        }
-
-        this._pixiObject.position.x =
-          this._instance.getX() + this._pixiObject.width / 2;
-        this._pixiObject.position.y =
-          this._instance.getY() + this._pixiObject.height / 2;
-        this._pixiObject.rotation = RenderedInstance.toRad(
-          this._instance.getAngle()
-        );
-
-        if (this._instance.hasCustomSize() && this._pixiObject) {
-          const customWidth = this.getCustomWidth();
-          if (
-            this._pixiObject &&
-            this._pixiObject._style.wordWrapWidth !== customWidth
-          ) {
-            this._pixiObject._style.wordWrapWidth = customWidth;
-            this._pixiObject.dirty = true;
-          }
-        }
-      }
-
-      /**
-       * Return the width of the instance, when it's not resized.
-       */
-      getDefaultWidth() {
-        return this._pixiObject.width;
-      }
-
-      /**
-       * Return the height of the instance, when it's not resized.
-       */
-      getDefaultHeight() {
-        return this._pixiObject.height;
-      }
+      this._pixiObject.anchor.x = 0.5;
+      this._pixiObject.anchor.y = 0.5;
+      this._pixiContainer.addChild(this._pixiObject);
+      this.update();
     }
+    RenderedBBTextInstance.prototype = Object.create(
+      RenderedInstance.prototype
+    );
+
+    /**
+     * Return the path to the thumbnail of the specified object.
+     */
+    RenderedBBTextInstance.getThumbnail = function (
+      project,
+      resourcesLoader,
+      objectConfiguration
+    ) {
+      return 'JsPlatform/Extensions/bbcode24.png';
+    };
+
+    /**
+     * This is called to update the PIXI object on the scene editor
+     */
+    RenderedBBTextInstance.prototype.update = function () {
+      const properties = this._associatedObjectConfiguration.getProperties();
+
+      const rawText = properties.get('text').getValue();
+      if (rawText !== this._pixiObject.text) {
+        this._pixiObject.text = rawText;
+      }
+
+      const opacity = properties.get('opacity').getValue();
+      this._pixiObject.alpha = opacity / 255;
+
+      const color = properties.get('color').getValue();
+      this._pixiObject.textStyles.default.fill =
+        objectsRenderingService.rgbOrHexToHexNumber(color);
+
+      const fontSize = properties.get('fontSize').getValue();
+      this._pixiObject.textStyles.default.fontSize = `${fontSize}px`;
+
+      const fontResourceName = properties.get('fontFamily').getValue();
+
+      if (this._fontResourceName !== fontResourceName) {
+        this._fontResourceName = fontResourceName;
+
+        this._pixiResourcesLoader
+          .loadFontFamily(this._project, fontResourceName)
+          .then((fontFamily) => {
+            // Once the font is loaded, we can use the given fontFamily.
+            this._pixiObject.textStyles.default.fontFamily = fontFamily;
+            this._pixiObject.dirty = true;
+          })
+          .catch((err) => {
+            // Ignore errors
+            console.warn(
+              'Unable to load font family for RenderedBBTextInstance',
+              err
+            );
+          });
+      }
+
+      const wordWrap = properties.get('wordWrap').getValue() === 'true';
+      if (wordWrap !== this._pixiObject._style.wordWrap) {
+        this._pixiObject._style.wordWrap = wordWrap;
+        this._pixiObject.dirty = true;
+      }
+
+      const align = properties.get('align').getValue();
+      if (align !== this._pixiObject._style.align) {
+        this._pixiObject._style.align = align;
+        this._pixiObject.dirty = true;
+      }
+
+      this._pixiObject.position.x =
+        this._instance.getX() + this._pixiObject.width / 2;
+      this._pixiObject.position.y =
+        this._instance.getY() + this._pixiObject.height / 2;
+      this._pixiObject.rotation = RenderedInstance.toRad(
+        this._instance.getAngle()
+      );
+
+      if (this._instance.hasCustomSize() && this._pixiObject) {
+        const customWidth = this.getCustomWidth();
+        if (
+          this._pixiObject &&
+          this._pixiObject._style.wordWrapWidth !== customWidth
+        ) {
+          this._pixiObject._style.wordWrapWidth = customWidth;
+          this._pixiObject.dirty = true;
+        }
+      }
+    };
+
+    /**
+     * Return the width of the instance, when it's not resized.
+     */
+    RenderedBBTextInstance.prototype.getDefaultWidth = function () {
+      return this._pixiObject.width;
+    };
+
+    /**
+     * Return the height of the instance, when it's not resized.
+     */
+    RenderedBBTextInstance.prototype.getDefaultHeight = function () {
+      return this._pixiObject.height;
+    };
 
     objectsRenderingService.registerInstanceRenderer(
       'BBText::BBText',

Extensions/BBText/bbtextruntimeobject.ts

@@ -141,7 +141,6 @@ namespace gdjs {
     setBBText(text): void {
       this._text = text;
       this._renderer.updateText();
-      this.invalidateHitboxes();
     }
 
     /**

Extensions/BitmapText/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -34,6 +42,7 @@ module.exports = {
       .setIcon('JsPlatform/Extensions/bitmapfont32.png');
 
     const bitmapTextObject = new gd.ObjectJsImplementation();
+    // $FlowExpectedError
     bitmapTextObject.updateProperty = function (
       objectContent,
       propertyName,
@@ -50,6 +59,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError
     bitmapTextObject.getProperties = function (objectContent) {
       const objectProperties = new gd.MapStringPropertyDescriptor();
 
@@ -117,8 +127,7 @@ module.exports = {
     };
     bitmapTextObject.setRawJSONContent(
       JSON.stringify({
-        text:
-          'This text use the default bitmap font.\nUse a custom Bitmap Font to create your own texts.',
+        text: 'This text use the default bitmap font.\nUse a custom Bitmap Font to create your own texts.',
         opacity: 255,
         scale: 1,
         fontSize: 20,
@@ -130,6 +139,7 @@ module.exports = {
       })
     );
 
+    // $FlowExpectedError
     bitmapTextObject.updateInitialInstanceProperty = function (
       objectContent,
       instance,
@@ -140,6 +150,7 @@ module.exports = {
     ) {
       return false;
     };
+    // $FlowExpectedError
     bitmapTextObject.getInitialInstanceProperties = function (
       content,
       instance,
@@ -165,7 +176,7 @@ module.exports = {
         'Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.js'
       )
       .setCategoryFullName(_('Text'))
-      .addDefaultBehavior('TextContainerCapability::TextContainerBehavior')
+      .addDefaultBehavior("TextContainerCapability::TextContainerBehavior")
       .addDefaultBehavior('EffectCapability::EffectBehavior')
       .addDefaultBehavior('OpacityCapability::OpacityBehavior')
       .addDefaultBehavior('ScalableCapability::ScalableBehavior');
@@ -316,33 +327,33 @@ 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
+        .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(
@@ -440,7 +451,10 @@ module.exports = {
    * But it is recommended to create tests for the behaviors/objects properties you created
    * to avoid mistakes.
    */
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
   /**
@@ -448,7 +462,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerEditorConfigurations: function (objectsEditorService) {
+  registerEditorConfigurations: function (
+    objectsEditorService /*: ObjectsEditorService */
+  ) {
     objectsEditorService.registerEditorConfiguration(
       'BitmapText::BitmapTextObject',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
@@ -461,7 +477,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerInstanceRenderers: function (objectsRenderingService) {
+  registerInstanceRenderers: function (
+    objectsRenderingService /*: ObjectsRenderingService */
+  ) {
     const RenderedInstance = objectsRenderingService.RenderedInstance;
     const PIXI = objectsRenderingService.PIXI;
 
@@ -631,144 +649,156 @@ module.exports = {
     };
 
     /**
-     * Return the path to the thumbnail of the specified object.
-     * This is called to update the PIXI object on the scene editor
+     * Renderer for instances of BitmapText inside the IDE.
+     *
+     * @extends RenderedBitmapTextInstance
+     * @class RenderedBitmapTextInstance
+     * @constructor
      */
-    class RenderedBitmapTextInstance extends RenderedInstance {
-      static getThumbnail(project, resourcesLoader, objectConfiguration) {
-        return 'JsPlatform/Extensions/bitmapfont24.png';
-      }
-
-      constructor(
+    function RenderedBitmapTextInstance(
+      project,
+      layout,
+      instance,
+      associatedObjectConfiguration,
+      pixiContainer,
+      pixiResourcesLoader
+    ) {
+      RenderedInstance.call(
+        this,
         project,
         layout,
         instance,
         associatedObjectConfiguration,
         pixiContainer,
         pixiResourcesLoader
-      ) {
-        super(
-          project,
-          layout,
-          instance,
-          associatedObjectConfiguration,
-          pixiContainer,
-          pixiResourcesLoader
-        );
+      );
 
-        // We'll track changes of the font to trigger the loading of the new font.
-        this._currentBitmapFontResourceName = '';
-        this._currentTextureAtlasResourceName = '';
+      // We'll track changes of the font to trigger the loading of the new font.
+      this._currentBitmapFontResourceName = '';
+      this._currentTextureAtlasResourceName = '';
 
-        this._pixiObject = new PIXI.BitmapText('', {
-          // Use a default font. The proper font will be loaded in `update` method.
-          fontName: getDefaultBitmapFont().font,
-        });
+      this._pixiObject = new PIXI.BitmapText('', {
+        // Use a default font. The proper font will be loaded in `update` method.
+        fontName: getDefaultBitmapFont().font,
+      });
 
-        this._pixiObject.anchor.x = 0.5;
-        this._pixiObject.anchor.y = 0.5;
-        this._pixiContainer.addChild(this._pixiObject);
-        this.update();
-      }
-
-      update() {
-        const properties = this._associatedObjectConfiguration.getProperties();
-
-        // Update the rendered text properties (note: Pixi is only
-        // applying changes if there were changed).
-        const rawText = properties.get('text').getValue();
-        this._pixiObject.text = rawText;
-
-        const opacity = +properties.get('opacity').getValue();
-        this._pixiObject.alpha = opacity / 255;
-
-        const align = properties.get('align').getValue();
-        this._pixiObject.align = align;
-
-        const color = properties.get('tint').getValue();
-        this._pixiObject.tint = objectsRenderingService.rgbOrHexToHexNumber(
-          color
-        );
-
-        const scale = +(properties.get('scale').getValue() || 1);
-        this._pixiObject.scale.set(scale);
-
-        // Track the changes in font to load the new requested font.
-        const bitmapFontResourceName = properties
-          .get('bitmapFontResourceName')
-          .getValue();
-        const textureAtlasResourceName = properties
-          .get('textureAtlasResourceName')
-          .getValue();
-
-        if (
-          this._currentBitmapFontResourceName !== bitmapFontResourceName ||
-          this._currentTextureAtlasResourceName !== textureAtlasResourceName
-        ) {
-          // Release the old font (if it was installed).
-          releaseBitmapFont(this._pixiObject.fontName);
-
-          // Temporarily go back to the default font, as the PIXI.BitmapText
-          // object does not support being displayed with a font not installed at all.
-          // It will be replaced as soon as the proper font is loaded.
-          this._pixiObject.fontName = getDefaultBitmapFont().font;
-
-          this._currentBitmapFontResourceName = bitmapFontResourceName;
-          this._currentTextureAtlasResourceName = textureAtlasResourceName;
-          obtainBitmapFont(
-            this._pixiResourcesLoader,
-            this._project,
-            this._currentBitmapFontResourceName,
-            this._currentTextureAtlasResourceName
-          ).then((bitmapFont) => {
-            this._pixiObject.fontName = bitmapFont.font;
-            this._pixiObject.fontSize = bitmapFont.size;
-            this._pixiObject.dirty = true;
-          });
-        }
-
-        // Set up the wrapping width if enabled.
-        const wordWrap = properties.get('wordWrap').getValue() === 'true';
-        if (wordWrap && this._instance.hasCustomSize()) {
-          this._pixiObject.maxWidth =
-            this.getCustomWidth() / this._pixiObject.scale.x;
-          this._pixiObject.dirty = true;
-        } else {
-          this._pixiObject.maxWidth = 0;
-          this._pixiObject.dirty = true;
-        }
-
-        this._pixiObject.position.x =
-          this._instance.getX() + (this._pixiObject.textWidth * scale) / 2;
-        this._pixiObject.position.y =
-          this._instance.getY() + (this._pixiObject.textHeight * scale) / 2;
-        this._pixiObject.rotation = RenderedInstance.toRad(
-          this._instance.getAngle()
-        );
-      }
-
-      onRemovedFromScene() {
-        RenderedInstance.prototype.onRemovedFromScene.call(this);
-
-        const fontName = this._pixiObject.fontName;
-        this._pixiObject.destroy();
-        releaseBitmapFont(fontName);
-      }
-
-      /**
-       * Return the width of the instance, when it's not resized.
-       */
-      getDefaultWidth() {
-        return this._pixiObject.width;
-      }
-
-      /**
-       * Return the height of the instance, when it's not resized.
-       */
-      getDefaultHeight() {
-        return this._pixiObject.height;
-      }
+      this._pixiObject.anchor.x = 0.5;
+      this._pixiObject.anchor.y = 0.5;
+      this._pixiContainer.addChild(this._pixiObject);
+      this.update();
     }
+    RenderedBitmapTextInstance.prototype = Object.create(
+      RenderedInstance.prototype
+    );
+
+    /**
+     * Return the path to the thumbnail of the specified object.
+     */
+    RenderedBitmapTextInstance.getThumbnail = function (
+      project,
+      resourcesLoader,
+      objectConfiguration
+    ) {
+      return 'JsPlatform/Extensions/bitmapfont24.png';
+    };
+
+    // This is called to update the PIXI object on the scene editor
+    RenderedBitmapTextInstance.prototype.update = function () {
+      const properties = this._associatedObjectConfiguration.getProperties();
+
+      // Update the rendered text properties (note: Pixi is only
+      // applying changes if there were changed).
+      const rawText = properties.get('text').getValue();
+      this._pixiObject.text = rawText;
+
+      const opacity = properties.get('opacity').getValue();
+      this._pixiObject.alpha = opacity / 255;
+
+      const align = properties.get('align').getValue();
+      this._pixiObject.align = align;
+
+      const color = properties.get('tint').getValue();
+      this._pixiObject.tint =
+        objectsRenderingService.rgbOrHexToHexNumber(color);
+
+      const scale = properties.get('scale').getValue() || 1;
+      this._pixiObject.scale.set(scale);
+
+      // Track the changes in font to load the new requested font.
+      const bitmapFontResourceName = properties
+        .get('bitmapFontResourceName')
+        .getValue();
+      const textureAtlasResourceName = properties
+        .get('textureAtlasResourceName')
+        .getValue();
+
+      if (
+        this._currentBitmapFontResourceName !== bitmapFontResourceName ||
+        this._currentTextureAtlasResourceName !== textureAtlasResourceName
+      ) {
+        // Release the old font (if it was installed).
+        releaseBitmapFont(this._pixiObject.fontName);
+
+        // Temporarily go back to the default font, as the PIXI.BitmapText
+        // object does not support being displayed with a font not installed at all.
+        // It will be replaced as soon as the proper font is loaded.
+        this._pixiObject.fontName = getDefaultBitmapFont().font;
+
+        this._currentBitmapFontResourceName = bitmapFontResourceName;
+        this._currentTextureAtlasResourceName = textureAtlasResourceName;
+        obtainBitmapFont(
+          this._pixiResourcesLoader,
+          this._project,
+          this._currentBitmapFontResourceName,
+          this._currentTextureAtlasResourceName
+        ).then((bitmapFont) => {
+          this._pixiObject.fontName = bitmapFont.font;
+          this._pixiObject.fontSize = bitmapFont.size;
+          this._pixiObject.dirty = true;
+        });
+      }
+
+      // Set up the wrapping width if enabled.
+      const wordWrap = properties.get('wordWrap').getValue() === 'true';
+      if (wordWrap && this._instance.hasCustomSize()) {
+        this._pixiObject.maxWidth =
+          this.getCustomWidth() / this._pixiObject.scale.x;
+        this._pixiObject.dirty = true;
+      } else {
+        this._pixiObject.maxWidth = 0;
+        this._pixiObject.dirty = true;
+      }
+
+      this._pixiObject.position.x =
+        this._instance.getX() + (this._pixiObject.textWidth * scale) / 2;
+      this._pixiObject.position.y =
+        this._instance.getY() + (this._pixiObject.textHeight * scale) / 2;
+      this._pixiObject.rotation = RenderedInstance.toRad(
+        this._instance.getAngle()
+      );
+    };
+
+    RenderedBitmapTextInstance.prototype.onRemovedFromScene = function () {
+      RenderedInstance.prototype.onRemovedFromScene.call(this);
+
+      const fontName = this._pixiObject.fontName;
+      this._pixiObject.destroy();
+      releaseBitmapFont(fontName);
+    };
+
+    /**
+     * Return the width of the instance, when it's not resized.
+     */
+    RenderedBitmapTextInstance.prototype.getDefaultWidth = function () {
+      return this._pixiObject.width;
+    };
+
+    /**
+     * Return the height of the instance, when it's not resized.
+     */
+    RenderedBitmapTextInstance.prototype.getDefaultHeight = function () {
+      return this._pixiObject.height;
+    };
 
     objectsRenderingService.registerInstanceRenderer(
       'BitmapText::BitmapTextObject',

Extensions/CMakeLists.txt

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

Extensions/DebuggerTools/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -106,7 +114,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/DeviceSensors/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,389 +12,450 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
     const extension = new gd.PlatformExtension();
-    extension
-      .setExtensionInformation(
-        'DeviceSensors',
-        _('Device sensors'),
-        _('Allow the game to access the sensors of a mobile device.'),
-        'Matthias Meike',
-        'Open source (MIT License)'
-      )
-      .setExtensionHelpPath('/all-features/device-sensors')
-      .setCategory('Input');
-    extension
-      .addInstructionOrExpressionGroupMetadata(_('Device sensors'))
-      .setIcon('JsPlatform/Extensions/orientation_active32.png');
+    extension.setExtensionInformation(
+      "DeviceSensors",
+      _("Device sensors"),
+      _(
+        "Allow the game to access the sensors of a mobile device."
+      ),
+      "Matthias Meike",
+      "Open source (MIT License)"
+    ).setExtensionHelpPath("/all-features/device-sensors")
+    .setCategory('Input');
+    extension.addInstructionOrExpressionGroupMetadata(_("Device sensors"))
+        .setIcon("JsPlatform/Extensions/orientation_active32.png");
 
     extension
       .addCondition(
-        'OrientationSensorActive',
-        _('Sensor active'),
+        "OrientationSensorActive",
+        _("Sensor active"),
         _(
-          'The condition is true if the device orientation sensor is currently active'
+          "The condition is true if the device orientation sensor is currently active"
         ),
-        _('Orientation sensor is active'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_active32.png',
-        'JsPlatform/Extensions/orientation_active32.png'
+        _("Orientation sensor is active"),
+        _("Orientation"),
+        "JsPlatform/Extensions/orientation_active32.png",
+        "JsPlatform/Extensions/orientation_active32.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.isActive');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.isActive");
 
-    extension
+      extension
       .addCondition(
-        'OrientationAlpha',
-        _('Compare the value of orientation alpha'),
-        _('Compare the value of orientation alpha. (Range: 0 to 360°)'),
-        _('the orientation alpha'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_alpha32.png',
-        'JsPlatform/Extensions/orientation_alpha32.png'
+        "OrientationAlpha",
+        _("Compare the value of orientation alpha"),
+        _(
+          "Compare the value of orientation alpha. (Range: 0 to 360°)"
+        ),
+        _("the orientation alpha"),
+        _("Orientation"),
+        "JsPlatform/Extensions/orientation_alpha32.png",
+        "JsPlatform/Extensions/orientation_alpha32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationAlpha');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationAlpha");
 
-    extension
+      extension
       .addCondition(
-        'OrientationBeta',
-        _('Compare the value of orientation beta'),
-        _('Compare the value of orientation beta. (Range: -180 to 180°)'),
-        _('the orientation beta'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_beta32.png',
-        'JsPlatform/Extensions/orientation_beta32.png'
+        "OrientationBeta",
+        _("Compare the value of orientation beta"),
+        _(
+          "Compare the value of orientation beta. (Range: -180 to 180°)"
+        ),
+        _("the orientation beta"),
+        _("Orientation"),
+        "JsPlatform/Extensions/orientation_beta32.png",
+        "JsPlatform/Extensions/orientation_beta32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationBeta');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationBeta");
 
-    extension
+      extension
       .addCondition(
-        'OrientationGamma',
-        _('Compare the value of orientation gamma'),
-        _('Compare the value of orientation gamma. (Range: -90 to 90°)'),
-        _('the orientation gamma'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_gamma32.png',
-        'JsPlatform/Extensions/orientation_gamma32.png'
+        "OrientationGamma",
+        _("Compare the value of orientation gamma"),
+        _(
+          "Compare the value of orientation gamma. (Range: -90 to 90°)"
+        ),
+        _("the orientation gamma"),
+        _("Orientation"),
+        "JsPlatform/Extensions/orientation_gamma32.png",
+        "JsPlatform/Extensions/orientation_gamma32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationGamma');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationGamma");
 
     extension
       .addAction(
-        'ActivateOrientationListener',
-        _('Activate orientation sensor'),
-        _('Activate the orientation sensor. (remember to turn it off again)'),
-        _('Activate the orientation sensor.'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_active32.png',
-        'JsPlatform/Extensions/orientation_active32.png'
+        "ActivateOrientationListener",
+        _("Activate orientation sensor"),
+        _("Activate the orientation sensor. (remember to turn it off again)"),
+        _("Activate the orientation sensor."),
+        _("Orientation"),
+        "JsPlatform/Extensions/orientation_active32.png",
+        "JsPlatform/Extensions/orientation_active32.png"
       )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName(
-        'gdjs.deviceSensors.orientation.activateOrientationSensor'
-      );
+        .getCodeExtraInformation()
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.activateOrientationSensor");
 
     extension
       .addAction(
-        'DeactivateOrientationListener',
-        _('Deactivate orientation sensor'),
-        _('Deactivate the orientation sensor.'),
-        _('Deactivate the orientation sensor.'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_inactive32.png',
-        'JsPlatform/Extensions/orientation_inactive32.png'
+        "DeactivateOrientationListener",
+        _("Deactivate orientation sensor"),
+        _("Deactivate the orientation sensor."),
+        _("Deactivate the orientation sensor."),
+        _("Orientation"),
+        "JsPlatform/Extensions/orientation_inactive32.png",
+        "JsPlatform/Extensions/orientation_inactive32.png"
       )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName(
-        'gdjs.deviceSensors.orientation.deactivateOrientationSensor'
-      );
+        .getCodeExtraInformation()
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.deactivateOrientationSensor");
 
     extension
       .addExpression(
-        'OrientationAbsolute',
-        _('Is Absolute'),
-        _('Get if the devices orientation is absolute and not relative'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_absolute16.png'
+        "OrientationAbsolute",
+        _("Is Absolute"),
+        _("Get if the devices orientation is absolute and not relative"),
+        _("Orientation"),
+	"JsPlatform/Extensions/orientation_absolute16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationAbsolute');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationAbsolute");
 
     extension
       .addExpression(
-        'OrientationAlpha',
-        _('Alpha value'),
-        _('Get the devices orientation Alpha (compass)'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_alpha16.png'
+        "OrientationAlpha",
+        _("Alpha value"),
+        _("Get the devices orientation Alpha (compass)"),
+        _("Orientation"),
+	"JsPlatform/Extensions/orientation_alpha16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationAlpha');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationAlpha");
 
     extension
       .addExpression(
-        'OrientationBeta',
-        _('Beta value'),
-        _('Get the devices orientation Beta'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_beta16.png'
+        "OrientationBeta",
+        _("Beta value"),
+        _("Get the devices orientation Beta"),
+        _("Orientation"),
+	"JsPlatform/Extensions/orientation_beta16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationBeta');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationBeta");
 
     extension
       .addExpression(
-        'OrientationGamma',
-        _('Gamma value'),
-        _('Get the devices orientation Gamma value'),
-        _('Orientation'),
-        'JsPlatform/Extensions/orientation_gamma16.png'
+        "OrientationGamma",
+        _("Gamma value"),
+        _("Get the devices orientation Gamma value"),
+        _("Orientation"),
+	"JsPlatform/Extensions/orientation_gamma16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.orientation.getOrientationGamma');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.orientation.getOrientationGamma");
 
-    extension
+      extension
       .addCondition(
-        'MotionSensorActive',
-        _('Sensor active'),
+        "MotionSensorActive",
+        _("Sensor active"),
         _(
-          'The condition is true if the device motion sensor is currently active'
+          "The condition is true if the device motion sensor is currently active"
         ),
-        _('Motion sensor is active'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_active32.png',
-        'JsPlatform/Extensions/motion_active32.png'
+        _("Motion sensor is active"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_active32.png",
+        "JsPlatform/Extensions/motion_active32.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.isActive');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.isActive");
 
-    extension
+      extension
       .addCondition(
-        'RotationAlpha',
-        _('Compare the value of rotation alpha'),
+        "RotationAlpha",
+        _("Compare the value of rotation alpha"),
         _(
-          'Compare the value of rotation alpha. (Note: few devices support this sensor)'
+          "Compare the value of rotation alpha. (Note: few devices support this sensor)"
         ),
-        _('the rotation alpha'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_rotation_alpha32.png',
-        'JsPlatform/Extensions/motion_rotation_alpha32.png'
+        _("the rotation alpha"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_rotation_alpha32.png",
+        "JsPlatform/Extensions/motion_rotation_alpha32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value (m/s²)'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value (m/s²)"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getRotationAlpha');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getRotationAlpha");
 
-    extension
+      extension
       .addCondition(
-        'RotationBeta',
-        _('Compare the value of rotation beta'),
+        "RotationBeta",
+        _("Compare the value of rotation beta"),
         _(
-          'Compare the value of rotation beta. (Note: few devices support this sensor)'
+          "Compare the value of rotation beta. (Note: few devices support this sensor)"
         ),
-        _('the rotation beta'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_rotation_beta32.png',
-        'JsPlatform/Extensions/motion_rotation_beta32.png'
+        _("the rotation beta"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_rotation_beta32.png",
+        "JsPlatform/Extensions/motion_rotation_beta32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value (m/s²)'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value (m/s²)"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getRotationBeta');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getRotationBeta");
 
-    extension
+      extension
       .addCondition(
-        'RotationGamma',
-        _('Compare the value of rotation gamma'),
+        "RotationGamma",
+        _("Compare the value of rotation gamma"),
         _(
-          'Compare the value of rotation gamma. (Note: few devices support this sensor)'
+          "Compare the value of rotation gamma. (Note: few devices support this sensor)"
         ),
-        _('the rotation gamma'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_rotation_gamma32.png',
-        'JsPlatform/Extensions/motion_rotation_gamma32.png'
+        _("the rotation gamma"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_rotation_gamma32.png",
+        "JsPlatform/Extensions/motion_rotation_gamma32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value (m/s²)'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value (m/s²)"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getRotationGamma');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getRotationGamma");
 
-    extension
+      extension
       .addCondition(
-        'AccelerationX',
-        _('Compare the value of acceleration on X-axis'),
-        _('Compare the value of acceleration on the X-axis (m/s²).'),
-        _('the acceleration X'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_acceleration_x32.png',
-        'JsPlatform/Extensions/motion_acceleration_x32.png'
+        "AccelerationX",
+        _("Compare the value of acceleration on X-axis"),
+        _(
+          "Compare the value of acceleration on the X-axis (m/s²)."
+        ),
+        _("the acceleration X"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_acceleration_x32.png",
+        "JsPlatform/Extensions/motion_acceleration_x32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value (m/s²)'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value (m/s²)"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getAccelerationX');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getAccelerationX");
 
-    extension
+      extension
       .addCondition(
-        'AccelerationY',
-        _('Compare the value of acceleration on Y-axis'),
-        _('Compare the value of acceleration on the Y-axis (m/s²).'),
-        _('the acceleration Y'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_acceleration_y32.png',
-        'JsPlatform/Extensions/motion_acceleration_y32.png'
+        "AccelerationY",
+        _("Compare the value of acceleration on Y-axis"),
+        _(
+          "Compare the value of acceleration on the Y-axis (m/s²)."
+        ),
+        _("the acceleration Y"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_acceleration_y32.png",
+        "JsPlatform/Extensions/motion_acceleration_y32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value (m/s²)'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value (m/s²)"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getAccelerationY');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getAccelerationY");
 
-    extension
+      extension
       .addCondition(
-        'AccelerationZ',
-        _('Compare the value of acceleration on Z-axis'),
-        _('Compare the value of acceleration on the Z-axis (m/s²).'),
-        _('the acceleration Z'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_acceleration_z32.png',
-        'JsPlatform/Extensions/motion_acceleration_z32.png'
+        "AccelerationZ",
+        _("Compare the value of acceleration on Z-axis"),
+        _(
+          "Compare the value of acceleration on the Z-axis (m/s²)."
+        ),
+        _("the acceleration Z"),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_acceleration_z32.png",
+        "JsPlatform/Extensions/motion_acceleration_z32.png"
       )
-      .addParameter('relationalOperator', _('Sign of the test'), 'number')
-      .addParameter('expression', _('Value (m/s²)'))
+      .addParameter("relationalOperator", _("Sign of the test"), "number")
+      .addParameter("expression", _("Value (m/s²)"))
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getAccelerationZ');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getAccelerationZ");
 
     extension
       .addAction(
-        'ActivateMotionListener',
-        _('Activate motion sensor'),
-        _('Activate the motion sensor. (remember to turn it off again)'),
-        _('Activate the motion sensor.'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_active32.png',
-        'JsPlatform/Extensions/motion_active32.png'
+        "ActivateMotionListener",
+        _("Activate motion sensor"),
+        _("Activate the motion sensor. (remember to turn it off again)"),
+        _("Activate the motion sensor."),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_active32.png",
+        "JsPlatform/Extensions/motion_active32.png"
       )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.activateMotionSensor');
+        .getCodeExtraInformation()
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.activateMotionSensor");
 
     extension
       .addAction(
-        'DeactivateMotionListener',
-        _('Deactivate motion sensor'),
-        _('Deactivate the motion sensor.'),
-        _('Deactivate the motion sensor.'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_inactive32.png',
-        'JsPlatform/Extensions/motion_inactive32.png'
+        "DeactivateMotionListener",
+        _("Deactivate motion sensor"),
+        _("Deactivate the motion sensor."),
+        _("Deactivate the motion sensor."),
+        _("Motion"),
+        "JsPlatform/Extensions/motion_inactive32.png",
+        "JsPlatform/Extensions/motion_inactive32.png"
       )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.deactivateMotionSensor');
+        .getCodeExtraInformation()
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.deactivateMotionSensor");
 
     extension
       .addExpression(
-        'RotationAlpha',
-        _('Alpha value'),
-        _('Get the devices rotation Alpha'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_rotation_alpha16.png'
+        "RotationAlpha",
+        _("Alpha value"),
+        _("Get the devices rotation Alpha"),
+        _("Motion"),
+	"JsPlatform/Extensions/motion_rotation_alpha16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getRotationAlpha');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getRotationAlpha");
 
     extension
       .addExpression(
-        'RotationBeta',
-        _('Beta value'),
-        _('Get the devices rotation Beta'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_rotation_beta16.png'
+        "RotationBeta",
+        _("Beta value"),
+        _("Get the devices rotation Beta"),
+        _("Motion"),
+	"JsPlatform/Extensions/motion_rotation_beta16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getRotationBeta');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getRotationBeta");
 
     extension
       .addExpression(
-        'RotationGamma',
-        _('Gamma value'),
-        _('Get the devices rotation Gamma'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_rotation_gamma16.png'
+        "RotationGamma",
+        _("Gamma value"),
+        _("Get the devices rotation Gamma"),
+        _("Motion"),
+	"JsPlatform/Extensions/motion_rotation_gamma16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getRotationGamma');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getRotationGamma");
 
-    extension
+      extension
       .addExpression(
-        'AccelerationX',
-        _('Acceleration X value'),
-        _('Get the devices acceleration on the X-axis (m/s²)'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_acceleration_x16.png'
+        "AccelerationX",
+        _("Acceleration X value"),
+        _("Get the devices acceleration on the X-axis (m/s²)"),
+        _("Motion"),
+	"JsPlatform/Extensions/motion_acceleration_x16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getAccelerationX');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getAccelerationX");
 
-    extension
+      extension
       .addExpression(
-        'AccelerationY',
-        _('Acceleration Y value'),
-        _('Get the devices acceleration on the Y-axis (m/s²)'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_acceleration_y16.png'
+        "AccelerationY",
+        _("Acceleration Y value"),
+        _("Get the devices acceleration on the Y-axis (m/s²)"),
+        _("Motion"),
+	"JsPlatform/Extensions/motion_acceleration_y16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getAccelerationY');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getAccelerationY");
 
-    extension
+      extension
       .addExpression(
-        'AccelerationZ',
-        _('Acceleration Z value'),
-        _('Get the devices acceleration on the Z-axis (m/s²)'),
-        _('Motion'),
-        'JsPlatform/Extensions/motion_acceleration_z16.png'
+        "AccelerationZ",
+        _("Acceleration Z value"),
+        _("Get the devices acceleration on the Z-axis (m/s²)"),
+        _("Motion"),
+	"JsPlatform/Extensions/motion_acceleration_z16.png"
       )
       .getCodeExtraInformation()
-      .setIncludeFile('Extensions/DeviceSensors/devicesensortools.js')
-      .setFunctionName('gdjs.deviceSensors.motion.getAccelerationZ');
+      .setIncludeFile(
+        "Extensions/DeviceSensors/devicesensortools.js"
+      )
+      .setFunctionName("gdjs.deviceSensors.motion.getAccelerationZ");
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
-    return [];
-  },
+  runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) { return []; },
 };

Extensions/DeviceVibration/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -28,9 +36,8 @@ module.exports = {
       )
       .setExtensionHelpPath('/all-features/device-vibration')
       .setCategory('User interface');
-    extension
-      .addInstructionOrExpressionGroupMetadata(_('Device vibration'))
-      .setIcon('JsPlatform/Extensions/vibration_start32.png');
+      extension.addInstructionOrExpressionGroupMetadata(_("Device vibration"))
+          .setIcon("JsPlatform/Extensions/vibration_start32.png");
 
     extension
       .addDependency()
@@ -92,7 +99,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/DialogueTree/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -713,7 +721,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/Effects/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,20 +12,28 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
-    extension
-      .setExtensionInformation(
-        'Effects',
-        'Effects',
-        'Lots of different effects to be used in your game.',
-        'Various contributors from PixiJS, PixiJS filters and GDevelop',
-        'MIT'
-      )
-      .setCategory('Visual effect')
-      .setExtensionHelpPath('/interface/scene-editor/layer-effects');
+    extension.setExtensionInformation(
+      'Effects',
+      'Effects',
+      'Lots of different effects to be used in your game.',
+      'Various contributors from PixiJS, PixiJS filters and GDevelop',
+      'MIT'
+    )
+    .setCategory('Visual effect')
+    .setExtensionHelpPath('/interface/scene-editor/layer-effects');
 
     // ℹ️ You can declare an effect here. Please order the effects by alphabetical order.
     // This file is for common effects that are well-known/"battle-tested". If you have an
@@ -223,11 +230,7 @@ module.exports = {
     const blurEffect = extension
       .addEffect('Blur')
       .setFullName(_('Blur (Gaussian, slow - prefer to use Kawase blur)'))
-      .setDescription(
-        _(
-          'Blur the rendered image. This is slow, so prefer to use Kawase blur in most cases.'
-        )
-      )
+      .setDescription(_('Blur the rendered image. This is slow, so prefer to use Kawase blur in most cases.'))
       .markAsOnlyWorkingFor2D()
       .addIncludeFile('Extensions/Effects/blur-pixi-filter.js');
     const blurProperties = blurEffect.getProperties();
@@ -725,11 +728,13 @@ module.exports = {
     const hslAdjustmentEffect = extension
       .addEffect('HslAdjustment')
       .setFullName(_('HSL Adjustment'))
-      .setDescription(_('Adjust hue, saturation and lightness.'))
-      .markAsOnlyWorkingFor2D()
-      .addIncludeFile(
-        'Extensions/Effects/pixi-filters/filter-hsl-adjustment.js'
+      .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
@@ -762,9 +767,7 @@ module.exports = {
       .addEffect('KawaseBlur')
       .setFullName(_('Blur (Kawase, fast)'))
       .setDescription(
-        _(
-          'Blur the rendered image, with much better performance than Gaussian blur.'
-        )
+        _('Blur the rendered image, with much better performance than Gaussian blur.')
       )
       .markAsOnlyWorkingFor2D()
       .addIncludeFile('Extensions/Effects/pixi-filters/filter-kawase-blur.js')
@@ -813,7 +816,9 @@ module.exports = {
     const motionBlurEffect = extension
       .addEffect('MotionBlur')
       .setFullName(_('Motion Blur'))
-      .setDescription(_('Blur the rendered image to give a feeling of speed.'))
+      .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');
@@ -1169,9 +1174,7 @@ module.exports = {
       .setValue('0')
       .setLabel(_('Elapsed time'))
       .setType('number')
-      .setDescription(
-        'It can be set back to 0 to play the shockwave animation again.'
-      );
+      .setDescription('It can be set back to 0 to play the shockwave animation again.');
     shockwaveEffectProperties
       .getOrCreate('speed')
       .setValue('500')
@@ -1308,7 +1311,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/ExampleJsExtension/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension.setExtensionInformation(
       'MyDummyExtension',
@@ -145,6 +153,7 @@ module.exports = {
     // Everything that is stored inside the behavior is in "behaviorContent" and is automatically
     // saved/loaded to JSON.
     var dummyBehavior = new gd.BehaviorJsImplementation();
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     dummyBehavior.updateProperty = function (
       behaviorContent,
       propertyName,
@@ -161,6 +170,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     dummyBehavior.getProperties = function (behaviorContent) {
       var behaviorProperties = new gd.MapStringPropertyDescriptor();
 
@@ -177,6 +187,7 @@ module.exports = {
 
       return behaviorProperties;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     dummyBehavior.initializeContent = function (behaviorContent) {
       behaviorContent.setStringAttribute('property1', 'Initial value 1');
       behaviorContent.setBoolAttribute('property2', true);
@@ -190,7 +201,6 @@ module.exports = {
         '',
         'CppPlatform/Extensions/topdownmovementicon.png',
         'DummyBehavior',
-        //@ts-ignore The class hierarchy is incorrect leading to a type error, but this is valid.
         dummyBehavior,
         new gd.BehaviorsSharedData()
       )
@@ -205,6 +215,7 @@ module.exports = {
     // Create a new gd.BehaviorSharedDataJsImplementation object and implement the methods
     // that are called to get and set the properties of the shared data.
     var dummyBehaviorWithSharedData = new gd.BehaviorJsImplementation();
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     dummyBehaviorWithSharedData.updateProperty = function (
       behaviorContent,
       propertyName,
@@ -217,6 +228,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     dummyBehaviorWithSharedData.getProperties = function (behaviorContent) {
       var behaviorProperties = new gd.MapStringPropertyDescriptor();
 
@@ -226,11 +238,13 @@ module.exports = {
 
       return behaviorProperties;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     dummyBehaviorWithSharedData.initializeContent = function (behaviorContent) {
       behaviorContent.setStringAttribute('property1', 'Initial value 1');
     };
 
     var sharedData = new gd.BehaviorSharedDataJsImplementation();
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     sharedData.updateProperty = function (
       sharedContent,
       propertyName,
@@ -243,6 +257,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     sharedData.getProperties = function (sharedContent) {
       var sharedProperties = new gd.MapStringPropertyDescriptor();
 
@@ -252,6 +267,7 @@ module.exports = {
 
       return sharedProperties;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     sharedData.initializeContent = function (behaviorContent) {
       behaviorContent.setStringAttribute(
         'sharedProperty1',
@@ -268,7 +284,6 @@ module.exports = {
         '',
         'CppPlatform/Extensions/topdownmovementicon.png',
         'DummyBehaviorWithSharedData',
-        //@ts-ignore The class hierarchy is incorrect leading to a type error, but this is valid.
         dummyBehaviorWithSharedData,
         sharedData
       )
@@ -287,6 +302,7 @@ module.exports = {
     // Everything that is stored inside the object is in "content" and is automatically
     // saved/loaded to JSON.
     var dummyObject = new gd.ObjectJsImplementation();
+    // $FlowExpectedError - ignore Flow warning as we're creating an object
     dummyObject.updateProperty = function (
       objectContent,
       propertyName,
@@ -311,6 +327,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating an object
     dummyObject.getProperties = function (objectContent) {
       var objectProperties = new gd.MapStringPropertyDescriptor();
 
@@ -345,6 +362,7 @@ module.exports = {
       })
     );
 
+    // $FlowExpectedError - ignore Flow warning as we're creating an object
     dummyObject.updateInitialInstanceProperty = function (
       objectContent,
       instance,
@@ -364,6 +382,7 @@ module.exports = {
 
       return false;
     };
+    // $FlowExpectedError - ignore Flow warning as we're creating an object
     dummyObject.getInitialInstanceProperties = function (
       content,
       instance,
@@ -427,7 +446,10 @@ module.exports = {
    * But it is recommended to create tests for the behaviors/objects properties you created
    * to avoid mistakes.
    */
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     const dummyBehavior = extension
       .getBehaviorMetadata('MyDummyExtension::DummyBehavior')
       .get();
@@ -452,7 +474,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerEditorConfigurations: function (objectsEditorService) {
+  registerEditorConfigurations: function (
+    objectsEditorService /*: ObjectsEditorService */
+  ) {
     objectsEditorService.registerEditorConfiguration(
       'MyDummyExtension::DummyObject',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
@@ -465,7 +489,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerInstanceRenderers: function (objectsRenderingService) {
+  registerInstanceRenderers: function (
+    objectsRenderingService /*: ObjectsRenderingService */
+  ) {
     const RenderedInstance = objectsRenderingService.RenderedInstance;
     const PIXI = objectsRenderingService.PIXI;
 

Extensions/FacebookInstantGames/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,414 +12,368 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
-        'FacebookInstantGames',
-        _('Facebook Instant Games'),
+        "FacebookInstantGames",
+        _("Facebook Instant Games"),
         _(
-          'Allow your game to send scores and interact with the Facebook Instant Games platform.'
+          "Allow your game to send scores and interact with the Facebook Instant Games platform."
         ),
-        'Florian Rival',
-        'Open source (MIT License)'
+        "Florian Rival",
+        "Open source (MIT License)"
       )
-      .setExtensionHelpPath('/publishing/publishing-to-facebook-instant-games')
+      .setExtensionHelpPath("/publishing/publishing-to-facebook-instant-games")
       .setCategory('Third-party');
-    extension
-      .addInstructionOrExpressionGroupMetadata(_('Facebook Instant Games'))
-      .setIcon('JsPlatform/Extensions/facebookicon32.png');
+    extension.addInstructionOrExpressionGroupMetadata(_("Facebook Instant Games"))
+        .setIcon("JsPlatform/Extensions/facebookicon32.png");
 
     extension
       .addAction(
-        'SavePlayerData',
-        _('Save player data'),
+        "SavePlayerData",
+        _("Save player data"),
         _(
-          'Save the content of the given scene variable in the player data, stored on Facebook Instant Games servers'
+          "Save the content of the given scene variable in the player data, stored on Facebook Instant Games servers"
         ),
         _(
-          'Save the content of _PARAM1_ in key _PARAM0_ of player data (store success message in _PARAM2_ or error in _PARAM3_)'
+          "Save the content of _PARAM1_ in key _PARAM0_ of player data (store success message in _PARAM2_ or error in _PARAM3_)"
         ),
-        _('Player data'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        _("Player data"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
-      .addParameter('string', 'Data key name (e.g: "Lives")', '', false)
+      .addParameter("string", 'Data key name (e.g: "Lives")', "", false)
+      .addParameter("scenevar", "Scene variable with the content to save", "", false)
       .addParameter(
-        'scenevar',
-        'Scene variable with the content to save',
-        '',
-        false
-      )
-      .addParameter(
-        'scenevar',
-        _('Variable where to store the success message (optional)'),
-        '',
+        "scenevar",
+        _("Variable where to store the success message (optional)"),
+        "",
         true
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.setPlayerData');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.setPlayerData");
 
     extension
       .addAction(
-        'LoadPlayerData',
-        _('Load player data'),
-        _('Load the player data with the given key in a variable'),
+        "LoadPlayerData",
+        _("Load player data"),
+        _("Load the player data with the given key in a variable"),
         _(
-          'Load player data with key _PARAM0_ in _PARAM1_ (or error in _PARAM2_)'
+          "Load player data with key _PARAM0_ in _PARAM1_ (or error in _PARAM2_)"
         ),
-        _('Player data'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        _("Player data"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
-      .addParameter('string', _('Data key name (e.g: "Lives")'), '', false)
+      .addParameter("string", _('Data key name (e.g: "Lives")'), "", false)
       .addParameter(
-        'scenevar',
-        _('Variable where to store loaded data'),
-        '',
+        "scenevar",
+        _("Variable where to store loaded data"),
+        "",
         false
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.loadPlayerData');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.loadPlayerData");
 
     extension
       .addAction(
-        'SavePlayerScore',
-        _('Save player score'),
+        "SavePlayerScore",
+        _("Save player score"),
         _(
-          'Save the score, and optionally the content of the given variable in the player score, for the given metadata.'
+          "Save the score, and optionally the content of the given variable in the player score, for the given metadata."
         ),
         _(
-          'In leaderboard _PARAM0_, save score _PARAM1_ for the player and extra data from _PARAM2_ (store success message in _PARAM3_ or error in _PARAM4_)'
+          "In leaderboard _PARAM0_, save score _PARAM1_ for the player and extra data from _PARAM2_ (store success message in _PARAM3_ or error in _PARAM4_)"
         ),
-        _('Leaderboards'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        _("Leaderboards"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .addParameter(
-        'string',
+        "string",
         'Leaderboard name (e.g: "PlayersBestTimes")',
-        '',
+        "",
         false
       )
-      .addParameter('expression', 'Score to register for the player', '', false)
+      .addParameter("expression", "Score to register for the player", "", false)
       .addParameter(
-        'scenevar',
-        _('Optional variable with metadata to save'),
-        '',
+        "scenevar",
+        _("Optional variable with metadata to save"),
+        "",
         true
       )
       .addParameter(
-        'scenevar',
-        _('Variable where to store the success message (optional)'),
-        '',
+        "scenevar",
+        _("Variable where to store the success message (optional)"),
+        "",
         true
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.setPlayerScore');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.setPlayerScore");
 
     extension
       .addAction(
-        'LoadPlayerEntry',
-        _('Load player entry'),
-        _('Load the player entry in the given leaderboard'),
+        "LoadPlayerEntry",
+        _("Load player entry"),
+        _("Load the player entry in the given leaderboard"),
         _(
-          'Load player entry from leaderboard _PARAM0_. Set rank in _PARAM1_, score in _PARAM2_ (extra data if any in _PARAM3_ and error in _PARAM4_)'
+          "Load player entry from leaderboard _PARAM0_. Set rank in _PARAM1_, score in _PARAM2_ (extra data if any in _PARAM3_ and error in _PARAM4_)"
         ),
-        _('Leaderboards'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        _("Leaderboards"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .addParameter(
-        'string',
+        "string",
         _('Leaderboard name (e.g: "PlayersBestTimes")'),
-        '',
+        "",
         false
       )
       .addParameter(
-        'scenevar',
-        _('Variable where to store the player rank (of -1 if not ranked)'),
-        '',
+        "scenevar",
+        _("Variable where to store the player rank (of -1 if not ranked)"),
+        "",
         true
       )
       .addParameter(
-        'scenevar',
-        _('Variable where to store the player score (of -1 if no score)'),
-        '',
+        "scenevar",
+        _("Variable where to store the player score (of -1 if no score)"),
+        "",
         true
       )
       .addParameter(
-        'scenevar',
-        _('Variable where to store extra data (if any)'),
-        '',
+        "scenevar",
+        _("Variable where to store extra data (if any)"),
+        "",
         true
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.getPlayerEntry');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.getPlayerEntry");
 
     extension
       .addCondition(
-        'AreAdsSupported',
-        _('Check if ads are supported'),
-        _(
-          'Check if showing ads is supported on this device (only mobile phones can show ads)'
-        ),
-        _('Ads can be shown on this device'),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "AreAdsSupported",
+        _("Check if ads are supported"),
+        _("Check if showing ads is supported on this device (only mobile phones can show ads)"),
+        _("Ads can be shown on this device"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.areAdsSupported');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.areAdsSupported");
 
     extension
       .addCondition(
-        'IsInterstitialAdReady',
-        _('Is the interstitial ad ready'),
-        _(
-          'Check if the interstitial ad requested from Facebook is loaded and ready to be shown.'
-        ),
-        _('The interstitial ad is loaded and ready to be shown'),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "IsInterstitialAdReady",
+        _("Is the interstitial ad ready"),
+        _("Check if the interstitial ad requested from Facebook is loaded and ready to be shown."),
+        _("The interstitial ad is loaded and ready to be shown"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName(
-        'gdjs.evtTools.facebookInstantGames.isInterstitialAdReady'
-      );
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.isInterstitialAdReady");
 
     extension
       .addAction(
-        'LoadInterstitialAd',
-        _('Load and prepare an interstitial ad'),
-        _(
-          'Request and load an interstitial ad from Facebook, so that it is ready to be shown.'
-        ),
-        _(
-          'Request and load an interstitial ad from Facebook (ad placement id: _PARAM0_, error in _PARAM1_)'
-        ),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "LoadInterstitialAd",
+        _("Load and prepare an interstitial ad"),
+        _("Request and load an interstitial ad from Facebook, so that it is ready to be shown."),
+        _("Request and load an interstitial ad from Facebook (ad placement id: _PARAM0_, error in _PARAM1_)"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .addParameter(
-        'string',
-        _(
-          'The Ad Placement id (can be found while setting up the ad on Facebook)'
-        ),
-        '',
+        "string",
+        _("The Ad Placement id (can be found while setting up the ad on Facebook)"),
+        "",
         false
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.loadInterstitialAd');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.loadInterstitialAd");
 
     extension
       .addAction(
-        'ShowInterstitialAd',
-        _('Show the loaded interstitial ad'),
-        _(
-          "Show the interstitial ad previously loaded in memory. This won't work if you did not load the interstitial before."
-        ),
-        _(
-          'Show the interstitial ad previously loaded in memory (if any error, store it in _PARAM0_)'
-        ),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "ShowInterstitialAd",
+        _("Show the loaded interstitial ad"),
+        _("Show the interstitial ad previously loaded in memory. This won't work if you did not load the interstitial before."),
+        _("Show the interstitial ad previously loaded in memory (if any error, store it in _PARAM0_)"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.showInterstitialAd');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.showInterstitialAd");
 
     extension
       .addCondition(
-        'IsRewardedVideoReady',
-        _('Is the rewarded video ready'),
-        _(
-          'Check if the rewarded video requested from Facebook is loaded and ready to be shown.'
-        ),
-        _('The rewarded video is loaded and ready to be shown'),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "IsRewardedVideoReady",
+        _("Is the rewarded video ready"),
+        _("Check if the rewarded video requested from Facebook is loaded and ready to be shown."),
+        _("The rewarded video is loaded and ready to be shown"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName(
-        'gdjs.evtTools.facebookInstantGames.isRewardedVideoReady'
-      );
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.isRewardedVideoReady");
 
     extension
       .addAction(
-        'LoadRewardedVideo',
-        _('Load and prepare a rewarded video'),
-        _(
-          'Request and load a rewarded video from Facebook, so that it is ready to be shown.'
-        ),
-        _(
-          'Request and load a rewarded video from Facebook (ad placement id: _PARAM0_, error in _PARAM1_)'
-        ),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "LoadRewardedVideo",
+        _("Load and prepare a rewarded video"),
+        _("Request and load a rewarded video from Facebook, so that it is ready to be shown."),
+        _("Request and load a rewarded video from Facebook (ad placement id: _PARAM0_, error in _PARAM1_)"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .addParameter(
-        'string',
-        _(
-          'The Ad Placement id (can be found while setting up the ad on Facebook)'
-        ),
-        '',
+        "string",
+        _("The Ad Placement id (can be found while setting up the ad on Facebook)"),
+        "",
         false
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.loadRewardedVideo');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.loadRewardedVideo");
 
     extension
       .addAction(
-        'ShowRewardedVideo',
-        _('Show the loaded rewarded video'),
-        _(
-          "Show the rewarded video previously loaded in memory. This won't work if you did not load the video before."
-        ),
-        _(
-          'Show the rewarded video previously loaded in memory (if any error, store it in _PARAM0_)'
-        ),
-        _('Ads'),
-        'JsPlatform/Extensions/facebookicon32.png',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "ShowRewardedVideo",
+        _("Show the loaded rewarded video"),
+        _("Show the rewarded video previously loaded in memory. This won't work if you did not load the video before."),
+        _("Show the rewarded video previously loaded in memory (if any error, store it in _PARAM0_)"),
+        _("Ads"),
+        "JsPlatform/Extensions/facebookicon32.png",
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .addParameter(
-        'scenevar',
-        _(
-          'Variable where to store the error message (optional, if an error occurs)'
-        ),
-        '',
+        "scenevar",
+        _("Variable where to store the error message (optional, if an error occurs)"),
+        "",
         true
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.showRewardedVideo');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.showRewardedVideo");
 
     extension
       .addStrExpression(
-        'PlayerId',
-        _('Player identifier'),
-        _('Get the player unique identifier'),
+        "PlayerId",
+        _("Player identifier"),
+        _("Get the player unique identifier"),
         '',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.getPlayerId');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.getPlayerId");
 
     extension
       .addStrExpression(
-        'PlayerName',
-        _('Player name'),
-        _('Get the player name'),
+        "PlayerName",
+        _("Player name"),
+        _("Get the player name"),
         '',
-        'JsPlatform/Extensions/facebookicon32.png'
+        "JsPlatform/Extensions/facebookicon32.png"
       )
       .getCodeExtraInformation()
       .setIncludeFile(
-        'Extensions/FacebookInstantGames/facebookinstantgamestools.js'
+        "Extensions/FacebookInstantGames/facebookinstantgamestools.js"
       )
-      .setFunctionName('gdjs.evtTools.facebookInstantGames.getPlayerName');
+      .setFunctionName("gdjs.evtTools.facebookInstantGames.getPlayerName");
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) {
     return [];
-  },
+  }
 };

Extensions/Firebase/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -12,10 +11,11 @@
  *
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
-
-/** @type {ExtensionModule} */
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
 
     extension
@@ -2314,7 +2314,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension */
+  ) {
     return [];
   },
 };

Extensions/JsExtensionTypes.d.ts

@@ -1,238 +0,0 @@
-type GDNamespace = typeof import('../GDevelop.js/types');
-
-// This is necessary for typescript to interpret the identifier PIXI as a namespace
-// in this file and merge it with the other namespace declarations.
-declare namespace PIXI {}
-
-/**
- * RenderedInstance is the base class used for creating 2D renderers of instances,
- * which display on the scene editor, using Pixi.js, the instance of an object (see InstancesEditor).
- */
-class RenderedInstance {
-  _project: gd.Project;
-  _layout: gd.Layout;
-  _instance: gd.InitialInstance;
-  _associatedObjectConfiguration: gd.ObjectConfiguration;
-  _pixiContainer: PIXI.Container;
-  _pixiResourcesLoader: Class<PixiResourcesLoader>;
-  _pixiObject: PIXI.DisplayObject;
-  wasUsed: boolean;
-
-  constructor(
-    project: gdProject,
-    layout: gdLayout,
-    instance: gdInitialInstance,
-    associatedObjectConfiguration: gdObjectConfiguration,
-    pixiContainer: PIXI.Container,
-    pixiResourcesLoader: Class<PixiResourcesLoader>
-  );
-
-  /**
-   * Convert an angle from degrees to radians.
-   */
-  static toRad(angleInDegrees: number): number;
-
-  /**
-   * Called when the scene editor is rendered.
-   */
-  update(): void;
-
-  getPixiObject(): PIXI.DisplayObject | null;
-
-  getInstance(): gd.InitialInstance;
-
-  /**
-   * Called to notify the instance renderer that its associated instance was removed from
-   * the scene. The PIXI object should probably be removed from the container: This is what
-   * the default implementation of the method does.
-   */
-  onRemovedFromScene(): void;
-
-  getOriginX(): number;
-
-  getOriginY(): number;
-
-  getCenterX(): number;
-
-  getCenterY(): number;
-
-  getCustomWidth(): number;
-
-  getCustomHeight(): number;
-
-  getWidth(): number;
-
-  getHeight(): number;
-
-  getDepth(): number;
-
-  /**
-   * Return the width of the instance when the instance doesn't have a custom size.
-   */
-  getDefaultWidth(): number;
-
-  /**
-   * Return the height of the instance when the instance doesn't have a custom size.
-   */
-  getDefaultHeight(): number;
-
-  getDefaultDepth(): number;
-}
-
-/**
- * Rendered3DInstance is the base class used for creating 3D renderers of instances,
- * which display on the scene editor, using Three.js, the instance of an object (see InstancesEditor).
- * It can also display 2D artifacts on Pixi 2D plane (3D object shadow projected on the plane for instance).
- */
-class Rendered3DInstance {
-  _project: gdProject;
-  _layout: gdLayout;
-  _instance: gdInitialInstance;
-  _associatedObjectConfiguration: gdObjectConfiguration;
-  _pixiContainer: PIXI.Container;
-  _threeGroup: THREE.Group;
-  _pixiResourcesLoader: Class<PixiResourcesLoader>;
-  _pixiObject: PIXI.DisplayObject;
-  _threeObject: THREE.Object3D | null;
-  wasUsed: boolean;
-
-  constructor(
-    project: gdProject,
-    layout: gdLayout,
-    instance: gdInitialInstance,
-    associatedObjectConfiguration: gdObjectConfiguration,
-    pixiContainer: PIXI.Container,
-    threeGroup: THREE.Group,
-    pixiResourcesLoader: Class<PixiResourcesLoader>
-  );
-
-  /**
-   * Convert an angle from degrees to radians.
-   */
-  static toRad(angleInDegrees: number): number;
-
-  /**
-   * Applies ratio to value without intermediary value to avoid precision issues.
-   */
-  static applyRatio({
-    oldReferenceValue,
-    newReferenceValue,
-    valueToApplyTo,
-  }: {
-    oldReferenceValue: number;
-    newReferenceValue: number;
-    valueToApplyTo: number;
-  }): number;
-
-  /**
-   * Called when the scene editor is rendered.
-   */
-  update(): void;
-
-  getPixiObject(): PIXI.DisplayObject;
-
-  getThreeObject(): THREE.Object3D;
-
-  getInstance(): gd.InitialInstance;
-
-  /**
-   * Called to notify the instance renderer that its associated instance was removed from
-   * the scene. The PIXI object should probably be removed from the container: This is what
-   * the default implementation of the method does.
-   */
-  onRemovedFromScene(): void;
-
-  getOriginX(): number;
-
-  getOriginY(): number;
-
-  getCenterX(): number;
-
-  getCenterY(): number;
-
-  getWidth(): number;
-
-  getHeight(): number;
-
-  getDepth(): number;
-
-  /**
-   * Return the width of the instance when the instance doesn't have a custom size.
-   */
-  getDefaultWidth(): number;
-
-  /**
-   * Return the height of the instance when the instance doesn't have a custom size.
-   */
-  getDefaultHeight(): number;
-
-  /**
-   * Return the depth of the instance when the instance doesn't have a custom size.
-   */
-  getDefaultDepth(): number;
-}
-
-declare type ObjectsRenderingService = {
-  gd: GDNamespace;
-  PIXI: PIXI;
-  THREE: typeof import('../newIDE/app/node_modules/three');
-  THREE_ADDONS: { SkeletonUtils: any };
-  RenderedInstance: typeof RenderedInstance;
-  Rendered3DInstance: typeof Rendered3DInstance;
-  registerInstanceRenderer: (objectType: string, renderer: any) => void;
-  registerInstance3DRenderer: (objectType: string, renderer: any) => void;
-  requireModule: (dirname: string, moduleName: string) => any;
-  getThumbnail: (
-    project: gd.Project,
-    objectConfiguration: gd.ObjectConfiguration
-  ) => string;
-  rgbOrHexToHexNumber: (value: string) => number;
-  registerClearCache: (clearCache: (_: any) => void) => void;
-};
-
-declare type ObjectsEditorService = {
-  registerEditorConfiguration: (
-    objectType: string,
-    editorConfiguration: any
-  ) => void;
-  getDefaultObjectJsImplementationPropertiesEditor: ({
-    helpPagePath: string,
-  }) => any;
-};
-
-declare type ExtensionModule = {
-  createExtension: (
-    _: (string) => string,
-    gd: GDNamespace
-  ) => gd.PlatformExtension;
-  /**
-   * You can optionally add sanity tests that will check the basic working
-   * of your extension behaviors/objects by instantiating behaviors/objects
-   * and setting the property to a given value.
-   *
-   * If you don't have any tests, you can simply return an empty array.
-   *
-   * But it is recommended to create tests for the behaviors/objects properties you created
-   * to avoid mistakes.
-   */
-  runExtensionSanityTests: (
-    gd: GDNamespace,
-    extension: gd.PlatformExtension
-  ) => string[];
-  /**
-   * Register editors for objects.
-   *
-   * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
-   */
-  registerEditorConfigurations?: (
-    objectsEditorService: ObjectsEditorService
-  ) => void;
-  /**
-   * Register renderers for instance of objects on the scene editor.
-   *
-   * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
-   */
-  registerInstanceRenderers?: (
-    objectsRenderingService: ObjectsRenderingService
-  ) => void;
-};

Extensions/JsExtensionTypes.flow.js

@@ -0,0 +1,35 @@
+// @flow
+
+/**
+ * @file This file contains the (Flow) types that are used in the JavaScript
+ * extensions declaration (i.e: JsExtension.js files).
+ * Extension runtime files are in TypeScript (ts files) and not using Flow.
+ *
+ * If you do changes here, run `node import-GDJS-Runtime.js` (in newIDE/app/scripts),
+ * and be sure that the types declared here are reflecting the types exposed by the editor.
+ *
+ * Note that Flow comments are used to avoid having to preprocess this file and the
+ * JsExtension.js files through Babel. This allows to keep plain JS files, while allowing
+ * Flow static type checking to be run on them when integrated in the editor.
+ */
+
+/*::
+export type ObjectsRenderingService = {
+  gd: libGDevelop,
+  PIXI: any,
+  THREE: any,
+  THREE_ADDONS: {SkeletonUtils: any},
+  RenderedInstance: any,
+  Rendered3DInstance: any,
+  registerInstanceRenderer: (objectType: string, renderer: any) => void,
+  registerInstance3DRenderer: (objectType: string, renderer: any) => void,
+  requireModule: (dirname: string, moduleName: string) => any,
+  getThumbnail: (project: gdProject, objectConfiguration: gdObjectConfiguration) => string,
+  rgbOrHexToHexNumber: (value: string) => number,
+  registerClearCache: (clearCache: any => void) => void,
+};
+export type ObjectsEditorService = {
+  registerEditorConfiguration: (objectType: string, editorConfiguration: any) => void,
+  getDefaultObjectJsImplementationPropertiesEditor: ({| helpPagePath: string |}) => any,
+};
+*/

Extensions/Leaderboards/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,9 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function (_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -88,9 +96,7 @@ module.exports = {
       .setIncludeFile('Extensions/Leaderboards/sha256.js')
       .addIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
       .setFunctionName('gdjs.evtTools.leaderboards.saveConnectedPlayerScore')
-      .setAsyncFunctionName(
-        'gdjs.evtTools.leaderboards.saveConnectedPlayerScore'
-      );
+      .setAsyncFunctionName('gdjs.evtTools.leaderboards.saveConnectedPlayerScore');
 
     extension
       .addCondition(
@@ -293,7 +299,10 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 };

Extensions/Lighting/JsExtension.js

@@ -1,5 +1,4 @@
-//@ts-check
-/// <reference path="../JsExtensionTypes.d.ts" />
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
@@ -13,23 +12,32 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
-/** @type {ExtensionModule} */
-module.exports = {
-  createExtension: function (_, gd) {
-    const extension = new gd.PlatformExtension();
-    extension
-      .setExtensionInformation(
-        'Lighting',
-        _('Lights'),
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
 
-        'This provides a light object, and a behavior to mark other objects as being obstacles for the lights. This is a great way to create a special atmosphere to your game, along with effects, make it more realistic or to create gameplays based on lights.',
-        'Harsimran Virk',
-        'MIT'
-      )
-      .setCategory('Visual effect')
-      .setTags('light');
+module.exports = {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
+    const extension = new gd.PlatformExtension();
+    extension.setExtensionInformation(
+      'Lighting',
+      _('Lights'),
+
+      'This provides a light object, and a behavior to mark other objects as being obstacles for the lights. This is a great way to create a special atmosphere to your game, along with effects, make it more realistic or to create gameplays based on lights.',
+      'Harsimran Virk',
+      'MIT'
+    )
+    .setCategory('Visual effect')
+    .setTags("light");
 
     const lightObstacleBehavior = new gd.BehaviorJsImplementation();
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     lightObstacleBehavior.updateProperty = function (
       behaviorContent,
       propertyName,
@@ -38,12 +46,14 @@ module.exports = {
       return false;
     };
 
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     lightObstacleBehavior.getProperties = function (behaviorContent) {
       const behaviorProperties = new gd.MapStringPropertyDescriptor();
 
       return behaviorProperties;
     };
 
+    // $FlowExpectedError - ignore Flow warning as we're creating a behavior
     lightObstacleBehavior.initializeContent = function (behaviorContent) {};
     extension
       .addBehavior(
@@ -56,7 +66,6 @@ module.exports = {
         '',
         'CppPlatform/Extensions/lightObstacleIcon32.png',
         'LightObstacleBehavior',
-        //@ts-ignore The class hierarchy is incorrect leading to a type error, but this is valid.
         lightObstacleBehavior,
         new gd.BehaviorsSharedData()
       )
@@ -68,6 +77,7 @@ module.exports = {
 
     const lightObject = new gd.ObjectJsImplementation();
 
+    // $FlowExpectedError - ignore Flow warning as we're creating an object.
     lightObject.updateProperty = function (
       objectContent,
       propertyName,
@@ -96,6 +106,7 @@ module.exports = {
       return false;
     };
 
+    // $FlowExpectedError - ignore Flow warning as we're creating an object.
     lightObject.getProperties = function (objectContent) {
       const objectProperties = new gd.MapStringPropertyDescriptor();
 
@@ -149,6 +160,7 @@ module.exports = {
       })
     );
 
+    // $FlowExpectedError - ignore Flow warning as we're creating an object.
     lightObject.updateInitialInstanceProperty = function (
       objectContent,
       instance,
@@ -160,6 +172,7 @@ module.exports = {
       return false;
     };
 
+    // $FlowExpectedError - ignore Flow warning as we're creating an object.
     lightObject.getInitialInstanceProperties = function (
       content,
       instance,
@@ -220,11 +233,16 @@ module.exports = {
     return extension;
   },
 
-  runExtensionSanityTests: function (gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
 
-  registerEditorConfigurations: function (objectsEditorService) {
+  registerEditorConfigurations: function (
+    objectsEditorService /*: ObjectsEditorService */
+  ) {
     objectsEditorService.registerEditorConfiguration(
       'Lighting::LightObject',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
@@ -237,7 +255,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerInstanceRenderers: function (objectsRenderingService) {
+  registerInstanceRenderers: function (
+    objectsRenderingService /*: ObjectsRenderingService */
+  ) {
     const RenderedInstance = objectsRenderingService.RenderedInstance;
     const PIXI = objectsRenderingService.PIXI;
 
@@ -263,34 +283,32 @@ module.exports = {
         );
         this._radius = parseFloat(
           this._associatedObjectConfiguration
-            .getProperties()
+            .getProperties(this.project)
             .get('radius')
             .getValue()
         );
         if (this._radius <= 0) this._radius = 1;
         const color = objectsRenderingService.rgbOrHexToHexNumber(
           this._associatedObjectConfiguration
-            .getProperties()
+            .getProperties(this.project)
             .get('color')
             .getValue()
         );
 
         // The icon in the middle.
-        const lightIconSprite = new PIXI.Sprite(
-          PIXI.Texture.from('CppPlatform/Extensions/lightIcon32.png')
-        );
+        const lightIconSprite = new PIXI.Sprite(PIXI.Texture.from('CppPlatform/Extensions/lightIcon32.png'));
         lightIconSprite.anchor.x = 0.5;
         lightIconSprite.anchor.y = 0.5;
 
         // The circle to show the radius of the light.
         const radiusBorderWidth = 2;
         const radiusGraphics = new PIXI.Graphics();
-        radiusGraphics.lineStyle(radiusBorderWidth, color, 0.8);
-        radiusGraphics.drawCircle(
-          0,
-          0,
-          Math.max(1, this._radius - radiusBorderWidth)
+        radiusGraphics.lineStyle(
+          radiusBorderWidth,
+          color,
+          0.8
         );
+        radiusGraphics.drawCircle(0, 0, Math.max(1, this._radius - radiusBorderWidth));
 
         this._pixiObject = new PIXI.Container();
         this._pixiObject.addChild(lightIconSprite);
@@ -308,7 +326,11 @@ module.exports = {
       /**
        * Return the path to the thumbnail of the specified object.
        */
-      static getThumbnail(project, resourcesLoader, objectConfiguration) {
+      static getThumbnail(
+        project,
+        resourcesLoader,
+        objectConfiguration
+      ) {
         return 'CppPlatform/Extensions/lightIcon32.png';
       }