Add loader when launching an AI request

Don't show in changelog

.circleci/config.yml

@@ -13,8 +13,9 @@ orbs:
   aws-cli: circleci/aws-cli@2.0.6
   macos: circleci/macos@2.5.1 # For Rosetta (see below)
   node: circleci/node@5.2.0 # For a recent npm version (see below)
+  win: circleci/windows@5.1.0
 jobs:
-  # Build the **entire** app for macOS.
+  # Build the **entire** app for macOS (including the GDevelop.js library).
   build-macos:
     macos:
       xcode: 14.2.0
@@ -46,9 +47,9 @@ jobs:
       # GDevelop.js dependencies
       - restore_cache:
           keys:
-            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
             # fallback to using the latest cache if no exact match is found
-            - gd-macos-nodejs-dependencies---
+            - gd-macos-nodejs-dependencies-
 
       - run:
           name: Install GDevelop.js dependencies
@@ -69,7 +70,8 @@ jobs:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - GDJS/node_modules
+          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
 
       # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
       # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
@@ -94,7 +96,7 @@ jobs:
           name: Deploy to S3 (latest)
           command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
 
-  # Build the **entire** app for Linux.
+  # Build the app for Linux (using a pre-built GDevelop.js library).
   build-linux:
     # CircleCI docker workers are failing if they don't have enough memory (no swap)
     resource_class: xlarge
@@ -107,51 +109,33 @@ jobs:
       - checkout
       - aws-cli/setup
 
-      # System dependencies (for Electron Builder and Emscripten)
+      # System dependencies (for Electron Builder)
       - run:
-          name: Install dependencies for Emscripten
-          command: sudo apt-get update && sudo apt install cmake
-
-      - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
-
-      - run:
-          name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          name: Update system dependencies
+          command: sudo apt-get update
 
       - run:
           name: Install system dependencies for Electron builder
           command: sudo apt install icnsutils && sudo apt install graphicsmagick && sudo apt install rsync
 
-      # GDevelop.js dependencies
       - restore_cache:
           keys:
-            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
             # fallback to using the latest cache if no exact match is found
-            - gd-linux-nodejs-dependencies---
+            - gd-linux-nodejs-dependencies-
 
-      - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
-
-      # Build GDevelop.js (and run tests to ensure it works)
-      - run:
-          name: Build GDevelop.js
-          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
-
-      # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
+      # GDevelop IDE dependencies (using an exact version of GDevelop.js, built previously)
       - run:
           name: Install GDevelop IDE dependencies
-          command: cd newIDE/app && npm install && cd ../electron-app && npm install
+          command: export REQUIRES_EXACT_LIBGD_JS_VERSION=true && cd newIDE/app && npm install && cd ../electron-app && npm install
 
       - save_cache:
           paths:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - GDJS/node_modules
+          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
 
       # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
       - run:
@@ -295,14 +279,203 @@ jobs:
           name: Deploy to S3 (specific commit)
           command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/variant/debug-sanitizers/commit/$(git rev-parse HEAD)/
 
+  # Trigger AppVeyor build, which also does a Windows build (keep it for redundancy).
+  trigger-appveyor-windows-build:
+    docker:
+      - image: cimg/node:16.13
+    steps:
+      - run:
+          name: Trigger AppVeyor Windows build
+          command: |
+            curl -H "Content-Type: application/json" \
+                 -H "Authorization: Bearer ${APPVEYOR_API_KEY}" \
+                 --data "{
+                   \"accountName\": \"4ian\",
+                   \"projectSlug\": \"gdevelop\",
+                   \"branch\": \"${CIRCLE_BRANCH}\"
+                 }" \
+                 -X POST https://ci.appveyor.com/api/builds
+
+  build-windows:
+    executor:
+      name: win/default
+      size: medium
+    working_directory: /home/circleci/project
+    steps:
+      - checkout
+      - run:
+          # See https://www.ssl.com/how-to/how-to-integrate-esigner-cka-with-ci-cd-tools-for-automated-code-signing/
+          #
+          # This is necessary because of "signing to be FIPS-140 compliant". See
+          # https://github.com/electron-userland/electron-builder/issues/6158
+          #
+          # Make sure to DISABLE "malware blocker" in SSL.com to avoid errors like:
+          # Error information: "Error: SignerSign() failed." (-2146893821/0x80090003)
+          name: Download and Unzip eSignerCKA Setup
+          command: |
+
+            Invoke-WebRequest -OutFile eSigner_CKA_1.0.3.zip "https://www.ssl.com/download/ssl-com-esigner-cka-1-0-3"
+
+            Expand-Archive -Force eSigner_CKA_1.0.3.zip
+
+            Remove-Item eSigner_CKA_1.0.3.zip
+
+            Move-Item -Destination "eSigner_CKA_1.0.3.exe" -Path "eSigner_CKA_*\*.exe"
+      - run:
+          name: Setup eSignerCKA in Silent Mode
+          command: |
+
+            mkdir -p "/home/circleci/project/eSignerCKA"
+
+            ./eSigner_CKA_1.0.3.exe /CURRENTUSER /VERYSILENT /SUPPRESSMSGBOXES /DIR="/home/circleci/project/eSignerCKA" | Out-Null
+      - run:
+          name: Config Account Information on eSignerCKA
+          command: |
+
+            /home/circleci/project/eSignerCKA/eSignerCKATool.exe config -mode product -user "$env:ESIGNER_USER_NAME" -pass "$env:ESIGNER_USER_PASSWORD" -totp "$env:ESIGNER_USER_TOTP" -key "/home/circleci/project/eSignerCKA/master.key" -r
+      - run:
+          name: Load Certificate into Windows Store
+          command: |
+
+            /home/circleci/project/eSignerCKA/eSignerCKATool.exe unload
+
+            /home/circleci/project/eSignerCKA/eSignerCKATool.exe load
+      - run:
+          name: Select Certificate From Windows Store and Sign Sample File with SignTool
+          command: |
+
+            $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
+
+            echo Certificate: $CodeSigningCert
+
+      - restore_cache:
+          name: Restore node_modules cache
+          keys:
+            - v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
+            - v1-win-node-
+
+      - run:
+          name: Install dependencies
+          no_output_timeout: 25m
+          # Remove package-lock.json because they seems to cause the npm install to be stuck. We should try again after re-generating them.
+          # Also install setuptools as something requires distutils in electron-app, and it was removed in Python 3.12.
+          # setuptools will make distutils available again (but we should migrate our packages probably).
+          command: |
+            pip install setuptools
+
+            cd newIDE\app
+
+            npm -v
+
+            Remove-Item package-lock.json
+            
+            $Env:REQUIRES_EXACT_LIBGD_JS_VERSION = "true"
+
+            npm install
+
+            cd ..\electron-app
+
+            Remove-Item package-lock.json
+
+            npm install
+
+            cd ..\..
+
+      - save_cache:
+          name: Save node_modules cache
+          key: v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
+          paths:
+            - newIDE/app/node_modules
+            - newIDE/electron-app/node_modules
+            - GDJS/node_modules
+
+      - run:
+          name: Build NSIS executable (with code signing)
+          command: |
+            cd newIDE\electron-app
+
+            $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
+
+            echo Certificate: $CodeSigningCert
+
+            # Use a custom signtool path because of the signtool.exe bundled withy electron-builder not working for some reason.
+            # Can also be found in versioned folders like "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe".
+            # or "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\signtool.exe".
+
+            $Env:SIGNTOOL_PATH = "C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe"
+
+            # Extract thumbprint and subject name of the certificate (will be passed to electron-builder).
+
+            $Env:GD_SIGNTOOL_THUMBPRINT = $CodeSigningCert.Thumbprint
+
+            $Env:GD_SIGNTOOL_SUBJECT_NAME = ($CodeSigningCert.Subject -replace ", ?", "`n" | ConvertFrom-StringData).CN
+
+            # Build the nsis installer (signed: electron-builder will use SignTool.exe with the certificate)
+
+            node scripts/build.js --win nsis --publish=never
+
+            cd ..\..
+      - run:
+          name: Build AppX (without code signing)
+          # Don't sign the appx (it will be signed by the Microsoft Store).
+          command: |
+            cd newIDE\electron-app
+
+            # Build the appx (not signed). Ensure all variables used for code signing are empty.
+
+            $Env:GD_SIGNTOOL_THUMBPRINT = ''
+
+            $Env:GD_SIGNTOOL_SUBJECT_NAME = ''            
+            
+            $Env:CSC_LINK = ''
+            
+            $Env:CSC_KEY_PASSWORD = ''
+
+            node scripts/build.js --skip-app-build --win appx --publish=never
+
+            cd ..\..
+
+      - run:
+          name: Clean binaries
+          shell: cmd.exe
+          command: |
+            rmdir /s /q newIDE\electron-app\dist\win-unpacked
+
+      - run:
+          name: Install AWS CLI
+          command: |
+            # Install the CLI for the current user
+            
+            pip install --quiet --upgrade --user awscli
+            
+            # Add the user-Scripts dir to PATH for this step and the next.
+            
+            $binDir = (python -m site --user-base) + "\Scripts"
+            $Env:Path += ";$binDir"
+
+            # Sanity check:
+            aws --version  
+
+      # Upload artifacts (S3)
+      - run:
+          name: Deploy to S3 (specific commit)
+          command: |
+            aws s3 sync newIDE\electron-app\dist "s3://gdevelop-releases/$Env:CIRCLE_BRANCH/commit/$Env:CIRCLE_SHA1/"
+
+      - run:
+          name: Deploy to S3 (latest)
+          command: |
+            aws s3 sync newIDE\electron-app\dist "s3://gdevelop-releases/$Env:CIRCLE_BRANCH/latest/"
+
+      # Upload artifacts (CircleCI)
+      - store_artifacts:
+          path: newIDE/electron-app/dist
+
 workflows:
-  gdevelop_js-wasm:
-    jobs:
-      - build-gdevelop_js-wasm-only
   gdevelop_js-wasm-extra-checks:
     jobs:
       - build-gdevelop_js-debug-sanitizers-and-extra-checks:
-          # Extra checks are resource intensive so don't all run them.
+          # Extra checks are resource intensive so don't always run them.
           filters:
             branches:
               only:
@@ -310,13 +483,36 @@ workflows:
                 - /experimental-build.*/
   builds:
     jobs:
+      - build-gdevelop_js-wasm-only
       - build-macos:
+          # The macOS version builds by itself GDevelop.js
+          # (so we verify we can build it on macOS).
+          # requires:
+          #   - build-gdevelop_js-wasm-only
           filters:
             branches:
               only:
                 - master
                 - /experimental-build.*/
       - build-linux:
+          requires:
+            - build-gdevelop_js-wasm-only
+          filters:
+            branches:
+              only:
+                - master
+                - /experimental-build.*/
+      - build-windows:
+          requires:
+            - build-gdevelop_js-wasm-only
+          filters:
+            branches:
+              only:
+                - master
+                - /experimental-build.*/
+      - trigger-appveyor-windows-build:
+          requires:
+            - build-gdevelop_js-wasm-only
           filters:
             branches:
               only:

.github/workflows/update-extension-translations.yml

@@ -0,0 +1,47 @@
+# GitHub Action to update extension translations.
+# It copies the latest messages.js files from the GDevelop-extensions repository
+# and opens a Pull Request with the changes on GDevelop's repository.
+
+name: Update extension translations
+on:
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - "**" # Don't run on new tags
+  workflow_dispatch: # Allows manual triggering from the Actions tab
+
+jobs:
+  update-extension-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current repository
+        uses: actions/checkout@v3
+
+      - name: Clone GDevelop-extensions repository
+        run: git clone https://github.com/GDevelopApp/GDevelop-extensions.git /tmp/GDevelop-extensions
+
+      - name: Copy and rename translation files
+        run: |
+          mkdir -p newIDE/app/src/locales
+          for folder in /tmp/GDevelop-extensions/.translations/*; do
+            if [ -d "$folder" ]; then
+              lang=$(basename "$folder")
+              mkdir -p "newIDE/app/src/locales/$lang"
+              cp "$folder/messages.js" "newIDE/app/src/locales/$lang/extension-messages.js"
+            fi
+          done
+          cp /tmp/GDevelop-extensions/.translations/LocalesMetadata.js newIDE/app/src/locales/ExtensionLocalesMetadata.js
+
+      - name: Create Pull Request with updated translations
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: Update extension translations [skip ci]
+          branch: chore/update-extension-translations
+          delete-branch: true
+          title: "[Auto PR] Update extension translations"
+          body: |
+            This updates the extension translations by copying the latest messages.js files from the GDevelop-extensions repository.
+            Each messages.js file is renamed to extension-messages.js and placed in the corresponding language folder under `newIDE/app/src/locales`.
+
+            Please review the changes carefully before merging.

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -61,10 +61,12 @@ void GroupEvent::UnserializeFrom(gd::Project& project,
       project, events, element.GetChild("events"));
 
   parameters.clear();
-  gd::SerializerElement& parametersElement = element.GetChild("parameters");
-  parametersElement.ConsiderAsArrayOf("parameters");
-  for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
-    parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
+  if (element.HasChild("parameters")) {
+    gd::SerializerElement& parametersElement = element.GetChild("parameters");
+    parametersElement.ConsiderAsArrayOf("parameters");
+    for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
+      parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
+  }
 }
 
 void GroupEvent::SetBackgroundColor(unsigned int colorR_,

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -163,6 +163,21 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
   // end of compatibility code
 }
 
+vector<gd::String> LinkEvent::GetAllSearchableStrings() const {
+  vector<gd::String> allSearchableStrings;
+
+  allSearchableStrings.push_back(target);
+
+  return allSearchableStrings;
+}
+
+bool LinkEvent::ReplaceAllSearchableStrings(
+    std::vector<gd::String> newSearchableString) {
+  if (newSearchableString[0] == target) return false;
+  SetTarget(newSearchableString[0]);
+  return true;
+}
+
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
   return BaseEvent::AcceptVisitor(eventVisitor) ||
          eventVisitor.VisitLinkEvent(*this);

Core/GDCore/Events/Builtin/LinkEvent.h

@@ -109,6 +109,10 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
 
   virtual bool IsExecutable() const override { return true; };
 
+  virtual std::vector<gd::String> GetAllSearchableStrings() const override;
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString) override;
+
   virtual void SerializeTo(SerializerElement& element) const override;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element) override;

Core/GDCore/Events/Event.h

@@ -286,6 +286,20 @@ class GD_CORE_API BaseEvent {
    * \brief True if the event should be folded in the events editor.
    */
   bool IsFolded() const { return folded; }
+
+  /**
+   * \brief Set the AI generated event ID.
+   */
+  void SetAiGeneratedEventId(const gd::String& aiGeneratedEventId_) {
+    aiGeneratedEventId = aiGeneratedEventId_;
+  }
+
+  /**
+   * \brief Get the AI generated event ID.
+   */
+  const gd::String& GetAiGeneratedEventId() const {
+    return aiGeneratedEventId;
+  }
   ///@}
 
   std::weak_ptr<gd::BaseEvent>
@@ -304,6 +318,7 @@ class GD_CORE_API BaseEvent {
   bool disabled;    ///< True if the event is disabled and must not be executed
   gd::String type;  ///< Type of the event. Must be assigned at the creation.
                     ///< Used for saving the event for instance.
+  gd::String aiGeneratedEventId;  ///< When generated by an AI/external tool.
 
   static gd::EventsList badSubEvents;
   static gd::VariablesContainer badLocalVariables;

Core/GDCore/Events/Serialization.cpp

@@ -221,6 +221,8 @@ void EventsListSerialization::UnserializeEventsFrom(
 
     event->SetDisabled(eventElem.GetBoolAttribute("disabled", false));
     event->SetFolded(eventElem.GetBoolAttribute("folded", false));
+    event->SetAiGeneratedEventId(
+        eventElem.GetStringAttribute("aiGeneratedEventId", ""));
 
     list.InsertEvent(event, list.GetEventsCount());
   }
@@ -236,6 +238,8 @@ void EventsListSerialization::SerializeEventsTo(const EventsList& list,
     if (event.IsDisabled())
       eventElem.SetAttribute("disabled", event.IsDisabled());
     if (event.IsFolded()) eventElem.SetAttribute("folded", event.IsFolded());
+    if (!event.GetAiGeneratedEventId().empty())
+      eventElem.SetAttribute("aiGeneratedEventId", event.GetAiGeneratedEventId());
     eventElem.AddChild("type").SetValue(event.GetType());
 
     event.SerializeTo(eventElem);

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -141,7 +141,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "res/function32.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetHidden();
 
   extension
       .AddExpression(
@@ -177,7 +178,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
           "number", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition(
@@ -191,7 +193,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
           "string", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -117,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the position of the center of _PARAM0_: _PARAM1_ "
                   "_PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
-                _("Position/Center"),
+                _("Position ❯ Center"),
                 "res/actions/position24_black.png",
                 "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
@@ -133,7 +133,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Center X position"),
          _("the X position of the center of rotation"),
          _("the X position of the center"),
-         _("Position/Center"),
+         _("Position ❯ Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -144,7 +144,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Center Y position"),
          _("the Y position of the center of rotation"),
          _("the Y position of the center"),
-         _("Position/Center"),
+         _("Position ❯ Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -155,7 +155,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) left position"),
                                 _("the bounding box left position"),
-                                _("Position/Bounding Box"),
+                                _("Position ❯ Bounding Box"),
                                 "res/conditions/bounding-box-left_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -166,7 +166,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Bounding box top position"),
          _("the bounding box (the area encapsulating the object) top position"),
          _("the bounding box top position"),
-         _("Position/Bounding Box"),
+         _("Position ❯ Bounding Box"),
          "res/conditions/bounding-box-top_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -177,7 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) right position"),
                                 _("the bounding box right position"),
-                                _("Position/Bounding Box"),
+                                _("Position ❯ Bounding Box"),
                                 "res/conditions/bounding-box-right_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -188,7 +188,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) bottom position"),
                                 _("the bounding box bottom position"),
-                                _("Position/Bounding Box"),
+                                _("Position ❯ Bounding Box"),
                                 "res/conditions/bounding-box-bottom_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -199,7 +199,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) center X position"),
                                 _("the bounding box center X position"),
-                                _("Position/Bounding Box"),
+                                _("Position ❯ Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -210,7 +210,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) center Y position"),
                                 _("the bounding box center Y position"),
-                                _("Position/Bounding Box"),
+                                _("Position ❯ Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -255,7 +255,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Angle"),
                 "res/actions/rotate24_black.png",
                 "res/actions/rotate_black.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
       .AddCodeOnlyParameter("currentScene", "")
@@ -269,7 +268,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Angle"),
          "res/actions/rotate24_black.png",
          "res/actions/rotate_black.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -285,7 +283,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Angle"),
          "res/actions/rotate24_black.png",
          "res/actions/rotate_black.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
@@ -304,12 +301,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/force24.png",
          "res/actions/force.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Speed on X axis (in pixels per second)"))
       .AddParameter("expression", _("Speed on Y axis (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0");
+      .SetDefaultValue("0")
+      .SetHelpPath("/tutorials/how-to-move-objects/");
 
   obj.AddAction("AddForceAL",
                 _("Add a force (angle)"),
@@ -321,12 +318,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/force24.png",
                 "res/actions/force.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -339,13 +336,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/force24.png",
          "res/actions/force.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -360,13 +357,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/forceTourne24.png",
          "res/actions/forceTourne.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("expression", "X position of the center")
       .AddParameter("expression", "Y position of the center")
       .AddParameter("expression", "Speed (in Degrees per seconds)")
       .AddParameter("expression", "Distance (in pixels)")
       .AddParameter("forceMultiplier", "Force multiplier")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .SetHidden();
 
   obj.AddAction("Arreter",
@@ -376,8 +373,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/arreter24.png",
                 "res/actions/arreter.png")
-
       .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction("Delete",
@@ -418,7 +415,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("SetNumberObjectVariable",
-                _("Change variable value"),
+                _("Change object variable value"),
                 _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
@@ -429,10 +426,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("SetStringObjectVariable",
-                _("Change text variable"),
+                _("Change object variable value"),
                 _("Modify the text of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
@@ -443,10 +441,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("SetBooleanObjectVariable",
-                _("Change boolean variable"),
+                _("Change object variable value"),
                 _("Modify the boolean value of an object variable."),
                 _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
                 _("Variables"),
@@ -458,10 +457,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       // This parameter allows to keep the operand expression
       // when the editor switch between variable instructions.
       .AddCodeOnlyParameter("yesorno", _("Value"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("NumberObjectVariable",
-                   _("Variable value"),
+                   _("Object variable value"),
                    _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
@@ -472,10 +472,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("StringObjectVariable",
-                   _("Text variable"),
+                   _("Object variable value"),
                    _("Compare the text of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
@@ -486,10 +487,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("BooleanObjectVariable",
-                   _("Boolean variable"),
+                   _("Object variable value"),
                    _("Compare the boolean value of an object variable."),
                    _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
                    _("Variables"),
@@ -502,6 +504,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       // This parameter allows to keep the operand expression
       // when the editor switch between variable instructions.
       .AddCodeOnlyParameter("yesorno", _("Value"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("ModVarObjet",
@@ -514,6 +517,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly();
@@ -528,6 +532,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly();
@@ -544,6 +549,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction(
@@ -560,6 +566,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("ObjectVariableChildExists",
@@ -567,24 +574,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the specified child of the object "
                      "structure variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Arrays and structures"),
+                   _("Variables ❯ Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Name of the child"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
                 _("Remove a child from an object structure variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
+                _("Variables ❯ Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
@@ -592,11 +601,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Remove all the children from the object array or structure "
                   "variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
+                _("Variables ❯ Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array or structure variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -691,8 +701,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/arret24.png",
                    "res/conditions/arret.png")
-
       .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddCondition("Vitesse",
@@ -702,10 +712,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/vitesse24.png",
                    "res/conditions/vitesse.png")
-
       .AddParameter("object", _("Object"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   // Deprecated
@@ -722,6 +732,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddCondition("IsTotalForceAngleAround",
@@ -735,6 +746,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
@@ -749,6 +761,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("VarObjetTxt",
@@ -763,6 +776,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("ObjectVariableAsBoolean",
@@ -777,6 +791,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("VarObjetDef",
@@ -793,42 +808,45 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "PushStringToObjectVariable",
-         _("Add text variable"),
+         _("Add value to object array variable"),
          _("Adds a text (string) to the end of an object array variable."),
          _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("PushNumberToObjectVariable",
-                _("Add variable array value"),
+                _("Add value to object array variable"),
                 _("Adds a number to the end of an object array variable."),
                 _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
+                _("Variables ❯ Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction(
          "PushBooleanToObjectVariable",
-         _("Add boolean variable"),
+         _("Add value to object array variable"),
          _("Adds a boolean to the end of an object array variable."),
          _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
@@ -838,7 +856,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add existing variable"),
          _("Adds an existing variable to the end of an object array variable."),
          _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -847,6 +865,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetParameterLongDescription(_("The content of the object variable will "
                                      "*be copied* and added at the "
                                      "end of the array."))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetHidden();
 
@@ -855,7 +874,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add existing variable"),
          _("Adds an existing variable to the end of an object array variable."),
          _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -864,6 +883,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetParameterLongDescription(_("The content of the object variable will "
                                      "*be copied* and added at the "
                                      "end of the array."))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -871,12 +891,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add text variable"),
          _("Adds a text (string) to the end of an object array variable."),
          _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForFunctionEventsOnly();
 
@@ -884,12 +905,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Add number variable"),
                 _("Adds a number to the end of an object array variable."),
                 _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
+                _("Variables ❯ Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForFunctionEventsOnly();
 
@@ -898,12 +920,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add boolean variable"),
          _("Adds a boolean to the end of an object array variable."),
          _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForFunctionEventsOnly();
 
@@ -914,12 +937,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
            "variable."),
          _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
            "_PARAM0_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddCondition(
@@ -927,13 +951,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Number of children"),
          _("Compare the number of children in an object array variable."),
          _("The number of children in the array variable _PARAM1_"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddStrExpression(
@@ -941,40 +966,44 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("First text child"),
          _("Get the value of the first element of an object array variable, if "
            "it is a text (string) variable."),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   obj.AddExpression(
          "ArrayVariableFirstNumber",
          _("First number child"),
          _("Get the value of the first element of an object array variable, if "
            "it is a number variable."),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   obj.AddStrExpression(
          "ArrayVariableLastString",
          _("Last text child"),
          _("Get the value of the last element of an object array variable, if "
            "it is a text (string) variable."),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   obj.AddExpression(
          "ArrayVariableLastNumber",
          _("Last number child"),
          _("Get the value of the last element of an object array variable, if "
            "it is a number variable."),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
@@ -1009,12 +1038,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/forceVers24.png",
                 "res/actions/forceVers.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Target Object"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -1029,13 +1058,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/forceTourne24.png",
          "res/actions/forceTourne.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Rotate around this object"))
       .AddParameter("expression", _("Speed (in degrees per second)"))
       .AddParameter("expression", _("Distance (in pixels)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction("MettreAutour",
@@ -1063,10 +1092,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/ecarter24.png",
                 "res/actions/ecarter.png")
-
       .SetHidden()
       .AddParameter("object", _("Object"))
-      .AddParameter("objectList", "Object 2 (won't move)");
+      .AddParameter("objectList", "Object 2 (won't move)")
+      .SetHelpPath("/tutorials/how-to-move-objects/");
 
   // Deprecated action
   obj.AddAction("Ecarter",
@@ -1090,7 +1119,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Position"),
                 "res/actions/ecarter24.png",
                 "res/actions/ecarter.png")
-
       .AddParameter("object", _("Object"))
       .AddParameter("objectList", _("Objects (won't move)"))
       .AddParameter("yesorno",
@@ -1099,6 +1127,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     "",
                     true)
       .SetDefaultValue("no")
+      .SetHelpPath("/all-features/collisions/")
       .MarkAsSimple();
 
   obj.AddCondition("CollisionPoint",
@@ -1111,6 +1140,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position of the point"))
       .AddParameter("expression", _("Y position of the point"))
+      .SetHelpPath("/all-features/collisions/")
       .MarkAsSimple();
 
   extension
@@ -1142,6 +1172,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .AddParameter("expression", _("Time in seconds"))
+      .SetHelpPath("/all-features/timers-and-time/")
       .SetHidden();
 
   obj.AddCondition(
@@ -1157,6 +1188,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
+      .SetHelpPath("/all-features/timers-and-time/")
       .SetManipulatedType("number");
 
   obj.AddCondition("ObjectTimerPaused",
@@ -1168,6 +1200,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/timerPaused.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -1180,7 +1213,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/");
 
   obj.AddAction("PauseObjectTimer",
                 _("Pause an object timer"),
@@ -1191,6 +1225,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/pauseTimer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddAction("UnPauseObjectTimer",
@@ -1202,6 +1237,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/unPauseTimer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddAction("RemoveObjectTimer",
@@ -1213,6 +1249,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/timer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddExpression("X",
@@ -1241,28 +1278,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("X coordinate of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");
 
   obj.AddExpression("ForceY",
                     _("Y coordinate of the sum of forces"),
                     _("Y coordinate of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");
 
   obj.AddExpression("ForceAngle",
                     _("Angle of the sum of forces"),
                     _("Angle of the sum of forces (in degrees)"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");
 
   obj.AddExpression("ForceLength",
                     _("Length of the sum of forces"),
                     _("Length of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");
 
   obj.AddExpression("Longueur",
                     _("Length of the sum of forces"),
@@ -1270,6 +1311,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Movement using forces"),
                     "res/actions/force.png")
       .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .SetHidden();
 
   obj.AddExpression("Width",
@@ -1366,10 +1408,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "VariableChildCount",
          _("Number of children"),
          _("Number of children in an object array or structure variable"),
-         _("Variables/Arrays and structures"),
+         _("Variables ❯ Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array or structure variable"));
+      .AddParameter("objectvar", _("Array or structure variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   obj.AddStrExpression("VariableString",
                        _("Text variable"),
@@ -1378,6 +1421,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                        "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
+      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddExpression("ObjectTimerElapsedTime",
@@ -1386,7 +1430,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Timers"),
                     "res/actions/time.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/");
 
   obj.AddExpression("AngleToObject",
                     _("Angle between two objects"),
@@ -1606,6 +1651,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "res/actions/doMove24.png",
           "res/actions/doMove.png")
       .AddCodeOnlyParameter("currentScene", "")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   extension
@@ -1621,6 +1667,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectList", _("Object 2"))
       .AddParameter("expression", _("Tolerance, in degrees"))
       .AddCodeOnlyParameter("conditionInverted", "")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   extension
@@ -1753,6 +1800,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     "",
                     true)
       .SetDefaultValue("no")
+      .SetHelpPath("/all-features/collisions/")
       .MarkAsSimple();
 
   extension
@@ -1815,6 +1863,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Scene variable where to store the Y position of the intersection. "
             "If no intersection is found, the variable won't be changed."))
       .AddCodeOnlyParameter("conditionInverted", "")
+      .SetHelpPath("/all-features/collisions/")
       .MarkAsAdvanced();
 
   extension
@@ -1846,6 +1895,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Scene variable where to store the Y position of the intersection. "
             "If no intersection is found, the variable won't be changed."))
       .AddCodeOnlyParameter("conditionInverted", "")
+      .SetHelpPath("/all-features/collisions/")
       .MarkAsAdvanced();
 
   extension

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

@@ -19,7 +19,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
   extension
       .SetExtensionInformation("TextContainerCapability",
                                _("Text capability"),
-                               _("Animate objects."),
+                               _("Allows an object to contain a text, usually shown on screen, that can be modified."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
@@ -30,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
       "TextContainerBehavior",
       _("Text capability"),
       "Text",
-      _("Access objects text."),
+      _("Allows an object to contain a text, usually shown on screen, that can be modified."),
       "",
       "res/conditions/text24_black.png",
       "TextContainerBehavior",

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -59,47 +59,57 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   // end of compatibility code
 
   extension
-      .AddCondition("Or",
-                    _("Or"),
-                    _("Check if one of the sub conditions is true"),
-                    _("If one of these conditions is true:"),
-                    "",
-                    "res/conditions/or24_black.png",
-                    "res/conditions/or_black.png")
-      .SetCanHaveSubInstructions()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("And",
-                    _("And"),
-                    _("Check if all sub conditions are true"),
-                    _("If all of these conditions are true:"),
-                    "",
-                    "res/conditions/and24_black.png",
-                    "res/conditions/and_black.png")
+      .AddCondition(
+          "Or",
+          _("Or"),
+          _("Checks if at least one sub-condition is true. If no "
+            "sub-condition is specified, it will always be false. "
+            "This is rarely used — multiple events and sub-events are "
+            "usually a better approach."),
+          _("If one of these conditions is true:"),
+          "",
+          "res/conditions/or24_black.png",
+          "res/conditions/or_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
-          "Not",
-          _("Not"),
-          _("Return the contrary of the result of the sub conditions"),
-          _("Invert the logical result of these conditions:"),
+          "And",
+          _("And"),
+          _("Checks if all sub-conditions are true. If no sub-condition is "
+            "specified, it will always be false. This is rarely needed, as "
+            "events already check all conditions before running actions."),
+          _("If all of these conditions are true:"),
           "",
-          "res/conditions/not24_black.png",
-          "res/conditions/not_black.png")
+          "res/conditions/and24_black.png",
+          "res/conditions/and_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
-  extension.AddCondition(
-      "Once",
-      _("Trigger once while true"),
-      _("Run actions only once, for each time the conditions have been met."),
-      _("Trigger once"),
-      "",
-      "res/conditions/once24.png",
-      "res/conditions/once.png");
+  extension
+      .AddCondition("Not",
+                    _("Not"),
+                    _("Returns the opposite of the sub-condition(s) result. "
+                      "This is rarely needed, as most conditions can be "
+                      "inverted or expressed more simply."),
+                    _("Invert the logical result of these conditions:"),
+                    "",
+                    "res/conditions/not24_black.png",
+                    "res/conditions/not_black.png")
+      .SetCanHaveSubInstructions()
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("Once",
+                    _("Trigger once while true"),
+                    _("Run actions only once, for each time the conditions "
+                      "have been met."),
+                    _("Trigger once"),
+                    "",
+                    "res/conditions/once24.png",
+                    "res/conditions/once.png")
+      .SetHelpPath("/all-features/advanced-conditions/trigger-once");
 
   extension
       .AddCondition("CompareNumbers",

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -28,7 +28,7 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
       .AddAction("CreateObjectsFromExternalLayout",
                  _("Create objects from an external layout"),
                  _("Create objects from an external layout."),
-                 _("Create objects from the external layout named _PARAM1_"),
+                 _("Create objects from the external layout named _PARAM1_ at position _PARAM2_;_PARAM3_;_PARAM4_"),
                  "",
                  "res/ribbon_default/externallayout32.png",
                  "res/ribbon_default/externallayout32.png")

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -151,7 +151,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("abs",
                      _("Absolute value"),
-                     _("Absolute value"),
+                     _("Return the non-negative value by removing the sign. "
+                       "The absolute value of -8 is 8."),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -182,7 +182,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                                 "SceneLoadingProgress",
                                 _("Scene loading progress"),
                                 _("The progress of resources loading in background for a scene (between 0 and 1)."),
-                                _("_PARAM0_ loading progress"),
+                                _("_PARAM1_ loading progress"),
                                 _(""),
                                 "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -43,7 +43,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddCondition("CompareTimer",
                     _("Value of a scene timer"),
                     _("Compare the elapsed time of a scene timer. This "
-                      "condition doesn't start the timer."),
+                      "condition doesn't start the timer and will always be "
+                      "false if the timer was not started previously (whatever "
+                      "the comparison being made)."),
                     _("The timer _PARAM1_ _PARAM2_ _PARAM3_ seconds"),
 
                     "",

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -79,7 +79,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("SetStringVariable",
-                 _("Change text variable"),
+                 _("Change variable value"),
                  _("Modify the text (string) of a variable."),
                  _("the variable _PARAM0_"),
                  "",
@@ -92,7 +92,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction(
           "SetBooleanVariable",
-          _("Change boolean variable"),
+          _("Change variable value"),
           _("Modify the boolean value of a variable."),
           _("Change the variable _PARAM0_: _PARAM1_"),
           "",
@@ -116,6 +116,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("variable", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -129,6 +130,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var.png")
       .AddParameter("variable", _("Variable"))
       .AddParameter("string", _("Name of the child"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -142,6 +144,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("variable", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -154,6 +157,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("variable", _("Structure or array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -170,12 +174,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "PushString",
-          _("Add text variable"),
+          _("Add value to array variable"),
           _("Adds a text (string) at the end of a array variable."),
           _("Add the value _PARAM1_ to array variable _PARAM0_"),
           _("Arrays and structures"),
@@ -183,11 +188,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
       .AddAction("PushNumber",
-                 _("Add variable array value"),
+                 _("Add value to array variable"),
                  _("Adds a number at the end of an array variable."),
                  _("Add the value _PARAM1_ to array variable _PARAM0_"),
                  _("Arrays and structures"),
@@ -195,11 +201,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
       .AddAction("PushBoolean",
-                 _("Add boolean variable"),
+                 _("Add value to array variable"),
                  _("Adds a boolean at the end of an array variable."),
                  _("Add the value _PARAM1_ to array variable _PARAM0_"),
                  _("Arrays and structures"),
@@ -207,6 +214,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -221,6 +229,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -231,7 +240,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a text (string)."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   extension
       .AddExpression(
@@ -241,7 +251,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a number."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   extension
       .AddStrExpression(
@@ -251,7 +262,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a text (string)."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   extension
       .AddExpression(
@@ -261,7 +273,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a number."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   // Legacy instructions
 
@@ -270,26 +283,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Number variable"),
                     _("Compare the number value of a scene variable."),
                     _("The number of scene variable _PARAM0_"),
-                    _("External variables/Scene variables"),
+                    _("External variables ❯ Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition("VarSceneTxt",
                     _("Text variable"),
                     _("Compare the text (string) of a scene variable."),
                     _("The text of scene variable _PARAM0_"),
-                    _("External variables/Scene variables"),
+                    _("External variables ❯ Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition(
@@ -297,13 +312,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
-          _("External variables/Scene variables"),
+          _("External variables ❯ Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition("VariableChildExists",
@@ -311,12 +327,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the scene structure "
                       "variable exists."),
                     _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-                    _("External variables/Scene variables/Arrays and structures"),
+                    _("External variables ❯ Scene variables ❯ Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -325,12 +343,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the global structure "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("External variables/Global variables/Arrays and structures"),
+                    _("External variables ❯ Global variables ❯ Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -338,7 +358,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "Variable defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
-                    _("External variables/Scene variables"),
+                    _("External variables ❯ Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -350,13 +370,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Number variable"),
                     _("Compare the number value of a global variable."),
                     _("the global variable _PARAM0_"),
-                    _("External variables/Global variables"),
+                    _("External variables ❯ Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -364,13 +385,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Text variable"),
                     _("Compare the text (string) of a global variable."),
                     _("the text of the global variable _PARAM0_"),
-                    _("External variables/Global variables"),
+                    _("External variables ❯ Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -379,20 +401,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
-          _("External variables/Global variables"),
+          _("External variables ❯ Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition("VarGlobalDef",
                     "Variable defined",
                     "Test if a global variable exists.",
                     "Global variable _PARAM0_ is defined",
-                    _("External variables/Global variables"),
+                    _("External variables ❯ Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -405,26 +428,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change number variable"),
                  _("Modify the number value of a scene variable."),
                  _("the scene variable _PARAM0_"),
-                 _("External variables/Scene variables"),
+                 _("External variables ❯ Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction("ModVarSceneTxt",
                  _("Change text variable"),
                  _("Modify the text (string) of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
-                 _("External variables/Scene variables"),
+                 _("External variables ❯ Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction(
@@ -432,12 +457,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
-          _("External variables/Scene variables"),
+          _("External variables ❯ Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
@@ -446,24 +472,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of scene variable _PARAM0_"),
-                 _("External variables/Scene variables"),
+                 _("External variables ❯ Scene variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction("ModVarGlobal",
                  _("Change number variable"),
                  _("Modify the number value of a global variable."),
                  _("the global variable _PARAM0_"),
-                 _("External variables/Global variables"),
+                 _("External variables ❯ Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -471,13 +499,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change text variable"),
                  _("Modify the text (string) of a global variable."),
                  _("the text of global variable _PARAM0_"),
-                 _("External variables/Global variables"),
+                 _("External variables ❯ Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -486,12 +515,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
-          _("External variables/Global variables"),
+          _("External variables ❯ Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
@@ -500,11 +530,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of global variable _PARAM0_"),
-                 _("External variables/Global variables"),
+                 _("External variables ❯ Global variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction(
@@ -512,13 +543,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a scene structure variable."),
           _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction(
@@ -526,13 +559,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a global structure variable."),
           _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction("VariableClearChildren",
@@ -540,11 +575,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the scene structure or array "
                    "variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Structure or array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -553,11 +590,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the global structure or array "
                    "variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("External variables ❯ Global variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Structure or array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -566,7 +605,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Adds an existing variable at the end of a scene array "
                    "variable."),
                  _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -574,7 +613,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -583,12 +624,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a scene array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -596,12 +639,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a scene array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -609,12 +654,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a scene array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -624,12 +671,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "variable."),
                  _("Remove variable at index _PARAM1_ from scene array "
                    "variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -638,13 +687,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a scene array variable."),
           _("The number of children in the array variable _PARAM0_"),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -653,10 +704,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First text child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a text (string)."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression(
@@ -664,10 +717,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First number child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a number."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression(
@@ -675,10 +730,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a text (string)."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression(
@@ -686,10 +743,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a number."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("External variables ❯ Scene variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddAction(
@@ -697,7 +756,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add existing variable"),
           _("Adds an existing variable at the end of a global array variable."),
           _("Add variable _PARAM1_ to array variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -705,7 +764,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -715,12 +776,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "array variable."),
                  _("Remove variable at index _PARAM1_ from global array "
                    "variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("External variables ❯ Global variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -729,12 +792,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a global array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -742,12 +807,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a global array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("External variables ❯ Global variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -755,12 +822,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a global array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("External variables ❯ Global variables ❯ Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -769,13 +838,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a global array variable."),
           _("The number of children of the array variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
+      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -783,20 +854,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         _("First text child"),
                         _("Value of the first element of a global array "
                           "variable, if it is a text (string) variable."),
-                        _("External variables/Global variables/Arrays and structures"),
+                        _("External variables ❯ Global variables ❯ Arrays and structures"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression("GlobalVariableFirstNumber",
                      _("First number child"),
                      _("Value of the first element of a global array "
                        "variable, if it is a number variable"),
-                     _("External variables/Global variables/Arrays and structures"),
+                     _("External variables ❯ Global variables ❯ Arrays and structures"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression(
@@ -804,10 +879,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Value of the last element of a global array variable, if "
             "it is a text (string) variable."),
-          _("External variables/Global variables/Arrays and structures"),
+          _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression(
@@ -815,20 +892,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Value of the last element of a global array variable, if "
             "it is a number variable"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children"),
                      _("Number of children in a global array or "
                        "structure variable"),
-                     _("External variables/Global variables/Arrays and structures"),
+                     _("External variables ❯ Global variables ❯ Arrays and structures"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Array or structure variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression("VariableChildCount",
@@ -837,43 +917,48 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                        "structure variable"),
                      _("Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable");
+      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable")
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");
 
   extension
       .AddExpression("Variable",
                      _("Number variable"),
                      _("Number value of a scene variable"),
-                     _("External variables/Scene variables"),
+                     _("External variables ❯ Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression("VariableString",
                         _("Text variable"),
                         _("Text of a scene variable"),
-                        _("External variables/Scene variables"),
+                        _("External variables ❯ Scene variables"),
                         "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddExpression("GlobalVariable",
                      _("Number variable"),
                      _("Number value of a global variable"),
-                     _("External variables/Global variables"),
+                     _("External variables ❯ Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression("GlobalVariableString",
                         _("Text variable"),
                         _("Text of a global variable"),
-                        _("External variables/Global variables"),
+                        _("External variables ❯ Global variables"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -101,7 +101,7 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
   } else if (propertyType == "KeyboardKey") {
     return keyboardKeyValueType;
   }
-  // For "String", "Resource" or default
+  // For "String", "Resource", "MultilineString" or default
   return stringValueType;
 };
 

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -18,8 +18,8 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Tools/Localization.h"
 
 namespace gd {
@@ -200,11 +200,11 @@ PlatformExtension::AddExpressionAndConditionAndAction(
                           group,
                           icon)
           : AddStrExpression(name,
-                              fullname,
-                              expressionDescriptionTemplate.FindAndReplace(
-                                  "<subject>", descriptionSubject),
-                              group,
-                              icon);
+                             fullname,
+                             expressionDescriptionTemplate.FindAndReplace(
+                                 "<subject>", descriptionSubject),
+                             group,
+                             icon);
 
   return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
       expression, condition, action);
@@ -244,12 +244,10 @@ gd::ObjectMetadata& PlatformExtension::AddEventsBasedObject(
     const gd::String& description,
     const gd::String& icon24x24) {
   gd::String nameWithNamespace = GetNameSpace() + name;
-  objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
-                                                   nameWithNamespace,
-                                                   fullname,
-                                                   description,
-                                                   icon24x24)
-                                        .SetHelpPath(GetHelpPath());
+  objectsInfos[nameWithNamespace] =
+      ObjectMetadata(
+          GetNameSpace(), nameWithNamespace, fullname, description, icon24x24)
+          .SetHelpPath(GetHelpPath());
   return objectsInfos[nameWithNamespace];
 }
 
@@ -353,8 +351,7 @@ gd::BehaviorMetadata& PlatformExtension::GetBehaviorMetadata(
   return badBehaviorMetadata;
 }
 
-bool PlatformExtension::HasBehavior(
-    const gd::String& behaviorType) const {
+bool PlatformExtension::HasBehavior(const gd::String& behaviorType) const {
   return behaviorsInfo.find(behaviorType) != behaviorsInfo.end();
 }
 
@@ -386,7 +383,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
   auto copiedAction = actionsInfos.find(copiedNameWithNamespace);
   if (copiedAction == actionsInfos.end()) {
     gd::LogError("Could not find an action with name " +
-                   copiedNameWithNamespace + " to copy.");
+                 copiedNameWithNamespace + " to copy.");
   } else {
     actionsInfos[newNameWithNamespace] = copiedAction->second;
   }
@@ -406,7 +403,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedCondition(
   auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
   if (copiedCondition == conditionsInfos.end()) {
     gd::LogError("Could not find a condition with name " +
-                   copiedNameWithNamespace + " to copy.");
+                 copiedNameWithNamespace + " to copy.");
   } else {
     conditionsInfos[newNameWithNamespace] = copiedCondition->second;
   }
@@ -423,7 +420,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedExpression(
   auto copiedExpression = expressionsInfos.find(copiedNameWithNamespace);
   if (copiedExpression == expressionsInfos.end()) {
     gd::LogError("Could not find an expression with name " +
-                   copiedNameWithNamespace + " to copy.");
+                 copiedNameWithNamespace + " to copy.");
   } else {
     expressionsInfos[newNameWithNamespace] = copiedExpression->second;
   }
@@ -440,7 +437,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedStrExpression(
   auto copiedExpression = strExpressionsInfos.find(copiedNameWithNamespace);
   if (copiedExpression == strExpressionsInfos.end()) {
     gd::LogError("Could not find a string expression with name " +
-                   copiedNameWithNamespace + " to copy.");
+                 copiedNameWithNamespace + " to copy.");
   } else {
     strExpressionsInfos[newNameWithNamespace] = copiedExpression->second;
   }
@@ -468,7 +465,8 @@ PlatformExtension::GetAllStrExpressions() {
   return strExpressionsInfos;
 }
 
-const std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() const {
+const std::vector<gd::DependencyMetadata>&
+PlatformExtension::GetAllDependencies() const {
   return extensionDependenciesMetadata;
 }
 
@@ -476,7 +474,8 @@ std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() {
   return extensionDependenciesMetadata;
 }
 
-const std::vector<gd::SourceFileMetadata>& PlatformExtension::GetAllSourceFiles() const {
+const std::vector<gd::SourceFileMetadata>&
+PlatformExtension::GetAllSourceFiles() const {
   return extensionSourceFilesMetadata;
 }
 
@@ -615,37 +614,6 @@ void PlatformExtension::SetNameSpace(gd::String nameSpace_) {
   nameSpace = nameSpace_ + GetNamespaceSeparator();
 }
 
-std::vector<gd::String> PlatformExtension::GetBuiltinExtensionsNames() {
-  std::vector<gd::String> builtinExtensions;
-  builtinExtensions.push_back("Sprite");
-  builtinExtensions.push_back("BuiltinObject");
-  builtinExtensions.push_back("BuiltinAudio");
-  builtinExtensions.push_back("BuiltinMouse");
-  builtinExtensions.push_back("BuiltinKeyboard");
-  builtinExtensions.push_back("BuiltinJoystick");
-  builtinExtensions.push_back("BuiltinTime");
-  builtinExtensions.push_back("BuiltinFile");
-  builtinExtensions.push_back("BuiltinVariables");
-  builtinExtensions.push_back("BuiltinCamera");
-  builtinExtensions.push_back("BuiltinWindow");
-  builtinExtensions.push_back("BuiltinNetwork");
-  builtinExtensions.push_back("BuiltinScene");
-  builtinExtensions.push_back("BuiltinAdvanced");
-  builtinExtensions.push_back("BuiltinCommonConversions");
-  builtinExtensions.push_back("BuiltinStringInstructions");
-  builtinExtensions.push_back("BuiltinMathematicalTools");
-  builtinExtensions.push_back("BuiltinExternalLayouts");
-  builtinExtensions.push_back("BuiltinCommonInstructions");
-
-  return builtinExtensions;
-}
-
-bool PlatformExtension::IsBuiltin() const {
-  std::vector<gd::String> builtinExtensions = GetBuiltinExtensionsNames();
-  return std::find(builtinExtensions.begin(), builtinExtensions.end(), name) !=
-         builtinExtensions.end();
-}
-
 void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
            GetAllActions().begin();
@@ -791,41 +759,28 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   }
 }
 
-gd::String
-PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
-                                             const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
+gd::String PlatformExtension::GetEventsFunctionFullType(
+    const gd::String& extensionName, const gd::String& functionName) {
+  const auto& separator = GetNamespaceSeparator();
   return extensionName + separator + functionName;
 }
 
 gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
-    const gd::String &extensionName, const gd::String &behaviorName,
-    const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
+    const gd::String& extensionName,
+    const gd::String& behaviorName,
+    const gd::String& functionName) {
+  const auto& separator = GetNamespaceSeparator();
   return extensionName + separator + behaviorName + separator + functionName;
 }
 
-gd::String
-PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
-                                       const gd::String &behaviorName) {
-  const auto &separator = GetNamespaceSeparator();
+gd::String PlatformExtension::GetBehaviorFullType(
+    const gd::String& extensionName, const gd::String& behaviorName) {
+  const auto& separator = GetNamespaceSeparator();
   return extensionName + separator + behaviorName;
 }
 
-gd::String PlatformExtension::GetObjectEventsFunctionFullType(
-    const gd::String &extensionName, const gd::String &objectName,
-    const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + objectName + separator + functionName;
-}
-
-gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
-                                                const gd::String &objectName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + objectName;
-}
-
-gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
+gd::String PlatformExtension::GetExtensionFromFullBehaviorType(
+    const gd::String& type) {
   const auto separatorIndex =
       type.find(PlatformExtension::GetNamespaceSeparator());
   if (separatorIndex == std::string::npos) {
@@ -834,7 +789,42 @@ gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& t
   return type.substr(0, separatorIndex);
 }
 
-gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
+gd::String PlatformExtension::GetBehaviorNameFromFullBehaviorType(
+    const gd::String& type) {
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  if (separatorIndex == std::string::npos) {
+    return "";
+  }
+  return type.substr(separatorIndex + 2);
+}
+
+gd::String PlatformExtension::GetObjectEventsFunctionFullType(
+    const gd::String& extensionName,
+    const gd::String& objectName,
+    const gd::String& functionName) {
+  const auto& separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName + separator + functionName;
+}
+
+gd::String PlatformExtension::GetObjectFullType(const gd::String& extensionName,
+                                                const gd::String& objectName) {
+  const auto& separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName;
+}
+
+gd::String PlatformExtension::GetExtensionFromFullObjectType(
+    const gd::String& type) {
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  if (separatorIndex == std::string::npos) {
+    return "";
+  }
+  return type.substr(0, separatorIndex);
+}
+
+gd::String PlatformExtension::GetObjectNameFromFullObjectType(
+    const gd::String& type) {
   const auto separatorIndex =
       type.find(PlatformExtension::GetNamespaceSeparator());
   if (separatorIndex == std::string::npos) {

Core/GDCore/Extensions/PlatformExtension.h

@@ -13,11 +13,11 @@
 #include "GDCore/CommonTools.h"
 #include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
 #include "GDCore/Extensions/Metadata/EventMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/VersionPriv.h"
@@ -440,12 +440,6 @@ class GD_CORE_API PlatformExtension {
    */
   bool IsDeprecated() const { return deprecated; }
 
-  /**
-   * \brief Return true if the extension is a standard extension that cannot be
-   * deactivated
-   */
-  bool IsBuiltin() const;
-
   /**
    * \brief Get the namespace of the extension.
    * \note The namespace is simply the name of the extension concatenated with
@@ -640,12 +634,6 @@ class GD_CORE_API PlatformExtension {
   }
   ///@}
 
-  /**
-   * \brief Return the name of all the extensions which are considered provided
-   * by platforms.
-   */
-  static std::vector<gd::String> GetBuiltinExtensionsNames();
-
   /**
    * \brief Get the string used to separate the name of the
    * instruction/expression and the extension.
@@ -663,6 +651,10 @@ class GD_CORE_API PlatformExtension {
   static gd::String GetBehaviorFullType(const gd::String& extensionName,
                                         const gd::String& behaviorName);
 
+  static gd::String GetExtensionFromFullBehaviorType(const gd::String& type);
+
+  static gd::String GetBehaviorNameFromFullBehaviorType(const gd::String& type);
+
   static gd::String GetObjectEventsFunctionFullType(
       const gd::String& extensionName,
       const gd::String& objectName,

Core/GDCore/IDE/Events/EventsVariableReplacer.h

@@ -73,6 +73,7 @@ class GD_CORE_API EventsVariableReplacer
    */
   const gd::String targetGroupName;
   const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
+  // TODO There is no reason de delete events. This dead code should be removed.
   const std::unordered_set<gd::String> &removedVariableNames;
 
   static VariablesContainer nullVariablesContainer;

Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.cpp

@@ -0,0 +1,235 @@
+#include "ExampleExtensionUsagesFinder.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/IDE/WholeProjectRefactorer.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+std::set<gd::String>
+ExampleExtensionUsagesFinder::GetUsedExtensions(gd::Project &project) {
+  ExampleExtensionUsagesFinder worker(project);
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
+  gd::ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(project,
+                                                                 worker);
+
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    worker.isStoreExtension =
+        eventsFunctionsExtension.GetOriginName() == "gdevelop-extension-store";
+    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
+        project, eventsFunctionsExtension, worker);
+  }
+  if (!worker.has3DObjects) {
+    worker.usedExtensions.erase("Scene3D");
+  }
+  return worker.usedExtensions;
+};
+
+void ExampleExtensionUsagesFinder::AddUsedExtension(
+    const gd::PlatformExtension &extension) {
+  usedExtensions.insert(extension.GetName());
+}
+
+void ExampleExtensionUsagesFinder::AddUsedBuiltinExtension(
+    const gd::String &extensionName) {
+  usedExtensions.insert(extensionName);
+}
+
+// Objects scanner
+
+void ExampleExtensionUsagesFinder::DoVisitObject(gd::Object &object) {
+  auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+      project.GetCurrentPlatform(), object.GetType());
+  if (metadata.GetMetadata().IsRenderedIn3D()) {
+    has3DObjects = true;
+  }
+  AddUsedExtension(metadata.GetExtension());
+};
+
+// Behaviors scanner
+
+void ExampleExtensionUsagesFinder::DoVisitBehavior(gd::Behavior &behavior) {
+  auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
+      project.GetCurrentPlatform(), behavior.GetTypeName());
+  AddUsedExtension(metadata.GetExtension());
+};
+
+// Instructions scanner
+
+bool ExampleExtensionUsagesFinder::DoVisitInstruction(
+    gd::Instruction &instruction, bool isCondition) {
+  auto metadata =
+      isCondition ? gd::MetadataProvider::GetExtensionAndConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : gd::MetadataProvider::GetExtensionAndActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+  // Unused event-based objects or events-based behaviors may use object and
+  // behavior instructions that should not be detected as extension usage.
+  // The extension of actually used objects and behaviors will be detected on
+  // scene objects. This is why object or behavior instructions usually don't
+  // have any import.
+  // Built-in extensions that are included by default don't declare any include
+  // files on their instructions either. To still detect their usage, we
+  // consider that main events and dedicated extensions can't have dead code.
+  if (!isStoreExtension || !metadata.GetMetadata().GetIncludeFiles().empty()) {
+    AddUsedExtension(metadata.GetExtension());
+  }
+
+  gd::ParameterMetadataTools::IterateOverParameters(
+      instruction.GetParameters(), metadata.GetMetadata().GetParameters(),
+      [this](const gd::ParameterMetadata &parameterMetadata,
+             const gd::Expression &parameterValue,
+             const gd::String &lastObjectName) {
+        const gd::String &parameterType = parameterMetadata.GetType();
+
+        if (gd::ParameterMetadata::IsExpression("string", parameterType)) {
+          rootType = "string";
+          parameterValue.GetRootNode()->Visit(*this);
+        } else if (gd::ParameterMetadata::IsExpression("number",
+                                                       parameterType)) {
+          rootType = "number";
+          parameterValue.GetRootNode()->Visit(*this);
+        } else if (gd::ParameterMetadata::IsExpression("variable",
+                                                       parameterType))
+          AddUsedBuiltinExtension("BuiltinVariables");
+      });
+
+  return false;
+}
+
+// Expressions scanner
+
+// Ignore literals nodes
+void ExampleExtensionUsagesFinder::OnVisitNumberNode(NumberNode &node){};
+void ExampleExtensionUsagesFinder::OnVisitTextNode(TextNode &node){};
+
+// Ignore nodes without valid extensions
+void ExampleExtensionUsagesFinder::OnVisitEmptyNode(EmptyNode &node){};
+void ExampleExtensionUsagesFinder::OnVisitObjectFunctionNameNode(
+    ObjectFunctionNameNode &node){};
+
+// Visit sub-expressions
+void ExampleExtensionUsagesFinder::OnVisitSubExpressionNode(
+    SubExpressionNode &node) {
+  node.expression->Visit(*this);
+};
+
+void ExampleExtensionUsagesFinder::OnVisitOperatorNode(OperatorNode &node) {
+  node.leftHandSide->Visit(*this);
+  node.rightHandSide->Visit(*this);
+};
+
+void ExampleExtensionUsagesFinder::OnVisitUnaryOperatorNode(
+    UnaryOperatorNode &node) {
+  node.factor->Visit(*this);
+};
+
+// Add variable extension and visit sub-expressions on variable nodes
+void ExampleExtensionUsagesFinder::OnVisitVariableNode(VariableNode &node) {
+  AddUsedBuiltinExtension("BuiltinVariables");
+
+  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(),
+                                                GetProjectScopedContainers(),
+                                                rootType, node);
+
+  if (gd::ParameterMetadata::IsExpression("variable", type)) {
+    // Nothing to do (this can't reference an object)
+  } else {
+    GetProjectScopedContainers().MatchIdentifierWithName<void>(
+        node.name,
+        [&]() {
+          // This represents an object.
+          auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+              project.GetCurrentPlatform(), node.name);
+          AddUsedExtension(metadata.GetExtension());
+        },
+        [&]() {
+          // This is a variable.
+        },
+        [&]() {
+          // This is a property.
+        },
+        [&]() {
+          // This is a parameter.
+        },
+        [&]() {
+          // This is something else.
+        });
+  }
+
+  if (node.child)
+    node.child->Visit(*this);
+};
+
+void ExampleExtensionUsagesFinder::OnVisitVariableAccessorNode(
+    VariableAccessorNode &node) {
+  AddUsedBuiltinExtension("BuiltinVariables");
+  if (node.child)
+    node.child->Visit(*this);
+};
+
+void ExampleExtensionUsagesFinder::OnVisitVariableBracketAccessorNode(
+    VariableBracketAccessorNode &node) {
+  AddUsedBuiltinExtension("BuiltinVariables");
+  node.expression->Visit(*this);
+  if (node.child)
+    node.child->Visit(*this);
+};
+
+// Add extensions bound to Objects/Behaviors/Functions
+void ExampleExtensionUsagesFinder::OnVisitIdentifierNode(IdentifierNode &node) {
+  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(),
+                                                GetProjectScopedContainers(),
+                                                rootType, node);
+  if (gd::ParameterMetadata::IsObject(type) ||
+      GetObjectsContainersList().HasObjectOrGroupNamed(node.identifierName)) {
+    // An object or object variable is used.
+    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+        project.GetCurrentPlatform(), node.identifierName);
+    AddUsedExtension(metadata.GetExtension());
+  }
+};
+
+void ExampleExtensionUsagesFinder::OnVisitFunctionCallNode(
+    FunctionCallNode &node) {
+  // Extensions of non-free functions are already found when scanning objects.
+  if (!(node.objectName.empty() && node.behaviorName.empty()))
+    return;
+  gd::ExtensionAndMetadata<gd::ExpressionMetadata> metadata;
+
+  // Try to find a free number expression
+  metadata = gd::MetadataProvider::GetExtensionAndExpressionMetadata(
+      project.GetCurrentPlatform(), node.functionName);
+  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata())) {
+    // Try to find a free str expression
+    metadata = gd::MetadataProvider::GetExtensionAndStrExpressionMetadata(
+        project.GetCurrentPlatform(), node.functionName);
+    // No valid expression found, return.
+    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata()))
+      return;
+  }
+
+  // Unused event-based objects or events-based behaviors may use object and
+  // behavior expressions that should not be detected as extension usage.
+  // The extension of actually used objects and behaviors will be detected on
+  // scene objects. This is why object or behavior expressions usually don't
+  // have any import.
+  // Built-in extensions that are included by default don't declare any include
+  // files on their instructions either. To still detect their usage, we
+  // consider that main events and dedicated extensions can't have dead code.
+  if (!isStoreExtension || !metadata.GetMetadata().GetIncludeFiles().empty()) {
+    AddUsedExtension(metadata.GetExtension());
+  }
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.h

@@ -0,0 +1,77 @@
+/*
+ * 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 <set>
+
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Project;
+class Object;
+class Behavior;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * @brief List extension usages for generated example web-pages.
+ * 
+ * Dependency transitivity is not ensured (see UsedExtensionsFinder).
+ */
+class GD_CORE_API ExampleExtensionUsagesFinder
+    : public ArbitraryObjectsWorker,
+      public ArbitraryEventsWorkerWithContext,
+      public ExpressionParser2NodeWorker {
+public:
+  static std::set<gd::String> GetUsedExtensions(gd::Project &project);
+
+private:
+  ExampleExtensionUsagesFinder(gd::Project &project_) : project(project_){};
+  gd::Project &project;
+  gd::String rootType;
+  bool isStoreExtension = false;
+
+  // Result
+  std::set<gd::String> usedExtensions;
+  bool has3DObjects = false;
+
+  void AddUsedExtension(const gd::PlatformExtension &extension);
+  void AddUsedBuiltinExtension(const gd::String &extensionName);
+
+  // Object Visitor
+  void DoVisitObject(gd::Object &object) override;
+
+  // Behavior Visitor
+  void DoVisitBehavior(gd::Behavior &behavior) override;
+
+  // Instructions Visitor
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+
+  // Expression Visitor
+  void OnVisitSubExpressionNode(SubExpressionNode &node) override;
+  void OnVisitOperatorNode(OperatorNode &node) override;
+  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override;
+  void OnVisitNumberNode(NumberNode &node) override;
+  void OnVisitTextNode(TextNode &node) override;
+  void OnVisitVariableNode(VariableNode &node) override;
+  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override;
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode &node) override;
+  void OnVisitIdentifierNode(IdentifierNode &node) override;
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override;
+  void OnVisitFunctionCallNode(FunctionCallNode &node) override;
+  void OnVisitEmptyNode(EmptyNode &node) override;
+};
+
+}; // namespace gd

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -69,16 +69,9 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
                         project.GetCurrentPlatform(), instruction.GetType())
                   : gd::MetadataProvider::GetExtensionAndActionMetadata(
                         project.GetCurrentPlatform(), instruction.GetType());
-  // Unused event-based objects or events-based behaviors may use object and
-  // behavior instructions that should not be detected as extension usage.
-  // The extension of actually used objects and behaviors will be detected on
-  // scene objects. This is why object or behavior instructions usually don't
-  // have any import.
-  if (!metadata.GetMetadata().GetIncludeFiles().empty()) {
-    result.AddUsedExtension(metadata.GetExtension());
-    for (auto &&includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-      result.AddUsedIncludeFiles(includeFile);
-    }
+  result.AddUsedExtension(metadata.GetExtension());
+  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
+    result.AddUsedIncludeFiles(includeFile);
   }
 
   gd::ParameterMetadataTools::IterateOverParameters(
@@ -206,16 +199,9 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
       return;
   }
 
-  // Unused event-based objects or events-based behaviors may use object and
-  // behavior expressions that should not be detected as extension usage.
-  // The extension of actually used objects and behaviors will be detected on
-  // scene objects. This is why object or behavior expressions usually don't
-  // have any import.
-  if (!metadata.GetMetadata().GetIncludeFiles().empty()) {
-    result.AddUsedExtension(metadata.GetExtension());
-    for (auto &&includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-      result.AddUsedIncludeFiles(includeFile);
-    }
+  result.AddUsedExtension(metadata.GetExtension());
+  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
+    result.AddUsedIncludeFiles(includeFile);
   }
 };
 

Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp

@@ -0,0 +1,157 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EventsBasedObjectVariantHelper.h"
+
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/InitialInstancesContainer.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectGroup.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/ObjectsContainersList.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Variable.h"
+#include "GDCore/Project/VariablesContainer.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+    const gd::Project &project, gd::EventsBasedObject &eventsBasedObject) {
+  auto &defaultObjects = eventsBasedObject.GetDefaultVariant().GetObjects();
+
+  for (const auto &variant :
+       eventsBasedObject.GetVariants().GetInternalVector()) {
+    auto &objects = variant->GetObjects();
+
+    // Delete extra objects
+    for (auto it = objects.GetObjects().begin();
+         it != objects.GetObjects().end(); ++it) {
+      const auto &objectName = it->get()->GetName();
+      if (!defaultObjects.HasObjectNamed(objectName)) {
+        variant->GetInitialInstances().RemoveInitialInstancesOfObject(
+            objectName);
+        // Do it in last because it unalloc objectName.
+        objects.RemoveObject(objectName);
+        --it;
+      }
+    }
+    for (const auto &defaultObject : defaultObjects.GetObjects()) {
+      const auto &objectName = defaultObject->GetName();
+      const auto &defaultVariables = defaultObject->GetVariables();
+      const auto &defaultBehaviors = defaultObject->GetAllBehaviorContents();
+
+      // Copy missing objects
+      if (!objects.HasObjectNamed(objectName)) {
+        objects.InsertObject(*defaultObject,
+                             defaultObjects.GetObjectPosition(objectName));
+        objects.AddMissingObjectsInRootFolder();
+        continue;
+      }
+      // Change object types
+      auto &object = objects.GetObject(objectName);
+      if (object.GetType() != defaultObject->GetType()) {
+        // Keep a copy of the old object.
+        auto oldObject = objects.GetObject(objectName);
+        objects.RemoveObject(objectName);
+        objects.InsertObject(*defaultObject,
+                             defaultObjects.GetObjectPosition(objectName));
+        object.CopyWithoutConfiguration(oldObject);
+        objects.AddMissingObjectsInRootFolder();
+      }
+
+      // Copy missing behaviors
+      auto &behaviors = object.GetAllBehaviorContents();
+      for (const auto &pair : defaultBehaviors) {
+        const auto &behaviorName = pair.first;
+        const auto &defaultBehavior = pair.second;
+
+        if (object.HasBehaviorNamed(behaviorName) &&
+            object.GetBehavior(behaviorName).GetTypeName() !=
+                defaultBehavior->GetTypeName()) {
+          object.RemoveBehavior(behaviorName);
+        }
+        if (!object.HasBehaviorNamed(behaviorName)) {
+          auto *behavior = object.AddNewBehavior(
+              project, defaultBehavior->GetTypeName(), behaviorName);
+          gd::SerializerElement element;
+          defaultBehavior->SerializeTo(element);
+          behavior->UnserializeFrom(element);
+        }
+      }
+      // Delete extra behaviors
+      for (auto it = behaviors.begin(); it != behaviors.end(); ++it) {
+        const auto &behaviorName = it->first;
+        if (!defaultObject->HasBehaviorNamed(behaviorName)) {
+          object.RemoveBehavior(behaviorName);
+          --it;
+        }
+      }
+
+      // Sort and copy missing variables
+      auto &variables = object.GetVariables();
+      for (size_t defaultVariableIndex = 0;
+           defaultVariableIndex < defaultVariables.Count();
+           defaultVariableIndex++) {
+        const auto &variableName =
+            defaultVariables.GetNameAt(defaultVariableIndex);
+        const auto &defaultVariable =
+            defaultVariables.Get(defaultVariableIndex);
+
+        auto variableIndex = variables.GetPosition(variableName);
+        if (variableIndex == gd::String::npos) {
+          variables.Insert(variableName, defaultVariable, defaultVariableIndex);
+        } else {
+          variables.Move(variableIndex, defaultVariableIndex);
+        }
+        if (variables.Get(variableName).GetType() != defaultVariable.GetType()) {
+          variables.Remove(variableName);
+          variables.Insert(variableName, defaultVariable, defaultVariableIndex);
+        }
+      }
+      // Remove extra variables
+      auto variableToRemoveCount = variables.Count() - defaultVariables.Count();
+      for (size_t iteration = 0; iteration < variableToRemoveCount;
+           iteration++) {
+        variables.Remove(variables.GetNameAt(variables.Count() - 1));
+      }
+
+      // Remove extra instance variables
+      variant->GetInitialInstances().IterateOverInstances(
+          [&objectName,
+           &defaultVariables](gd::InitialInstance &initialInstance) {
+            if (initialInstance.GetObjectName() != objectName) {
+              return false;
+            }
+            auto &instanceVariables = initialInstance.GetVariables();
+            for (size_t instanceVariableIndex = 0;
+                 instanceVariableIndex < instanceVariables.Count();
+                 instanceVariableIndex++) {
+              const auto &variableName =
+                  defaultVariables.GetNameAt(instanceVariableIndex);
+
+              if (!defaultVariables.Has(variableName)) {
+                instanceVariables.Remove(variableName);
+              }
+            }
+            return false;
+          });
+    }
+    auto &defaultObjectGroups =
+        eventsBasedObject.GetDefaultVariant().GetObjects().GetObjectGroups();
+    auto &objectGroups = variant->GetObjects().GetObjectGroups();
+    auto objectGroupsCount = objectGroups.Count();
+    // Clear groups
+    for (size_t index = 0; index < objectGroupsCount; index++) {
+      objectGroups.Remove(objectGroups.Get(0).GetName());
+    }
+    // Copy groups
+    for (size_t index = 0; index < defaultObjectGroups.Count(); index++) {
+      objectGroups.Insert(defaultObjectGroups.Get(index), index);
+    }
+  }
+}
+
+} // namespace gd

Core/GDCore/IDE/EventsBasedObjectVariantHelper.h

@@ -0,0 +1,26 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+namespace gd {
+class EventsBasedObject;
+class Project;
+} // namespace gd
+
+namespace gd {
+
+class GD_CORE_API EventsBasedObjectVariantHelper {
+public:
+  /**
+   * @brief Apply the changes done on events-based object children to all its
+   * variants.
+   */
+  static void
+  ComplyVariantsToEventsBasedObject(const gd::Project &project,
+                                    gd::EventsBasedObject &eventsBasedObject);
+};
+
+} // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -17,6 +17,8 @@
 #include "GDCore/IDE/Project/ResourcesRenamer.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/CustomBehavior.h"
+#include "GDCore/Project/CustomObjectConfiguration.h"
+#include "GDCore/Project/EventsBasedObjectVariant.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
@@ -60,9 +62,6 @@ void ObjectAssetSerializer::SerializeTo(
   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");
@@ -75,6 +74,28 @@ void ObjectAssetSerializer::SerializeTo(
 
   cleanObject->SerializeTo(objectAssetElement.AddChild("object"));
 
+  double width = 0;
+  double height = 0;
+  if (project.HasEventsBasedObject(object.GetType())) {
+    SerializerElement &variantsElement =
+        objectAssetElement.AddChild("variants");
+    variantsElement.ConsiderAsArrayOf("variant");
+
+    const auto *variant = ObjectAssetSerializer::GetVariant(project, object);
+    if (variant) {
+      width = variant->GetAreaMaxX() - variant->GetAreaMinX();
+      height = variant->GetAreaMaxY() - variant->GetAreaMinY();
+    }
+
+    std::unordered_set<gd::String> alreadyUsedVariantIdentifiers;
+    gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
+        project, object, variantsElement, alreadyUsedVariantIdentifiers);
+  }
+
+  // TODO Find the right object dimensions when their is no variant.
+  element.SetIntAttribute("width", width);
+  element.SetIntAttribute("height", height);
+
   SerializerElement &resourcesElement =
       objectAssetElement.AddChild("resources");
   resourcesElement.ConsiderAsArrayOf("resource");
@@ -108,4 +129,59 @@ void ObjectAssetSerializer::SerializeTo(
       objectAssetElement.AddChild("customization");
   customizationElement.ConsiderAsArrayOf("empty");
 }
+
+void ObjectAssetSerializer::SerializeUsedVariantsTo(
+    gd::Project &project, const gd::Object &object,
+    SerializerElement &variantsElement,
+    std::unordered_set<gd::String> &alreadyUsedVariantIdentifiers) {
+  const auto *variant = ObjectAssetSerializer::GetVariant(project, object);
+  if (!variant) {
+    return;
+  }
+  const auto &variantIdentifier =
+      object.GetType() + gd::PlatformExtension::GetNamespaceSeparator() +
+      variant->GetName();
+  auto insertResult = alreadyUsedVariantIdentifiers.insert(variantIdentifier);
+  if (!insertResult.second) {
+    return;
+  }
+  SerializerElement &pairElement = variantsElement.AddChild("variant");
+  pairElement.SetAttribute("objectType", object.GetType());
+  SerializerElement &variantElement = pairElement.AddChild("variant");
+  variant->SerializeTo(variantElement);
+
+  for (auto &object : variant->GetObjects().GetObjects()) {
+    gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
+        project, *object, variantsElement, alreadyUsedVariantIdentifiers);
+  }
+}
+
+const gd::EventsBasedObjectVariant *
+ObjectAssetSerializer::GetVariant(gd::Project &project,
+                                  const gd::Object &object) {
+  if (!project.HasEventsBasedObject(object.GetType())) {
+    return nullptr;
+  }
+  const auto &eventsBasedObject =
+      project.GetEventsBasedObject(object.GetType());
+  const auto &variants = eventsBasedObject.GetVariants();
+  const auto *customObjectConfiguration =
+      dynamic_cast<const gd::CustomObjectConfiguration *>(
+          &object.GetConfiguration());
+  const auto &variantName = customObjectConfiguration->GetVariantName();
+  if (!variants.HasVariantNamed(variantName) &&
+      (customObjectConfiguration
+           ->IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() ||
+       customObjectConfiguration
+           ->IsForcedToOverrideEventsBasedObjectChildrenConfiguration())) {
+    return nullptr;
+  }
+  const auto &variantIdentifier =
+      object.GetType() + gd::PlatformExtension::GetNamespaceSeparator() +
+      variantName;
+  const auto &variant = variants.HasVariantNamed(variantName)
+                            ? variants.GetVariant(variantName)
+                            : eventsBasedObject.GetDefaultVariant();
+  return &variant;
+}
 } // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.h

@@ -6,6 +6,7 @@
 #pragma once
 #include <map>
 #include <vector>
+#include <unordered_set>
 
 #include "GDCore/String.h"
 
@@ -20,6 +21,7 @@ class InitialInstance;
 class SerializerElement;
 class EffectsContainer;
 class AbstractFileSystem;
+class EventsBasedObjectVariant;
 } // namespace gd
 
 namespace gd {
@@ -52,6 +54,13 @@ private:
   ObjectAssetSerializer(){};
 
   static gd::String GetObjectExtensionName(const gd::Object &object);
+
+  static void SerializeUsedVariantsTo(
+      gd::Project &project, const gd::Object &object,
+      SerializerElement &variantsElement,
+      std::unordered_set<gd::String> &alreadyUsedVariantIdentifiers);
+
+  static const gd::EventsBasedObjectVariant* GetVariant(gd::Project &project, const gd::Object &object);
 };
 
 } // namespace gd

Core/GDCore/IDE/ObjectVariableHelper.cpp

@@ -3,9 +3,11 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#include "GroupVariableHelper.h"
+#include "ObjectVariableHelper.h"
 
 #include "GDCore/IDE/WholeProjectRefactorer.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectGroup.h"
 #include "GDCore/Project/ObjectsContainer.h"
@@ -16,7 +18,7 @@
 
 namespace gd {
 
-void GroupVariableHelper::FillAnyVariableBetweenObjects(
+void ObjectVariableHelper::FillAnyVariableBetweenObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
     const gd::ObjectGroup &objectGroup) {
@@ -65,7 +67,7 @@ void GroupVariableHelper::FillAnyVariableBetweenObjects(
   }
 }
 
-gd::VariablesContainer GroupVariableHelper::MergeVariableContainers(
+gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
     const gd::ObjectsContainersList &objectsContainersList,
     const gd::ObjectGroup &objectGroup) {
   gd::VariablesContainer mergedVariablesContainer;
@@ -113,7 +115,7 @@ gd::VariablesContainer GroupVariableHelper::MergeVariableContainers(
   return mergedVariablesContainer;
 }
 
-void GroupVariableHelper::FillMissingGroupVariablesToObjects(
+void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::ObjectGroup &objectGroup,
     const gd::SerializerElement &originalSerializedVariables) {
@@ -145,7 +147,7 @@ void GroupVariableHelper::FillMissingGroupVariablesToObjects(
 // TODO Handle position changes for group variables.
 // We could try to change the order of object variables in a way that the next
 // call to MergeVariableContainers rebuild them in the same order.
-void GroupVariableHelper::ApplyChangesToObjects(
+void ObjectVariableHelper::ApplyChangesToObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
     const gd::VariablesContainer &groupVariablesContainer,
@@ -172,6 +174,7 @@ void GroupVariableHelper::ApplyChangesToObjects(
                                 groupVariablesContainer.Get(variableName),
                                 variablesContainer.Count());
     }
+    // TODO Check what happens if 2 variables exchange their names.
     for (const auto &pair : changeset.oldToNewVariableNames) {
       const gd::String &oldVariableName = pair.first;
       const gd::String &newVariableName = pair.second;
@@ -193,4 +196,109 @@ void GroupVariableHelper::ApplyChangesToObjects(
   }
 }
 
+void ObjectVariableHelper::ApplyChangesToObjectInstances(
+    gd::VariablesContainer &objectVariablesContainer,
+    gd::InitialInstancesContainer &initialInstancesContainer,
+    const gd::String &objectName, const gd::VariablesChangeset &changeset) {
+  initialInstancesContainer.IterateOverInstances(
+      [&objectVariablesContainer, &objectName,
+       &changeset](gd::InitialInstance &instance) {
+        if (instance.GetObjectName() == objectName) {
+          auto &destinationVariablesContainer = instance.GetVariables();
+          for (const gd::String &variableName :
+               changeset.removedVariableNames) {
+            destinationVariablesContainer.Remove(variableName);
+          }
+          for (const gd::String &variableName : changeset.addedVariableNames) {
+            // Instance variables may already exist with another type.
+            if (destinationVariablesContainer.Has(variableName) &&
+                destinationVariablesContainer.Get(variableName).GetType() !=
+                    objectVariablesContainer.Get(variableName).GetType()) {
+              destinationVariablesContainer.Remove(variableName);
+            }
+          }
+          // TODO Check what happens if 2 variables exchange their names.
+          for (const auto &pair : changeset.oldToNewVariableNames) {
+            const gd::String &oldVariableName = pair.first;
+            const gd::String &newVariableName = pair.second;
+            if (destinationVariablesContainer.Has(newVariableName)) {
+              // It can happens if an instance already had the variable.
+              destinationVariablesContainer.Remove(oldVariableName);
+            } else {
+              destinationVariablesContainer.Rename(oldVariableName,
+                                                   newVariableName);
+            }
+          }
+          // Apply type changes
+          for (const gd::String &variableName :
+               changeset.valueChangedVariableNames) {
+            if (destinationVariablesContainer.Has(variableName) &&
+                destinationVariablesContainer.Get(variableName).GetType() !=
+                    objectVariablesContainer.Get(variableName).GetType()) {
+              destinationVariablesContainer.Remove(variableName);
+            }
+          }
+        }
+        return false;
+      });
+}
+
+void ObjectVariableHelper::ApplyChangesToVariants(
+    gd::EventsBasedObject &eventsBasedObject, const gd::String &objectName,
+    const gd::VariablesChangeset &changeset) {
+  auto &defaultVariablesContainer = eventsBasedObject.GetDefaultVariant()
+                                        .GetObjects()
+                                        .GetObject(objectName)
+                                        .GetVariables();
+  for (auto &variant : eventsBasedObject.GetVariants().GetInternalVector()) {
+    if (!variant->GetObjects().HasObjectNamed(objectName)) {
+      continue;
+    }
+    auto &object = variant->GetObjects().GetObject(objectName);
+    auto &variablesContainer = object.GetVariables();
+
+    for (const gd::String &variableName : changeset.removedVariableNames) {
+      variablesContainer.Remove(variableName);
+    }
+    for (const gd::String &variableName : changeset.addedVariableNames) {
+      if (variablesContainer.Has(variableName)) {
+        // It can happens if a child-object already had the variable but it was
+        // missing in other variant child-object.
+        continue;
+      }
+      variablesContainer.Insert(variableName,
+                                defaultVariablesContainer.Get(variableName),
+                                variablesContainer.Count());
+    }
+    // TODO Check what happens if 2 variables exchange their names.
+    for (const auto &pair : changeset.oldToNewVariableNames) {
+      const gd::String &oldVariableName = pair.first;
+      const gd::String &newVariableName = pair.second;
+      if (variablesContainer.Has(newVariableName)) {
+        // It can happens if a child-object already had the variable but it was
+        // missing in other variant child-object.
+        variablesContainer.Remove(oldVariableName);
+      } else {
+        variablesContainer.Rename(oldVariableName, newVariableName);
+      }
+    }
+    // Apply type changes
+    for (const gd::String &variableName : changeset.valueChangedVariableNames) {
+      size_t index = variablesContainer.GetPosition(variableName);
+
+      if (variablesContainer.Has(variableName) &&
+          variablesContainer.Get(variableName).GetType() !=
+              defaultVariablesContainer.Get(variableName).GetType()) {
+        variablesContainer.Remove(variableName);
+        variablesContainer.Insert(
+            variableName, defaultVariablesContainer.Get(variableName), index);
+      }
+    }
+
+    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
+        variablesContainer, variant->GetInitialInstances(), objectName,
+        changeset);
+  }
+}
+
 } // namespace gd

Core/GDCore/IDE/ObjectVariableHelper.h

@@ -8,6 +8,8 @@
 #include "GDCore/Project/VariablesContainer.h"
 
 namespace gd {
+class EventsBasedObject;
+class InitialInstancesContainer;
 class ObjectsContainersList;
 class ObjectsContainer;
 class ObjectGroup;
@@ -22,7 +24,7 @@ namespace gd {
  *
  * This is used by the object group variable editor.
  */
-class GD_CORE_API GroupVariableHelper {
+class GD_CORE_API ObjectVariableHelper {
 public:
   /**
    * Copy every variable from every object of the group to the other objects
@@ -52,7 +54,7 @@ public:
    * Objects can be added during the group edition and may not necessarily have
    * all the variables initially shared by the group.
    *
-   * \see gd::GroupVariableHelper::MergeVariableContainers
+   * \see gd::ObjectVariableHelper::MergeVariableContainers
    */
   static void FillMissingGroupVariablesToObjects(
       gd::ObjectsContainer &globalObjectsContainer,
@@ -70,6 +72,22 @@ public:
                         const gd::VariablesContainer &groupVariablesContainer,
                         const gd::ObjectGroup &objectGroup,
                         const gd::VariablesChangeset &changeset);
+
+  /**
+   * @brief Apply the changes done on an object to all its instances.
+   */
+  static void ApplyChangesToObjectInstances(
+      gd::VariablesContainer &objectVariablesContainer,
+      gd::InitialInstancesContainer &initialInstancesContainer,
+      const gd::String &objectName, const gd::VariablesChangeset &changeset);
+
+  /**
+   * @brief Apply the changes done on events-based object child to all its
+   * variants.
+   */
+  static void ApplyChangesToVariants(gd::EventsBasedObject &eventsBasedObject,
+                                     const gd::String &objectName,
+                                     const gd::VariablesChangeset &changeset);
 };
 
-} // namespace gd
+} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -39,6 +39,22 @@ void ProjectBrowserHelper::ExposeProjectEvents(
   }
 }
 
+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
+  // See also gd::ResourceExposer::ExposeWholeProjectResources
+  // for a method that traverses the whole project (this time for resources)
+  // and ExposeProjectEffects (this time for effects).
+
+  ExposeProjectEventsWithoutExtensions(project, worker);
+
+  // Add events based extensions
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
+  }
+}
+
 void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
     gd::Project& project, gd::ArbitraryEventsWorker& worker) {
   // Add layouts events
@@ -51,6 +67,28 @@ void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
   }
 }
 
+void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
+    gd::Project& project, gd::ArbitraryEventsWorkerWithContext& worker) {
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    auto &layout = project.GetLayout(s);
+    auto projectScopedContainers =
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+    worker.Launch(layout.GetEvents(), projectScopedContainers);
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    const auto &externalEvents = project.GetExternalEvents(s);
+    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
+    if (project.HasLayoutNamed(associatedLayout)) {
+      auto &layout = project.GetLayout(associatedLayout);
+      auto projectScopedContainers =
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+      worker.Launch(project.GetExternalEvents(s).GetEvents(), projectScopedContainers);
+    }
+  }
+}
+
 void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
     gd::Project &project, gd::Layout &layout,
     gd::ArbitraryEventsWorker &worker) {
@@ -111,38 +149,6 @@ void ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
   }
 }
 
-void ProjectBrowserHelper::ExposeProjectEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
-  // See also gd::ResourceExposer::ExposeWholeProjectResources
-  // for a method that traverses the whole project (this time for resources)
-  // and ExposeProjectEffects (this time for effects).
-
-  // Add layouts events
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    auto &layout = project.GetLayout(s);
-    auto projectScopedContainers =
-      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
-    worker.Launch(layout.GetEvents(), projectScopedContainers);
-  }
-  // Add external events events
-  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
-    const auto &externalEvents = project.GetExternalEvents(s);
-    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
-    if (project.HasLayoutNamed(associatedLayout)) {
-      auto &layout = project.GetLayout(associatedLayout);
-      auto projectScopedContainers =
-        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
-      worker.Launch(project.GetExternalEvents(s).GetEvents(), projectScopedContainers);
-    }
-  }
-  // Add events based extensions
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
-  }
-}
-
 void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
     gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     gd::ArbitraryEventsWorker &worker) {
@@ -308,6 +314,12 @@ void ProjectBrowserHelper::ExposeProjectObjects(
          eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
       auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
       worker.Launch(eventsBasedObject->GetObjects());
+
+      for (auto &&variantUniquePtr :
+           eventsBasedObject->GetVariants().GetInternalVector()) {
+        auto variant = variantUniquePtr.get();
+        worker.Launch(variant->GetObjects());
+      }
     }
   }
 };

Core/GDCore/IDE/ProjectBrowserHelper.h

@@ -57,6 +57,15 @@ public:
   ExposeProjectEventsWithoutExtensions(gd::Project &project,
                                        gd::ArbitraryEventsWorker &worker);
 
+  /**
+   * \brief Call the specified worker on all events of the project (layout and
+   * external events) but not events from extensions.
+   *
+   * Only use this for stats.
+   */
+  static void ExposeProjectEventsWithoutExtensions(
+      gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker);
+
   /**
    * \brief Call the specified worker on all events of a layout and
    * its external events.

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -42,6 +42,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
     bool isBehavior, bool isSharedProperties) {
   auto &propertyName = property.GetName();
+  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
+      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
+          property.GetType()));
   auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
   gd::String capitalizedName = CapitalizeFirstLetter(property.GetName());
   gd::String setterName = "Set" + capitalizedName;
@@ -59,9 +62,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       property.GetLabel().empty() ? property.GetName() : property.GetLabel();
 
   gd::String descriptionSubject =
-      (property.GetType() == "Boolean" ? "if " : "the ") +
+      (primitiveType == "boolean" ? "if " : "the ") +
       UnCapitalizeFirstLetter(propertyLabel) +
-      (isSharedProperties || property.GetType() == "Boolean"
+      (isSharedProperties || primitiveType == "boolean"
            ? "."
            : " of the object.") +
       (property.GetDescription().empty() ? ""
@@ -71,19 +74,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
              "objects using the behavior."
            : "");
 
-  gd::String propertyGetterName =
-      (isSharedProperties ? "SharedProperty" : "Property") + property.GetName();
-  gd::String getterType =
-      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-          extension.GetName(), eventsBasedEntity.GetName(), propertyGetterName);
-  gd::String setterType =
-      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-          extension.GetName(), eventsBasedEntity.GetName(),
-          "Set" + propertyGetterName);
-
   gd::String getterName = capitalizedName;
-  gd::String numberOrString =
-      property.GetType() == "Number" ? "Number" : "String";
 
   if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
     auto &getter = functionsContainer.InsertNewEventsFunction(
@@ -99,7 +90,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
         .SetName(legacyExpressionType)
         .SetExtraInfo(GetStringifiedExtraInfo(property));
     getter.SetFullName(propertyLabel).SetGroup(functionGroupName);
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
       getter.SetFunctionType(gd::EventsFunction::Condition)
           .SetDescription("Check " + descriptionSubject)
           .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel));
@@ -112,13 +103,12 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     auto &event =
         dynamic_cast<gd::StandardEvent &>(getter.GetEvents().InsertNewEvent(
             project, "BuiltinCommonInstructions::Standard", 0));
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
       gd::Instruction condition;
-      condition.SetType(getterType);
-      condition.AddParameter("Object");
-      if (isBehavior) {
-        condition.AddParameter("Behavior");
-      }
+      condition.SetType("BooleanVariable");
+      condition.AddParameter(propertyName);
+      condition.AddParameter("True");
+      condition.AddParameter("");
       event.GetConditions().Insert(condition, 0);
 
       gd::Instruction action;
@@ -127,6 +117,8 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       event.GetActions().Insert(action, 0);
     } else {
       gd::Instruction action;
+      gd::String numberOrString =
+          primitiveType == "number" ? "Number" : "String";
       action.SetType("SetReturn" + numberOrString);
       action.AddParameter(property.GetName());
       event.GetActions().Insert(action, 0);
@@ -136,7 +128,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
   if (!functionsContainer.HasEventsFunctionNamed(setterName)) {
     auto &setter = functionsContainer.InsertNewEventsFunction(
         setterName, functionsContainer.GetEventsFunctionsCount());
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
       setter.SetFunctionType(gd::EventsFunction::Action)
           .SetFullName(propertyLabel)
           .SetGroup(functionGroupName)
@@ -177,26 +169,24 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       setter.SetGetterName(getterName);
     }
 
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
       {
         auto &event =
             dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
                 project, "BuiltinCommonInstructions::Standard", 0));
 
         gd::Instruction condition;
-        condition.SetType("GetArgumentAsBoolean");
-        condition.AddParameter("\"Value\"");
+        condition.SetType("BooleanVariable");
+        condition.AddParameter("Value");
+        condition.AddParameter("True");
+        condition.AddParameter("");
         event.GetConditions().Insert(condition, 0);
 
         gd::Instruction action;
-        action.SetType(setterType);
-        action.AddParameter("Object");
-        if (isBehavior) {
-          action.AddParameter("Behavior");
-          action.AddParameter("yes");
-        } else {
-          action.AddParameter("yes");
-        }
+        action.SetType("SetBooleanVariable");
+        action.AddParameter(propertyName);
+        action.AddParameter("True");
+        action.AddParameter("");
         event.GetActions().Insert(action, 0);
       }
       {
@@ -205,20 +195,17 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
                 project, "BuiltinCommonInstructions::Standard", 0));
 
         gd::Instruction condition;
-        condition.SetType("GetArgumentAsBoolean");
-        condition.AddParameter("\"Value\"");
-        condition.SetInverted(true);
+        condition.SetType("BooleanVariable");
+        condition.AddParameter("Value");
+        condition.AddParameter("False");
+        condition.AddParameter("");
         event.GetConditions().Insert(condition, 0);
 
         gd::Instruction action;
-        action.SetType(setterType);
-        action.AddParameter("Object");
-        if (isBehavior) {
-          action.AddParameter("Behavior");
-          action.AddParameter("no");
-        } else {
-          action.AddParameter("no");
-        }
+        action.SetType("SetBooleanVariable");
+        action.AddParameter(propertyName);
+        action.AddParameter("False");
+        action.AddParameter("");
         event.GetActions().Insert(action, 0);
       }
     } else {
@@ -227,16 +214,11 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
               project, "BuiltinCommonInstructions::Standard", 0));
 
       gd::Instruction action;
-      action.SetType(setterType);
-      action.AddParameter("Object");
-      if (isBehavior) {
-        action.AddParameter("Behavior");
-        action.AddParameter("=");
-        action.AddParameter("Value");
-      } else {
-        action.AddParameter("=");
-        action.AddParameter("Value");
-      }
+      action.SetType(primitiveType == "number" ? "SetNumberVariable"
+                                               : "SetStringVariable");
+      action.AddParameter(propertyName);
+      action.AddParameter("=");
+      action.AddParameter("Value");
       event.GetActions().Insert(action, 0);
     }
   }

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -3,8 +3,7 @@
  * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_PROPERTYFUNCTIONGENERATOR_H
-#define GDCORE_PROPERTYFUNCTIONGENERATOR_H
+#pragma once
 
 namespace gd {
 class String;
@@ -73,5 +72,3 @@ class GD_CORE_API PropertyFunctionGenerator {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_PROPERTYFUNCTIONGENERATOR_H

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -11,7 +11,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/DependenciesAnalyzer.h"
-#include "GDCore/IDE/GroupVariableHelper.h"
+#include "GDCore/IDE/ObjectVariableHelper.h"
 #include "GDCore/IDE/EventBasedBehaviorBrowser.h"
 #include "GDCore/IDE/EventBasedObjectBrowser.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
@@ -314,9 +314,16 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
   variablesContainer.SerializeTo(editedSerializedVariables);
   variablesContainer.UnserializeFrom(originalSerializedVariables);
 
-  // Rename and remove variables
+  // Rename variables
+  // Pass an empty set to avoid deletion of actions/conditions or events using
+  // them.
+  // While we support refactoring that would remove all references (actions,
+  // conditions...) it's both a bit dangerous for the user and we would need to
+  // show the user what will be removed before doing so. For now, just clear the
+  // removed variables so they don't trigger any refactoring.
+  std::unordered_set<gd::String> removedVariableNames;
   gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(), changeset, changeset.removedVariableNames,
+      project.GetCurrentPlatform(), changeset, removedVariableNames,
       variablesContainer);
   gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                 eventsVariableReplacer);
@@ -333,9 +340,25 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
       project, eventsVariableInstructionTypeSwitcher);
 }
 
+// TODO Apply the refactor to external layouts.
+void WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+    gd::Project &project, gd::VariablesContainer &objectVariablesContainer,
+    gd::InitialInstancesContainer &initialInstancesContainer,
+    const gd::String &objectName, const gd::VariablesChangeset &changeset,
+    const gd::SerializerElement &originalSerializedVariables) {
+  gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+      project, objectVariablesContainer, changeset,
+      originalSerializedVariables);
+
+  gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
+      objectVariablesContainer, initialInstancesContainer, objectName,
+      changeset);
+}
+
 void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
     gd::Project &project, gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
+    gd::InitialInstancesContainer &initialInstancesContainer,
     const gd::VariablesContainer &groupVariablesContainer,
     const gd::ObjectGroup &objectGroup,
     const gd::VariablesChangeset &changeset,
@@ -355,11 +378,15 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
     }
     auto &object = hasObject ? objectsContainer.GetObject(objectName)
                              : globalObjectsContainer.GetObject(objectName);
-    auto &variablesContainer = object.GetVariables();
+    auto &objectVariablesContainer = object.GetVariables();
+
+    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
+      objectVariablesContainer, initialInstancesContainer, objectName,
+      changeset);
 
     gd::EventsVariableReplacer eventsVariableReplacer(
         project.GetCurrentPlatform(), changeset,
-        removedVariableNames, variablesContainer);
+        removedVariableNames, objectVariablesContainer);
     gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                   eventsVariableReplacer);
   }
@@ -372,12 +399,12 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
                                                 eventsVariableReplacer);
 
   // Apply changes to objects.
-  gd::GroupVariableHelper::FillMissingGroupVariablesToObjects(
+  gd::ObjectVariableHelper::FillMissingGroupVariablesToObjects(
       globalObjectsContainer,
       objectsContainer,
       objectGroup,
       originalSerializedVariables);
-  gd::GroupVariableHelper::ApplyChangesToObjects(
+  gd::ObjectVariableHelper::ApplyChangesToObjects(
       globalObjectsContainer, objectsContainer, groupVariablesContainer,
       objectGroup, changeset);
 
@@ -1754,6 +1781,14 @@ void WholeProjectRefactorer::DoRenameBehavior(
   projectBrowser.ExposeFunctions(project, behaviorParameterRenamer);
 }
 
+void WholeProjectRefactorer::UpdateBehaviorsSharedData(gd::Project &project) {
+  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
+    gd::Layout &layout = project.GetLayout(i);
+
+    layout.UpdateBehaviorsSharedData(project);
+  }
+}
+
 void WholeProjectRefactorer::DoRenameObject(
     gd::Project &project, const gd::String &oldObjectType,
     const gd::String &newObjectType, const gd::ProjectBrowser &projectBrowser) {
@@ -2102,6 +2137,26 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
       groups[g].RenameObject(oldName, newName);
     }
   }
+
+  for (auto &variant : eventsBasedObject.GetVariants().GetInternalVector()) {
+    auto &variantObjects = variant->GetObjects();
+    auto &variantObjectGroups = variantObjects.GetObjectGroups();
+    if (isObjectGroup) {
+      if (variantObjectGroups.Has(oldName)) {
+        variantObjectGroups.Get(oldName).SetName(newName);
+      }
+      // Object groups can't have instances or be in other groups
+    }
+    else {
+      if (variantObjects.HasObjectNamed(oldName)) {
+        variantObjects.GetObject(oldName).SetName(newName);
+      }
+      variant->GetInitialInstances().RenameInstancesOfObject(oldName, newName);
+      for (std::size_t g = 0; g < variantObjectGroups.size(); ++g) {
+        variantObjectGroups[g].RenameObject(oldName, newName);
+      }
+    }
+  }
 }
 
 void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -32,6 +32,7 @@ class UnfilledRequiredBehaviorPropertyProblem;
 class ProjectBrowser;
 class SerializerElement;
 class ProjectScopedContainers;
+class InitialInstancesContainer;
 struct VariablesRenamingChangesetNode;
 }  // namespace gd
 
@@ -80,13 +81,23 @@ class GD_CORE_API WholeProjectRefactorer {
 
   /**
    * \brief Refactor the project according to the changes (renaming or deletion)
-   * made to variables.
+   * made to global or scene variables.
    */
   static void ApplyRefactoringForVariablesContainer(
       gd::Project &project, gd::VariablesContainer &variablesContainer,
       const gd::VariablesChangeset &changeset,
       const gd::SerializerElement &originalSerializedVariables);
 
+  /**
+   * \brief Refactor the project according to the changes (renaming or deletion)
+   * made to object variables.
+   */
+  static void ApplyRefactoringForObjectVariablesContainer(
+      gd::Project &project, gd::VariablesContainer &objectVariablesContainer,
+      gd::InitialInstancesContainer &initialInstancesContainer,
+      const gd::String &objectName, const gd::VariablesChangeset &changeset,
+      const gd::SerializerElement &originalSerializedVariables);
+
   /**
    * \brief Refactor the project according to the changes (renaming or deletion)
    * made to variables of a group.
@@ -94,6 +105,7 @@ class GD_CORE_API WholeProjectRefactorer {
   static void ApplyRefactoringForGroupVariablesContainer(
       gd::Project &project, gd::ObjectsContainer &globalObjectsContainer,
       gd::ObjectsContainer &objectsContainer,
+      gd::InitialInstancesContainer &initialInstancesContainer,
       const gd::VariablesContainer &groupVariablesContainer,
       const gd::ObjectGroup &objectGroup,
       const gd::VariablesChangeset &changeset,
@@ -692,6 +704,16 @@ class GD_CORE_API WholeProjectRefactorer {
   static size_t GetLayoutAndExternalLayoutLayerInstancesCount(
       gd::Project &project, gd::Layout &layout, const gd::String &layerName);
 
+  /**
+   * This ensures that the scenes had an instance of shared data for
+   * every behavior of every object that can be used on the scene
+   * (i.e. the objects of the scene and the global objects)
+   *
+   * Must be called when a behavior have been added/deleted
+   * from a global object or an object has been made global.
+   */
+  static void UpdateBehaviorsSharedData(gd::Project &project);
+
   virtual ~WholeProjectRefactorer(){};
 
  private:

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -19,6 +19,7 @@ using namespace gd;
 
 void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
   project = objectConfiguration.project;
+  variantName = objectConfiguration.variantName;
   objectContent = objectConfiguration.objectContent;
   animations = objectConfiguration.animations;
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
@@ -165,6 +166,7 @@ void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const
     animations.SerializeTo(animatableElement);
   }
 
+  element.SetAttribute("variant", variantName);
   if (IsOverridingEventsBasedObjectChildrenConfiguration()) {
     auto &childrenContentElement = element.AddChild("childrenContent");
     for (auto &pair : childObjectConfigurations) {
@@ -184,6 +186,7 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
     animations.UnserializeFrom(animatableElement);
   }
 
+  variantName = element.GetStringAttribute("variant");
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
       element.HasChild("childrenContent");
   if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
@@ -247,9 +250,26 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
   }
   const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
 
-  for (auto& childObject : eventsBasedObject.GetObjects().GetObjects()) {
-    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-    configuration.ExposeResources(worker);
+  if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
+    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
+      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
+      configuration.ExposeResources(worker);
+    }
+  } else {
+    if (variantName.empty() ||
+        !eventsBasedObject.GetVariants().HasVariantNamed(variantName)) {
+      for (auto &childObject :
+           eventsBasedObject.GetDefaultVariant().GetObjects().GetObjects()) {
+        childObject->GetConfiguration().ExposeResources(worker);
+      }
+    } else {
+      for (auto &childObject : eventsBasedObject.GetVariants()
+                                   .GetVariant(variantName)
+                                   .GetObjects()
+                                   .GetObjects()) {
+        childObject->GetConfiguration().ExposeResources(worker);
+      }
+    }
   }
 }
 

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -29,9 +29,9 @@ namespace gd {
  * "resource".
  */
 class CustomObjectConfiguration : public gd::ObjectConfiguration {
- public:
-  CustomObjectConfiguration(const Project& project_, const String& type_)
-      : project(&project_), isMarkedAsOverridingEventsBasedObjectChildrenConfiguration(false) {
+public:
+  CustomObjectConfiguration(const Project &project_, const String &type_)
+      : project(&project_) {
     SetType(type_);
   }
   std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
@@ -66,6 +66,18 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
 
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
+  /**
+   * \brief Get the name of the events-based object variant used by this custom object.
+   */
+  const gd::String &GetVariantName() const { return variantName; };
+
+  /**
+   * \brief Set the name of the events-based object variant used by this custom object.
+   */
+  void SetVariantName(const gd::String &variantName_) {
+    variantName = variantName_;
+  }
+
   bool IsForcedToOverrideEventsBasedObjectChildrenConfiguration() const;
 
   bool IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() const {
@@ -145,6 +157,7 @@ protected:
   gd::SerializerElement objectContent;
   std::unordered_set<gd::String> unfoldedChildren;
 
+  gd::String variantName = "";
   bool isMarkedAsOverridingEventsBasedObjectChildrenConfiguration = false;
   mutable std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;
 

Core/GDCore/Project/EventsBasedObject.cpp

@@ -17,19 +17,13 @@ EventsBasedObject::EventsBasedObject()
     isAnimatable(false),
     isTextContainer(false),
     isInnerAreaFollowingParentSize(false),
-    isUsingLegacyInstancesRenderer(false),
-    areaMinX(0),
-    areaMinY(0),
-    areaMinZ(0),
-    areaMaxX(64),
-    areaMaxY(64),
-    areaMaxZ(64),
-    objectsContainer(gd::ObjectsContainer::SourceType::Object) {
+    isUsingLegacyInstancesRenderer(false) {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
 
-void EventsBasedObject::SerializeTo(SerializerElement& element) const {
+
+void EventsBasedObject::SerializeToExternal(SerializerElement& element) const {
   element.SetAttribute("defaultName", defaultName);
   if (isRenderedIn3D) {
     element.SetBoolAttribute("is3D", true);
@@ -44,20 +38,16 @@ void EventsBasedObject::SerializeTo(SerializerElement& element) const {
     element.SetBoolAttribute("isInnerAreaFollowingParentSize", true);
   }
   element.SetBoolAttribute("isUsingLegacyInstancesRenderer", isUsingLegacyInstancesRenderer);
-  element.SetIntAttribute("areaMinX", areaMinX);
-  element.SetIntAttribute("areaMinY", areaMinY);
-  element.SetIntAttribute("areaMinZ", areaMinZ);
-  element.SetIntAttribute("areaMaxX", areaMaxX);
-  element.SetIntAttribute("areaMaxY", areaMaxY);
-  element.SetIntAttribute("areaMaxZ", areaMaxZ);
 
+  // The EventsBasedObjectVariant SerializeTo method override the name.
+  // AbstractEventsBasedEntity::SerializeTo must be done after.
+  defaultVariant.SerializeTo(element);
   AbstractEventsBasedEntity::SerializeTo(element);
-  objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
-  objectsContainer.SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
-  objectsContainer.GetObjectGroups().SerializeTo(element.AddChild("objectsGroups"));
+}
 
-  layers.SerializeLayersTo(element.AddChild("layers"));
-  initialInstances.SerializeTo(element.AddChild("instances"));
+void EventsBasedObject::SerializeTo(SerializerElement& element) const {
+  SerializeToExternal(element);
+  variants.SerializeVariantsTo(element.AddChild("variants"));
 }
 
 void EventsBasedObject::UnserializeFrom(gd::Project& project,
@@ -68,36 +58,22 @@ void EventsBasedObject::UnserializeFrom(gd::Project& project,
   isTextContainer = element.GetBoolAttribute("isTextContainer", false);
   isInnerAreaFollowingParentSize =
       element.GetBoolAttribute("isInnerAreaFollowingParentSize", false);
-  areaMinX = element.GetIntAttribute("areaMinX", 0);
-  areaMinY = element.GetIntAttribute("areaMinY", 0);
-  areaMinZ = element.GetIntAttribute("areaMinZ", 0);
-  areaMaxX = element.GetIntAttribute("areaMaxX", 64);
-  areaMaxY = element.GetIntAttribute("areaMaxY", 64);
-  areaMaxZ = element.GetIntAttribute("areaMaxZ", 64);
 
+  defaultVariant.UnserializeFrom(project, element);
+  defaultVariant.SetName("");
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
-  objectsContainer.UnserializeObjectsFrom(project, element.GetChild("objects"));
-  if (element.HasChild("objectsFolderStructure")) {
-    objectsContainer.UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
-  }
-  objectsContainer.AddMissingObjectsInRootFolder();
-  objectsContainer.GetObjectGroups().UnserializeFrom(
-      element.GetChild("objectsGroups"));
 
-  if (element.HasChild("layers")) {
-    layers.UnserializeLayersFrom(element.GetChild("layers"));
-  } else {
-    layers.Reset();
+  if (element.HasChild("variants")) {
+    variants.UnserializeVariantsFrom(project, element.GetChild("variants"));
   }
 
-  initialInstances.UnserializeFrom(element.GetChild("instances"));
   if (element.HasChild("isUsingLegacyInstancesRenderer")) {
     isUsingLegacyInstancesRenderer =
         element.GetBoolAttribute("isUsingLegacyInstancesRenderer", false);
   }
   else {
     // Compatibility with GD <= 5.4.212
-    isUsingLegacyInstancesRenderer = initialInstances.GetInstancesCount() == 0;
+    isUsingLegacyInstancesRenderer = GetInitialInstances().GetInstancesCount() == 0;
     // end of compatibility code
   }
 }

Core/GDCore/Project/EventsBasedObject.h

@@ -7,6 +7,8 @@
 
 #include <vector>
 #include "GDCore/Project/AbstractEventsBasedEntity.h"
+#include "GDCore/Project/EventsBasedObjectVariant.h"
+#include "GDCore/Project/EventsBasedObjectVariantsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Project/LayersContainer.h"
@@ -162,18 +164,38 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    */
   bool IsTextContainer() const { return isTextContainer; }
 
+  /**
+   * \brief Get the default variant of the custom object.
+   */
+  const gd::EventsBasedObjectVariant& GetDefaultVariant() const { return defaultVariant; }
+
+  /**
+   * \brief Get the default variant of the custom object.
+   */
+  gd::EventsBasedObjectVariant& GetDefaultVariant() { return defaultVariant; }
+
+  /**
+   * \brief Get the variants of the custom object.
+   */
+  const gd::EventsBasedObjectVariantsContainer& GetVariants() const { return variants; }
+
+  /**
+   * \brief Get the variants of the custom object.
+   */
+  gd::EventsBasedObjectVariantsContainer& GetVariants() { return variants; }
+
   /** \name Layers
    */
   ///@{
   /**
    * \brief Get the layers of the custom object.
    */
-  const gd::LayersContainer& GetLayers() const { return layers; }
+  const gd::LayersContainer& GetLayers() const { return defaultVariant.GetLayers(); }
 
   /**
    * \brief Get the layers of the custom object.
    */
-  gd::LayersContainer& GetLayers() { return layers; }
+  gd::LayersContainer& GetLayers() { return defaultVariant.GetLayers(); }
   ///@}
 
   /** \name Child objects
@@ -183,14 +205,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \brief Get the objects of the custom object.
    */
   gd::ObjectsContainer& GetObjects() {
-    return objectsContainer;
+    return defaultVariant.GetObjects();
   }
 
   /**
    * \brief Get the objects of the custom object.
    */
   const gd::ObjectsContainer& GetObjects() const {
-    return objectsContainer;
+    return defaultVariant.GetObjects();
   }
   ///@}
 
@@ -201,14 +223,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \brief Get the instances of the custom object.
    */
   gd::InitialInstancesContainer& GetInitialInstances() {
-    return initialInstances;
+    return defaultVariant.GetInitialInstances();
   }
 
   /**
    * \brief Get the instances of the custom object.
    */
   const gd::InitialInstancesContainer& GetInitialInstances() const {
-    return initialInstances;
+    return defaultVariant.GetInitialInstances();
   }
 
   /**
@@ -219,14 +241,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinX() const {
-    return areaMinX;
+    return defaultVariant.GetAreaMinX();
   }
 
   /**
    * \brief Set the left bound of the custom object.
    */
-  void SetAreaMinX(int areaMinX_) {
-    areaMinX = areaMinX_;
+  void SetAreaMinX(int areaMinX) {
+    defaultVariant.SetAreaMinX(areaMinX);
   }
 
   /**
@@ -237,14 +259,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinY() const {
-    return areaMinY;
+    return defaultVariant.GetAreaMinY();
   }
 
   /**
    * \brief Set the top bound of the custom object.
    */
-  void SetAreaMinY(int areaMinY_) {
-    areaMinY = areaMinY_;
+  void SetAreaMinY(int areaMinY) {
+    defaultVariant.SetAreaMinY(areaMinY);
   }
 
   /**
@@ -255,14 +277,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinZ() const {
-    return areaMinZ;
+    return defaultVariant.GetAreaMinZ();
   }
 
   /**
    * \brief Set the min Z bound of the custom object.
    */
-  void SetAreaMinZ(int areaMinZ_) {
-    areaMinZ = areaMinZ_;
+  void SetAreaMinZ(int areaMinZ) {
+    defaultVariant.SetAreaMinZ(areaMinZ);
   }
 
   /**
@@ -273,14 +295,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxX() const {
-    return areaMaxX;
+    return defaultVariant.GetAreaMaxX();
   }
 
   /**
    * \brief Set the right bound of the custom object.
    */
-  void SetAreaMaxX(int areaMaxX_) {
-    areaMaxX = areaMaxX_;
+  void SetAreaMaxX(int areaMaxX) {
+    defaultVariant.SetAreaMaxX(areaMaxX);
   }
 
   /**
@@ -291,14 +313,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxY() const {
-    return areaMaxY;
+    return defaultVariant.GetAreaMaxY();
   }
 
   /**
    * \brief Set the bottom bound of the custom object.
    */
-  void SetAreaMaxY(int areaMaxY_) {
-    areaMaxY = areaMaxY_;
+  void SetAreaMaxY(int areaMaxY) {
+    defaultVariant.SetAreaMaxY(areaMaxY);
   }
 
   /**
@@ -309,16 +331,22 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxZ() const {
-    return areaMaxZ;
+    return defaultVariant.GetAreaMaxZ();
   }
 
   /**
    * \brief Set the bottom bound of the custom object.
    */
-  void SetAreaMaxZ(int areaMaxZ_) {
-    areaMaxZ = areaMaxZ_;
+  void SetAreaMaxZ(int areaMaxZ) {
+    defaultVariant.SetAreaMaxZ(areaMaxZ);
   }
   ///@}
+  
+  /**
+   * @brief Serialize the events-based object for an extension in an external file.
+   * Variants are not serialized.
+   */
+  void SerializeToExternal(SerializerElement& element) const;
 
   void SerializeTo(SerializerElement& element) const override;
 
@@ -332,15 +360,8 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   bool isTextContainer;
   bool isInnerAreaFollowingParentSize;
   bool isUsingLegacyInstancesRenderer;
-  gd::InitialInstancesContainer initialInstances;
-  gd::LayersContainer layers;
-  gd::ObjectsContainer objectsContainer;
-  double areaMinX;
-  double areaMinY;
-  double areaMinZ;
-  double areaMaxX;
-  double areaMaxY;
-  double areaMaxZ;
+  gd::EventsBasedObjectVariant defaultVariant;
+  gd::EventsBasedObjectVariantsContainer variants;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObjectVariant.cpp

@@ -0,0 +1,71 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EventsBasedObjectVariant.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+EventsBasedObjectVariant::EventsBasedObjectVariant()
+    : areaMinX(0), areaMinY(0), areaMinZ(0), areaMaxX(64), areaMaxY(64),
+      areaMaxZ(64), objectsContainer(gd::ObjectsContainer::SourceType::Object) {
+}
+
+EventsBasedObjectVariant::~EventsBasedObjectVariant() {}
+
+void EventsBasedObjectVariant::SerializeTo(SerializerElement &element) const {
+  element.SetAttribute("name", name);
+  if (!GetAssetStoreAssetId().empty() && !GetAssetStoreOriginalName().empty()) {
+    element.SetAttribute("assetStoreAssetId", GetAssetStoreAssetId());
+    element.SetAttribute("assetStoreOriginalName", GetAssetStoreOriginalName());
+  }
+  element.SetIntAttribute("areaMinX", areaMinX);
+  element.SetIntAttribute("areaMinY", areaMinY);
+  element.SetIntAttribute("areaMinZ", areaMinZ);
+  element.SetIntAttribute("areaMaxX", areaMaxX);
+  element.SetIntAttribute("areaMaxY", areaMaxY);
+  element.SetIntAttribute("areaMaxZ", areaMaxZ);
+
+  objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
+  objectsContainer.SerializeFoldersTo(
+      element.AddChild("objectsFolderStructure"));
+  objectsContainer.GetObjectGroups().SerializeTo(
+      element.AddChild("objectsGroups"));
+
+  layers.SerializeLayersTo(element.AddChild("layers"));
+  initialInstances.SerializeTo(element.AddChild("instances"));
+}
+
+void EventsBasedObjectVariant::UnserializeFrom(
+    gd::Project &project, const SerializerElement &element) {
+  name = element.GetStringAttribute("name");
+  assetStoreAssetId = element.GetStringAttribute("assetStoreAssetId");
+  assetStoreOriginalName = element.GetStringAttribute("assetStoreOriginalName");
+  areaMinX = element.GetIntAttribute("areaMinX", 0);
+  areaMinY = element.GetIntAttribute("areaMinY", 0);
+  areaMinZ = element.GetIntAttribute("areaMinZ", 0);
+  areaMaxX = element.GetIntAttribute("areaMaxX", 64);
+  areaMaxY = element.GetIntAttribute("areaMaxY", 64);
+  areaMaxZ = element.GetIntAttribute("areaMaxZ", 64);
+
+  objectsContainer.UnserializeObjectsFrom(project, element.GetChild("objects"));
+  if (element.HasChild("objectsFolderStructure")) {
+    objectsContainer.UnserializeFoldersFrom(
+        project, element.GetChild("objectsFolderStructure", 0));
+  }
+  objectsContainer.AddMissingObjectsInRootFolder();
+  objectsContainer.GetObjectGroups().UnserializeFrom(
+      element.GetChild("objectsGroups"));
+
+  if (element.HasChild("layers")) {
+    layers.UnserializeLayersFrom(element.GetChild("layers"));
+  } else {
+    layers.Reset();
+  }
+  initialInstances.UnserializeFrom(element.GetChild("instances"));
+}
+
+} // namespace gd

Core/GDCore/Project/EventsBasedObjectVariant.h

@@ -0,0 +1,229 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2025 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/Project/InitialInstancesContainer.h"
+#include "GDCore/Project/LayersContainer.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/String.h"
+#include <vector>
+
+namespace gd {
+class SerializerElement;
+class Project;
+} // namespace gd
+
+namespace gd {
+/**
+ * \brief Represents a variation of style of an events-based object.
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API EventsBasedObjectVariant {
+public:
+  EventsBasedObjectVariant();
+  virtual ~EventsBasedObjectVariant();
+
+  /**
+   * \brief Return a pointer to a new EventsBasedObjectVariant constructed from
+   * this one.
+   */
+  EventsBasedObjectVariant *Clone() const {
+    return new EventsBasedObjectVariant(*this);
+  };
+
+  /**
+   * \brief Get the name of the variant.
+   */
+  const gd::String &GetName() const { return name; };
+
+  /**
+   * \brief Set the name of the variant.
+   */
+  EventsBasedObjectVariant &SetName(const gd::String &name_) {
+    name = name_;
+    return *this;
+  }
+
+  /** \name Layers
+   */
+  ///@{
+  /**
+   * \brief Get the layers of the variant.
+   */
+  const gd::LayersContainer &GetLayers() const { return layers; }
+
+  /**
+   * \brief Get the layers of the variant.
+   */
+  gd::LayersContainer &GetLayers() { return layers; }
+  ///@}
+
+  /** \name Child objects
+   */
+  ///@{
+  /**
+   * \brief Get the objects of the variant.
+   */
+  gd::ObjectsContainer &GetObjects() { return objectsContainer; }
+
+  /**
+   * \brief Get the objects of the variant.
+   */
+  const gd::ObjectsContainer &GetObjects() const { return objectsContainer; }
+  ///@}
+
+  /** \name Instances
+   */
+  ///@{
+  /**
+   * \brief Get the instances of the variant.
+   */
+  gd::InitialInstancesContainer &GetInitialInstances() {
+    return initialInstances;
+  }
+
+  /**
+   * \brief Get the instances of the variant.
+   */
+  const gd::InitialInstancesContainer &GetInitialInstances() const {
+    return initialInstances;
+  }
+
+  /**
+   * \brief Get the left bound of the variant.
+   *
+   * This is used only if there is any initial instances.
+   *
+   * \see EventsBasedObjectVariant::GetInitialInstances
+   */
+  int GetAreaMinX() const { return areaMinX; }
+
+  /**
+   * \brief Set the left bound of the variant.
+   */
+  void SetAreaMinX(int areaMinX_) { areaMinX = areaMinX_; }
+
+  /**
+   * \brief Get the top bound of the variant.
+   *
+   * This is used only if there is any initial instances.
+   *
+   * \see EventsBasedObjectVariant::GetInitialInstances
+   */
+  int GetAreaMinY() const { return areaMinY; }
+
+  /**
+   * \brief Set the top bound of the variant.
+   */
+  void SetAreaMinY(int areaMinY_) { areaMinY = areaMinY_; }
+
+  /**
+   * \brief Get the min Z bound of the variant.
+   *
+   * This is used only if there is any initial instances.
+   *
+   * \see EventsBasedObjectVariant::GetInitialInstances
+   */
+  int GetAreaMinZ() const { return areaMinZ; }
+
+  /**
+   * \brief Set the min Z bound of the variant.
+   */
+  void SetAreaMinZ(int areaMinZ_) { areaMinZ = areaMinZ_; }
+
+  /**
+   * \brief Get the right bound of the variant.
+   *
+   * This is used only if there is any initial instances.
+   *
+   * \see EventsBasedObjectVariant::GetInitialInstances
+   */
+  int GetAreaMaxX() const { return areaMaxX; }
+
+  /**
+   * \brief Set the right bound of the variant.
+   */
+  void SetAreaMaxX(int areaMaxX_) { areaMaxX = areaMaxX_; }
+
+  /**
+   * \brief Get the bottom bound of the variant.
+   *
+   * This is used only if there is any initial instances.
+   *
+   * \see EventsBasedObjectVariant::GetInitialInstances
+   */
+  int GetAreaMaxY() const { return areaMaxY; }
+
+  /**
+   * \brief Set the bottom bound of the variant.
+   */
+  void SetAreaMaxY(int areaMaxY_) { areaMaxY = areaMaxY_; }
+
+  /**
+   * \brief Get the max Z bound of the variant.
+   *
+   * This is used only if there is any initial instances.
+   *
+   * \see EventsBasedObjectVariant::GetInitialInstances
+   */
+  int GetAreaMaxZ() const { return areaMaxZ; }
+
+  /**
+   * \brief Set the bottom bound of the variant.
+   */
+  void SetAreaMaxZ(int areaMaxZ_) { areaMaxZ = areaMaxZ_; }
+  ///@}
+
+  /** \brief Change the object asset store id of this variant.
+   */
+  void SetAssetStoreAssetId(const gd::String &assetStoreId_) {
+    assetStoreAssetId = assetStoreId_;
+  };
+
+  /** \brief Return the object asset store id of this variant.
+   */
+  const gd::String &GetAssetStoreAssetId() const { return assetStoreAssetId; };
+
+  /** \brief Change the original name of the variant in the asset.
+   */
+  void SetAssetStoreOriginalName(const gd::String &assetStoreOriginalName_) {
+    assetStoreOriginalName = assetStoreOriginalName_;
+  };
+
+  /** \brief Return the original name of the variant in the asset.
+   */
+  const gd::String &GetAssetStoreOriginalName() const {
+    return assetStoreOriginalName;
+  };
+
+  void SerializeTo(SerializerElement &element) const;
+
+  void UnserializeFrom(gd::Project &project, const SerializerElement &element);
+
+private:
+  gd::String name;
+  gd::InitialInstancesContainer initialInstances;
+  gd::LayersContainer layers;
+  gd::ObjectsContainer objectsContainer;
+  double areaMinX;
+  double areaMinY;
+  double areaMinZ;
+  double areaMaxX;
+  double areaMaxY;
+  double areaMaxZ;
+  /**
+   * The ID of the asset if the object comes from the store.
+   */
+  gd::String assetStoreAssetId;
+  /**
+   * The original name of the variant in the asset if the object comes from the
+   * store.
+   */
+  gd::String assetStoreOriginalName;
+};
+
+} // namespace gd

Core/GDCore/Project/EventsBasedObjectVariantsContainer.h

@@ -0,0 +1,160 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include <vector>
+#include "GDCore/Project/EventsBasedObjectVariant.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/SerializableWithNameList.h"
+
+namespace gd {
+class SerializerElement;
+}
+
+namespace gd {
+
+/**
+ * \brief Used as a base class for classes that will own events-backed
+ * variants.
+ *
+ * \see gd::EventsBasedObjectVariantContainer
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API EventsBasedObjectVariantsContainer
+    : private SerializableWithNameList<gd::EventsBasedObjectVariant> {
+public:
+  EventsBasedObjectVariantsContainer() {}
+
+  EventsBasedObjectVariantsContainer(const EventsBasedObjectVariantsContainer &other) {
+    Init(other);
+  }
+
+  EventsBasedObjectVariantsContainer &operator=(const EventsBasedObjectVariantsContainer &other) {
+    if (this != &other) {
+      Init(other);
+    }
+    return *this;
+  }
+
+  /** \name Events Functions management
+   */
+  ///@{
+  /**
+   * \brief Check if the variant with the specified name exists.
+   */
+  bool HasVariantNamed(const gd::String& name) const {
+    return Has(name);
+  }
+
+  /**
+   * \brief Get the variant with the specified name.
+   *
+   * \warning Trying to access to a not existing variant will result in
+   * undefined behavior.
+   */
+  gd::EventsBasedObjectVariant& GetVariant(const gd::String& name) {
+    return Get(name);
+  }
+
+  /**
+   * \brief Get the variant with the specified name.
+   *
+   * \warning Trying to access to a not existing variant will result in
+   * undefined behavior.
+   */
+  const gd::EventsBasedObjectVariant& GetVariant(const gd::String& name) const {
+    return Get(name);
+  }
+
+  /**
+   * \brief Get the variant at the specified index in the list.
+   *
+   * \warning Trying to access to a not existing variant will result in
+   * undefined behavior.
+   */
+  gd::EventsBasedObjectVariant& GetVariant(std::size_t index) {
+    return Get(index);
+  }
+
+  /**
+   * \brief Get the variant at the specified index in the list.
+   *
+   * \warning Trying to access to a not existing variant will result in
+   * undefined behavior.
+   */
+  const gd::EventsBasedObjectVariant& GetVariant(std::size_t index) const {
+    return Get(index);
+  }
+
+  /**
+   * \brief Return the number of variants.
+   */
+  std::size_t GetVariantsCount() const { return GetCount(); }
+
+  gd::EventsBasedObjectVariant& InsertNewVariant(const gd::String& name,
+                                              std::size_t position) {
+    return InsertNew(name, position);
+  }
+  gd::EventsBasedObjectVariant& InsertVariant(const gd::EventsBasedObjectVariant& object,
+                                           std::size_t position) {
+    return Insert(object, position);
+  }
+  void RemoveVariant(const gd::String& name) { return Remove(name); }
+  void ClearVariants() { return Clear(); }
+  void MoveVariant(std::size_t oldIndex, std::size_t newIndex) {
+    return Move(oldIndex, newIndex);
+  };
+  std::size_t GetVariantPosition(const gd::EventsBasedObjectVariant& eventsFunction) {
+    return GetPosition(eventsFunction);
+  };
+
+  /**
+   * \brief Provide a raw access to the vector containing the variants.
+   */
+  const std::vector<std::unique_ptr<gd::EventsBasedObjectVariant>>& GetInternalVector()
+      const {
+    return elements;
+  };
+
+  /**
+   * \brief Provide a raw access to the vector containing the variants.
+   */
+  std::vector<std::unique_ptr<gd::EventsBasedObjectVariant>>& GetInternalVector() {
+    return elements;
+  };
+  ///@}
+
+  /** \name Serialization
+   */
+  ///@{
+  /**
+   * \brief Serialize events variants.
+   */
+  void SerializeVariantsTo(SerializerElement& element) const {
+    return SerializeElementsTo("variant", element);
+  };
+
+  /**
+   * \brief Unserialize the events variants.
+   */
+  void UnserializeVariantsFrom(gd::Project& project,
+                                      const SerializerElement& element) {
+    return UnserializeElementsFrom("variant", project, element);
+  };
+  ///@}
+ protected:
+  /**
+   * Initialize object using another object. Used by copy-ctor and assign-op.
+   * Don't forget to update me if members were changed!
+   */
+  void Init(const gd::EventsBasedObjectVariantsContainer& other) {
+    return SerializableWithNameList<gd::EventsBasedObjectVariant>::Init(other);
+  };
+
+private:
+};
+
+}  // namespace gd

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -47,6 +47,7 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
   previewIconUrl = other.previewIconUrl;
   iconUrl = other.iconUrl;
   helpPath = other.helpPath;
+  gdevelopVersion = other.gdevelopVersion;
   eventsFunctionsContainer = other.eventsFunctionsContainer;
   eventsBasedBehaviors = other.eventsBasedBehaviors;
   eventsBasedObjects = other.eventsBasedObjects;
@@ -54,7 +55,7 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
   sceneVariables = other.GetSceneVariables();
 }
 
-void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
+void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isExternal) const {
   element.SetAttribute("version", version);
   element.SetAttribute("extensionNamespace", extensionNamespace);
   element.SetAttribute("shortDescription", shortDescription);
@@ -81,6 +82,10 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("previewIconUrl", previewIconUrl);
   element.SetAttribute("iconUrl", iconUrl);
   element.SetAttribute("helpPath", helpPath);
+  element.SetAttribute("gdevelopVersion", gdevelopVersion);
+  if (changelog.GetChangesCount() > 0) {
+    changelog.SerializeTo(element.AddChild("changelog"));
+  }
   auto& dependenciesElement = element.AddChild("dependencies");
   dependenciesElement.ConsiderAsArray();
   for (auto& dependency : dependencies)
@@ -100,8 +105,18 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
       element.AddChild("eventsFunctions"));
   eventsBasedBehaviors.SerializeElementsTo(
       "eventsBasedBehavior", element.AddChild("eventsBasedBehaviors"));
-  eventsBasedObjects.SerializeElementsTo(
-      "eventsBasedObject", element.AddChild("eventsBasedObjects"));
+  if (isExternal) {
+    auto &eventsBasedObjectElement = element.AddChild("eventsBasedObjects");
+    eventsBasedObjectElement.ConsiderAsArrayOf("eventsBasedObject");
+    for (const auto &eventsBasedObject :
+         eventsBasedObjects.GetInternalVector()) {
+      eventsBasedObject->SerializeToExternal(
+          eventsBasedObjectElement.AddChild("eventsBasedObject"));
+    }
+  } else {
+    eventsBasedObjects.SerializeElementsTo(
+        "eventsBasedObject", element.AddChild("eventsBasedObjects"));
+  }
 }
 
 void EventsFunctionsExtension::UnserializeFrom(
@@ -126,6 +141,10 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
   previewIconUrl = element.GetStringAttribute("previewIconUrl");
   iconUrl = element.GetStringAttribute("iconUrl");
   helpPath = element.GetStringAttribute("helpPath");
+  gdevelopVersion = element.GetStringAttribute("gdevelopVersion");
+  if (element.HasChild("changelog")) {
+    changelog.UnserializeFrom(element.GetChild("changelog"));
+  }
 
   if (element.HasChild("origin")) {
     gd::String originName =

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -12,9 +12,11 @@
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
+#include "GDCore/Project/EventsFunctionsExtensionChangelog.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/SerializableWithNameList.h"
+
 namespace gd {
 class SerializerElement;
 class Project;
@@ -134,6 +136,19 @@ class GD_CORE_API EventsFunctionsExtension {
     return *this;
   }
 
+  /**
+   * \brief Get the GDevelop version required by this extension.
+   */
+  const gd::String& GetGDevelopVersion() const { return gdevelopVersion; };
+
+  /**
+   * \brief Set the GDevelop version required by this extension.
+   */
+  EventsFunctionsExtension& SetGDevelopVersion(const gd::String& gdevelopVersion_) {
+    gdevelopVersion = gdevelopVersion_;
+    return *this;
+  }
+
   /**
    * \brief Return a reference to the list of the events based behaviors.
    */
@@ -273,7 +288,14 @@ class GD_CORE_API EventsFunctionsExtension {
   /**
    * \brief Serialize the EventsFunctionsExtension to the specified element
    */
-  void SerializeTo(gd::SerializerElement& element) const;
+  void SerializeTo(gd::SerializerElement& element, bool isExternal = false) const;
+
+  /**
+   * \brief Serialize the EventsFunctionsExtension to the specified element
+   */
+  void SerializeToExternal(gd::SerializerElement& element) const {
+    SerializeTo(element, true);
+  }
 
   /**
    * \brief Load the EventsFunctionsExtension from the specified element.
@@ -385,6 +407,8 @@ class GD_CORE_API EventsFunctionsExtension {
   gd::String iconUrl;
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation (or an absolute URL).
+  gd::String gdevelopVersion;
+  gd::EventsFunctionsExtensionChangelog changelog;
   gd::SerializableWithNameList<EventsBasedBehavior> eventsBasedBehaviors;
   gd::SerializableWithNameList<EventsBasedObject> eventsBasedObjects;
   std::vector<gd::DependencyMetadata> dependencies;

Core/GDCore/Project/EventsFunctionsExtensionChangelog.h

@@ -0,0 +1,105 @@
+/*
+ * 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 <vector>
+
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+/**
+ * @brief The change of a specific extension version (only the breaking
+ * changes).
+ */
+class GD_CORE_API EventsFunctionsExtensionVersionChange {
+public:
+  EventsFunctionsExtensionVersionChange(){};
+  virtual ~EventsFunctionsExtensionVersionChange(){};
+
+  const gd::String &GetVersion() const { return version; };
+  gd::EventsFunctionsExtensionVersionChange &
+  SetVersion(const gd::String &version_) {
+    version = version_;
+    return *this;
+  }
+
+  const gd::String &GetBreakingChangesDescription() const { return version; };
+  gd::EventsFunctionsExtensionVersionChange &
+  GetBreakingChangesDescription(const gd::String &breakingChangesDescription_) {
+    breakingChangesDescription = breakingChangesDescription_;
+    return *this;
+  }
+
+  /**
+   * \brief Serialize the EventsFunctionsExtensionVersionChange to the specified
+   * element
+   */
+  void SerializeTo(gd::SerializerElement &element) const {
+    element.SetAttribute("version", version);
+    element.AddChild("breaking")
+        .SetMultilineStringValue(breakingChangesDescription);
+  }
+
+  /**
+   * \brief Load the EventsFunctionsExtensionVersionChange from the specified
+   * element.
+   */
+  void UnserializeFrom(const gd::SerializerElement &element) {
+    version = element.GetStringAttribute("version");
+    breakingChangesDescription =
+        element.GetChild("breaking").GetMultilineStringValue();
+  }
+
+private:
+  gd::String version;
+  gd::String breakingChangesDescription;
+};
+
+/**
+ * @brief The changelog of an extension (only the breaking changes).
+ */
+class GD_CORE_API EventsFunctionsExtensionChangelog {
+public:
+  EventsFunctionsExtensionChangelog(){};
+  virtual ~EventsFunctionsExtensionChangelog(){};
+
+  /**
+   * \brief Return the number of variants.
+   */
+  std::size_t GetChangesCount() const { return versionChanges.size(); }
+
+  /**
+   * \brief Serialize the EventsFunctionsExtensionChangelog to the specified
+   * element
+   */
+  void SerializeTo(gd::SerializerElement &element) const {
+    element.ConsiderAsArray();
+    for (const auto &versionChange : versionChanges) {
+      versionChange.SerializeTo(element.AddChild(""));
+    }
+  }
+
+  /**
+   * \brief Load the EventsFunctionsExtensionChangelog from the specified
+   * element.
+   */
+  void UnserializeFrom(const gd::SerializerElement &element) {
+    versionChanges.clear();
+    element.ConsiderAsArray();
+    for (std::size_t i = 0; i < element.GetChildrenCount(); ++i) {
+      gd::EventsFunctionsExtensionVersionChange versionChange;
+      versionChange.UnserializeFrom(element.GetChild(i));
+      versionChanges.push_back(versionChange);
+    }
+  }
+
+private:
+  std::vector<gd::EventsFunctionsExtensionVersionChange> versionChanges;
+};
+
+} // namespace gd

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -41,6 +41,16 @@ void InitialInstancesContainer::IterateOverInstances(
   for (auto& instance : initialInstances) func(instance);
 }
 
+void InitialInstancesContainer::IterateOverInstances(
+  const std::function< bool(gd::InitialInstance &) >& func) {
+  for (auto& instance : initialInstances) {
+    bool shouldStop = func(instance);
+    if (shouldStop) {
+      return;
+    }
+  }
+}
+
 void InitialInstancesContainer::IterateOverInstancesWithZOrdering(
     gd::InitialInstanceFunctor& func, const gd::String& layerName) {
   std::vector<std::reference_wrapper<gd::InitialInstance>> sortedInstances;

Core/GDCore/Project/InitialInstancesContainer.h

@@ -87,6 +87,13 @@ class GD_CORE_API InitialInstancesContainer {
    */
   void IterateOverInstances(InitialInstanceFunctor &func);
 
+  /**
+   * \brief Apply \a func to each instance of the container.
+   * \see InitialInstanceFunctor
+   */
+  void IterateOverInstances(
+    const std::function< bool(gd::InitialInstance &) >& func);
+
   /**
    * Get the instances on the specified layer,
    * sort them regarding their Z order and then apply \a func on them.

Core/GDCore/Project/Object.cpp

@@ -41,6 +41,11 @@ Object::Object(const gd::String& name_,
 }
 
 void Object::Init(const gd::Object& object) {
+  CopyWithoutConfiguration(object);
+  configuration = object.configuration->Clone();
+}
+
+void Object::CopyWithoutConfiguration(const gd::Object& object) {
   persistentUuid = object.persistentUuid;
   name = object.name;
   assetStoreId = object.assetStoreId;
@@ -51,8 +56,6 @@ void Object::Init(const gd::Object& object) {
   for (auto& it : object.behaviors) {
     behaviors[it.first] = gd::make_unique<gd::Behavior>(*it.second);
   }
-
-  configuration = object.configuration->Clone();
 }
 
 gd::ObjectConfiguration& Object::GetConfiguration() { return *configuration; }

Core/GDCore/Project/Object.h

@@ -82,6 +82,8 @@ class GD_CORE_API Object {
     return gd::make_unique<gd::Object>(*this);
   }
 
+  void CopyWithoutConfiguration(const gd::Object& object);
+
   /**
    * \brief Return the object configuration.
    */

Core/GDCore/Project/ObjectTools.cpp

@@ -0,0 +1,57 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2025 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ObjectTools.h"
+
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
+
+namespace gd {
+
+bool ObjectTools::IsBehaviorCompatibleWithObject(
+      const gd::Platform &platform, const gd::String &objectType,
+      const gd::String &behaviorType,
+      std::unordered_set<gd::String> coveredBehaviorType) {
+  bool isBehaviorTypeAlreadyCovered =
+      !coveredBehaviorType.insert(behaviorType).second;
+  if (isBehaviorTypeAlreadyCovered) {
+    return true;
+  }
+  const gd::BehaviorMetadata &behaviorMetadata =
+      MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
+  if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
+    // Should not happen because the behavior was added successfully (so its
+    // metadata are valid) - but double check anyway and bail out if the
+    // behavior metadata are invalid.
+    return false;
+  }
+  if (!behaviorMetadata.GetObjectType().empty() &&
+      behaviorMetadata.GetObjectType() != objectType) {
+    return false;
+  }
+  for (const gd::String &requiredBehaviorType :
+       behaviorMetadata.GetRequiredBehaviorTypes()) {
+    const gd::BehaviorMetadata &requiredBehaviorMetadata =
+        gd::MetadataProvider::GetBehaviorMetadata(platform, requiredBehaviorType);
+    if (requiredBehaviorMetadata.IsHidden()) {
+      const gd::ObjectMetadata &objectMetadata =
+          gd::MetadataProvider::GetObjectMetadata(platform, objectType);
+      if (objectMetadata.GetDefaultBehaviors().find(requiredBehaviorType) ==
+          objectMetadata.GetDefaultBehaviors().end()) {
+        // A capability is missing in the object.
+        return false;
+      }
+    }
+    if (!gd::ObjectTools::IsBehaviorCompatibleWithObject(
+            platform, objectType, requiredBehaviorType, coveredBehaviorType)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+} // namespace gd

Core/GDCore/Project/ObjectTools.h

@@ -0,0 +1,35 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2025 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/String.h"
+#include <unordered_set>
+
+namespace gd {
+class Platform;
+class Object;
+} // namespace gd
+
+namespace gd {
+
+class GD_CORE_API ObjectTools {
+public:
+  static bool IsBehaviorCompatibleWithObject(const gd::Platform &platform,
+                                             const gd::String &objectType,
+                                             const gd::String &behaviorType) {
+    std::unordered_set<gd::String> coveredBehaviorType;
+    return IsBehaviorCompatibleWithObject(platform, objectType, behaviorType,
+                                   coveredBehaviorType);
+  }
+
+private:
+  static bool IsBehaviorCompatibleWithObject(
+      const gd::Platform &platform, const gd::String &objectType,
+      const gd::String &behaviorType,
+      std::unordered_set<gd::String> coveredBehaviorType);
+};
+
+} // namespace gd

Core/GDCore/Project/ObjectsContainersList.h

@@ -81,6 +81,11 @@ class GD_CORE_API ObjectsContainersList {
   /**
    * \brief Return the container of the variables for the specified object or
    * group of objects.
+   *
+   * \warning In most cases, prefer to use other methods to access variables or use
+   * ObjectVariableHelper::MergeVariableContainers if you know you're dealing with a group.
+   * This is because the variables container of an object group does not exist and the one from
+   * first object of the group will be returned.
    */
   const gd::VariablesContainer* GetObjectOrGroupVariablesContainer(
       const gd::String& objectOrGroupName) const;

Core/GDCore/Project/Project.cpp

@@ -920,6 +920,7 @@ void Project::UnserializeAndInsertExtensionsFrom(
       "eventsFunctionsExtension");
 
   std::map<gd::String, size_t> extensionNameToElementIndex;
+  std::map<gd::String, gd::SerializerElement> objectTypeToVariantsElement;
 
   // First, only unserialize behaviors and objects names.
   // As event based objects can contains custom behaviors and custom objects,
@@ -938,6 +939,16 @@ void Project::UnserializeAndInsertExtensionsFrom(
             ? GetEventsFunctionsExtension(name)
             : InsertNewEventsFunctionsExtension(
                   name, GetEventsFunctionsExtensionsCount());
+
+    // Backup the events-based object variants
+    for (auto &eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      gd::SerializerElement variantsElement;
+      eventsBasedObject->GetVariants().SerializeVariantsTo(variantsElement);
+      objectTypeToVariantsElement[gd::PlatformExtension::GetObjectFullType(
+          name, eventsBasedObject->GetName())] = variantsElement;
+    }
+
     eventsFunctionsExtension.UnserializeExtensionDeclarationFrom(
         *this, eventsFunctionsExtensionElement);
   }
@@ -966,6 +977,15 @@ void Project::UnserializeAndInsertExtensionsFrom(
     partiallyLoadedExtension
         ->UnserializeExtensionImplementationFrom(
             *this, eventsFunctionsExtensionElement);
+
+    for (auto &pair : objectTypeToVariantsElement) {
+      auto &objectType = pair.first;
+      auto &variantsElement = pair.second;
+
+      auto &eventsBasedObject = GetEventsBasedObject(objectType);
+      eventsBasedObject.GetVariants().UnserializeVariantsFrom(*this,
+                                                              variantsElement);
+    }
   }
 }
 

Core/GDCore/Project/PropertyDescriptor.cpp

@@ -21,14 +21,19 @@ void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
     element.AddChild("unit").SetStringValue(measurementUnit.GetName());
   }
   element.AddChild("label").SetStringValue(label);
-  element.AddChild("description").SetStringValue(description);
-  element.AddChild("group").SetStringValue(group);
-  SerializerElement& extraInformationElement =
-      element.AddChild("extraInformation");
-  extraInformationElement.ConsiderAsArray();
-  for (const gd::String& information : extraInformation) {
-    extraInformationElement.AddChild("").SetStringValue(information);
+  if (!description.empty())
+    element.AddChild("description").SetStringValue(description);
+  if (!group.empty()) element.AddChild("group").SetStringValue(group);
+
+  if (!extraInformation.empty()) {
+    SerializerElement& extraInformationElement =
+        element.AddChild("extraInformation");
+    extraInformationElement.ConsiderAsArray();
+    for (const gd::String& information : extraInformation) {
+      extraInformationElement.AddChild("").SetStringValue(information);
+    }
   }
+
   if (hidden) {
     element.AddChild("hidden").SetBoolValue(hidden);
   }
@@ -59,16 +64,21 @@ void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
             : gd::MeasurementUnit::GetUndefined();
   }
   label = element.GetChild("label").GetStringValue();
-  description = element.GetChild("description").GetStringValue();
-  group = element.GetChild("group").GetStringValue();
+  description = element.HasChild("description")
+                    ? element.GetChild("description").GetStringValue()
+                    : "";
+  group = element.HasChild("group") ? element.GetChild("group").GetStringValue()
+                                    : "";
 
   extraInformation.clear();
-  const SerializerElement& extraInformationElement =
-      element.GetChild("extraInformation");
-  extraInformationElement.ConsiderAsArray();
-  for (std::size_t i = 0; i < extraInformationElement.GetChildrenCount(); ++i)
-    extraInformation.push_back(
-        extraInformationElement.GetChild(i).GetStringValue());
+  if (element.HasChild("extraInformation")) {
+    const SerializerElement& extraInformationElement =
+        element.GetChild("extraInformation");
+    extraInformationElement.ConsiderAsArray();
+    for (std::size_t i = 0; i < extraInformationElement.GetChildrenCount(); ++i)
+      extraInformation.push_back(
+          extraInformationElement.GetChild(i).GetStringValue());
+  }
 
   hidden = element.HasChild("hidden")
                ? element.GetChild("hidden").GetBoolValue()

Core/GDCore/Tools/Localization.cpp

@@ -6,6 +6,7 @@
 
 #if defined(EMSCRIPTEN)
 #include <emscripten.h>
+
 #include "GDCore/String.h"
 
 namespace gd {
@@ -31,5 +32,10 @@ gd::String GetTranslation(const char* str) {  // TODO: Inline?
       str);
   return gd::String(translatedStr);  // TODO: Is copying necessary?
 }
+
+gd::String GetTranslation(const gd::String& str) {
+  return GetTranslation(str.c_str());
+}
+
 }  // namespace gd
 #endif

Core/GDCore/Tools/Localization.h

@@ -8,10 +8,10 @@
 
 /** @file
  * Provide a way to mark strings to be translated.
- * 
+ *
  * Strings to be translated in GDevelop Core codebase
  * are marked with the underscore macro, for example: _("Hello World").
- * 
+ *
  * The macro is then defined to be using the translation function
  * of the underlying platform (Emscripten for GDevelop 5).
  */
@@ -26,8 +26,10 @@
 #endif
 
 namespace gd {
+gd::String GetTranslation(const gd::String& str);
+
 gd::String GetTranslation(const char* str);
-}
+}  // namespace gd
 
 #define _(s) gd::GetTranslation(u8##s)
 

Core/tests/EventsBasedObjectVariantHelper.cpp

@@ -0,0 +1,522 @@
+/*
+ * 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 events of GDevelop Core.
+ */
+#include "catch.hpp"
+
+#include <algorithm>
+#include <initializer_list>
+#include <map>
+
+#include "GDCore/CommonTools.h"
+#include "GDCore/IDE/EventsBasedObjectVariantHelper.h"
+
+#include "DummyPlatform.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/Project/Variable.h"
+#include "catch.hpp"
+
+gd::InitialInstance *
+GetFirstInstanceOf(const gd::String objectName,
+                   gd::InitialInstancesContainer &initialInstances) {
+  gd::InitialInstance *variantInstance = nullptr;
+  initialInstances.IterateOverInstances(
+      [&variantInstance, &objectName](gd::InitialInstance &instance) {
+        if (instance.GetObjectName() == objectName) {
+          variantInstance = &instance;
+          return true;
+        }
+        return false;
+      });
+  return variantInstance;
+}
+
+gd::EventsBasedObject &SetupEventsBasedObject(gd::Project &project) {
+  auto &eventsExtension =
+      project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+  auto &eventsBasedObject = eventsExtension.GetEventsBasedObjects().InsertNew(
+      "MyEventsBasedObject", 0);
+  auto &object = eventsBasedObject.GetObjects().InsertNewObject(
+      project, "MyExtension::Sprite", "MyChildObject", 0);
+  object.GetVariables().InsertNew("MyVariable").SetValue(123);
+  object.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior");
+  auto &instance =
+      eventsBasedObject.GetInitialInstances().InsertNewInitialInstance();
+  instance.SetObjectName("MyChildObject");
+  instance.GetVariables().InsertNew("MyVariable").SetValue(111);
+  auto &objectGroup =
+      eventsBasedObject.GetObjects().GetObjectGroups().InsertNew(
+          "MyObjectGroup");
+  objectGroup.AddObject("MyChildObject");
+  return eventsBasedObject;
+}
+
+TEST_CASE("EventsBasedObjectVariantHelper", "[common]") {
+  SECTION("Can add missing objects") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject2", 0);
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject3", 0);
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject2"));
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject3"));
+  }
+
+  SECTION("Can remove objects") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject2", 0);
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject3", 0);
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+    variant.GetInitialInstances().InsertNewInitialInstance().SetObjectName(
+        "MyChildObject2");
+    REQUIRE(variant.GetInitialInstances().HasInstancesOfObject(
+                "MyChildObject2") == true);
+
+    // Do the changes and launch the refactoring.
+    eventsBasedObject.GetObjects().RemoveObject("MyChildObject2");
+    eventsBasedObject.GetObjects().RemoveObject("MyChildObject3");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject2") == false);
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject3") == false);
+    REQUIRE(variant.GetInitialInstances().HasInstancesOfObject(
+                "MyChildObject2") == false);
+  }
+
+  SECTION("Can change object type") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    eventsBasedObject.GetObjects().RemoveObject("MyChildObject");
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::FakeObjectWithDefaultBehavior", "MyChildObject",
+        0);
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    REQUIRE(variant.GetObjects().GetObject("MyChildObject").GetType() ==
+            "MyExtension::FakeObjectWithDefaultBehavior");
+    REQUIRE(variant.GetInitialInstances().GetInstancesCount() == 1);
+  }
+
+  SECTION("Can add missing object groups") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    eventsBasedObject.GetObjects().GetObjectGroups().InsertNew("MyObjectGroup2",
+                                                               0);
+    eventsBasedObject.GetObjects()
+        .GetObjectGroups()
+        .InsertNew("MyObjectGroup3", 0)
+        .AddObject("MyChildObject");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    auto &variantObjectGroups = variant.GetObjects().GetObjectGroups();
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup"));
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup2"));
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup3"));
+    REQUIRE(
+        variantObjectGroups.Get("MyObjectGroup").GetAllObjectsNames().size() ==
+        1);
+    REQUIRE(
+        variantObjectGroups.Get("MyObjectGroup2").GetAllObjectsNames().size() ==
+        0);
+    REQUIRE(
+        variantObjectGroups.Get("MyObjectGroup3").GetAllObjectsNames().size() ==
+        1);
+  }
+
+  SECTION("Can remove object groups") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+
+    // Do the changes and launch the refactoring.
+    eventsBasedObject.GetObjects().GetObjectGroups().InsertNew("MyObjectGroup2",
+                                                               0);
+    eventsBasedObject.GetObjects().GetObjectGroups().InsertNew("MyObjectGroup3",
+                                                               0);
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    eventsBasedObject.GetObjects().GetObjectGroups().Remove("MyObjectGroup2");
+    eventsBasedObject.GetObjects().GetObjectGroups().Remove("MyObjectGroup3");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    auto &variantObjectGroups = variant.GetObjects().GetObjectGroups();
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup"));
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup2") == false);
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup3") == false);
+  }
+
+  SECTION("Can add objects to groups") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject2", 0);
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject3", 0);
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    auto &objectGroup =
+        eventsBasedObject.GetObjects().GetObjectGroups().Get("MyObjectGroup");
+    objectGroup.AddObject("MyChildObject2");
+    objectGroup.AddObject("MyChildObject3");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    auto &variantObjectGroups = variant.GetObjects().GetObjectGroups();
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup"));
+    REQUIRE(
+        variantObjectGroups.Get("MyObjectGroup").GetAllObjectsNames().size() ==
+        3);
+  }
+
+  SECTION("Can remove objects from groups") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject2", 0);
+    eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject3", 0);
+    auto &objectGroup =
+        eventsBasedObject.GetObjects().GetObjectGroups().Get("MyObjectGroup");
+    objectGroup.AddObject("MyChildObject2");
+    objectGroup.AddObject("MyChildObject3");
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    objectGroup.RemoveObject("MyChildObject2");
+    objectGroup.RemoveObject("MyChildObject3");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    auto &variantObjectGroups = variant.GetObjects().GetObjectGroups();
+    REQUIRE(variantObjectGroups.Has("MyObjectGroup"));
+    REQUIRE(
+        variantObjectGroups.Get("MyObjectGroup").GetAllObjectsNames().size() ==
+        1);
+  }
+
+  SECTION("Can add missing behaviors") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+    object.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior2");
+    object.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior3");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior"));
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior2"));
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior3"));
+  }
+
+  SECTION("Can remove missing behaviors") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+    object.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior2");
+    object.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior3");
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    object.RemoveBehavior("MyBehavior2");
+    object.RemoveBehavior("MyBehavior3");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior"));
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior2") == false);
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior3") == false);
+  }
+
+  SECTION("Can change behavior type") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+    object.RemoveBehavior("MyBehavior");
+    object.AddNewBehavior(project, "MyExtension::MyOtherBehavior",
+                          "MyBehavior");
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.HasBehaviorNamed("MyBehavior"));
+    REQUIRE(variantObject.GetBehavior("MyBehavior").GetTypeName() ==
+            "MyExtension::MyOtherBehavior");
+  }
+
+  SECTION("Can add missing variables") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+    object.GetVariables().InsertNew("MyVariable2", 1).SetValue(456);
+    object.GetVariables().InsertNew("MyVariable3", 2).SetValue(789);
+
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.GetVariables().Get("MyVariable").GetValue() == 123);
+    REQUIRE(variantObject.GetVariables().Get("MyVariable2").GetValue() == 456);
+    REQUIRE(variantObject.GetVariables().Get("MyVariable3").GetValue() == 789);
+    {
+      auto *objectInstance =
+          GetFirstInstanceOf("MyChildObject", variant.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      REQUIRE(objectInstance->GetVariables().Has("MyVariable"));
+      REQUIRE(objectInstance->GetVariables().Has("MyVariable2") == false);
+      REQUIRE(objectInstance->GetVariables().Has("MyVariable3") == false);
+    }
+  }
+
+  SECTION("Can keep variable value") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().Get("MyVariable").SetValue(456);
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.GetVariables().Get("MyVariable").GetValue() == 123);
+    {
+      auto *objectInstance =
+          GetFirstInstanceOf("MyChildObject", variant.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      REQUIRE(objectInstance->GetVariables().Get("MyVariable").GetValue() ==
+              111);
+    }
+  }
+
+  SECTION("Must not propagate instance variable value changes") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    {
+      auto *objectInstance = GetFirstInstanceOf(
+          "MyChildObject", eventsBasedObject.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      objectInstance->GetVariables().Get("MyVariable").SetValue(222);
+    }
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    {
+      auto *objectInstance =
+          GetFirstInstanceOf("MyChildObject", variant.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      REQUIRE(objectInstance->GetVariables().Get("MyVariable").GetValue() ==
+              111);
+    }
+  }
+
+  SECTION("Can move variables") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+    object.GetVariables().InsertNew("MyVariable2", 1).SetValue(456);
+    object.GetVariables().InsertNew("MyVariable3", 2).SetValue(789);
+    {
+      auto *objectInstance = GetFirstInstanceOf(
+          "MyChildObject", eventsBasedObject.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      objectInstance->GetVariables().Get("MyVariable2").SetValue(222);
+      objectInstance->GetVariables().Get("MyVariable3").SetValue(333);
+    }
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().Move(2, 0);
+    object.GetVariables().Get("MyVariable").SetValue(111);
+    object.GetVariables().Get("MyVariable2").SetValue(222);
+    object.GetVariables().Get("MyVariable3").SetValue(333);
+    REQUIRE(object.GetVariables().GetNameAt(0) == "MyVariable3");
+    REQUIRE(object.GetVariables().GetNameAt(1) == "MyVariable");
+    REQUIRE(object.GetVariables().GetNameAt(2) == "MyVariable2");
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.GetVariables().Get("MyVariable").GetValue() == 123);
+    REQUIRE(variantObject.GetVariables().Get("MyVariable2").GetValue() == 456);
+    REQUIRE(variantObject.GetVariables().Get("MyVariable3").GetValue() == 789);
+    REQUIRE(variantObject.GetVariables().GetNameAt(0) == "MyVariable3");
+    REQUIRE(variantObject.GetVariables().GetNameAt(1) == "MyVariable");
+    REQUIRE(variantObject.GetVariables().GetNameAt(2) == "MyVariable2");
+  }
+
+  SECTION("Can remove variables") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+    object.GetVariables().InsertNew("MyVariable2", 1).SetValue(456);
+    object.GetVariables().InsertNew("MyVariable3", 2).SetValue(789);
+    {
+      auto *objectInstance = GetFirstInstanceOf(
+          "MyChildObject", eventsBasedObject.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      objectInstance->GetVariables().Get("MyVariable2").SetValue(222);
+      objectInstance->GetVariables().Get("MyVariable3").SetValue(333);
+    }
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().Remove("MyVariable2");
+    object.GetVariables().Remove("MyVariable3");
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.GetVariables().Has("MyVariable"));
+    REQUIRE(variantObject.GetVariables().Has("MyVariable2") == false);
+    REQUIRE(variantObject.GetVariables().Has("MyVariable3") == false);
+    {
+      auto *objectInstance =
+          GetFirstInstanceOf("MyChildObject", variant.GetInitialInstances());
+      REQUIRE(objectInstance != nullptr);
+      REQUIRE(objectInstance->GetVariables().Has("MyVariable"));
+      REQUIRE(objectInstance->GetVariables().Has("MyVariable2") == false);
+      REQUIRE(objectInstance->GetVariables().Has("MyVariable3") == false);
+    }
+  }
+
+  SECTION("Can change variable type") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsBasedObject = SetupEventsBasedObject(project);
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+    auto &object = eventsBasedObject.GetObjects().GetObject("MyChildObject");
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().Get("MyVariable").SetString("abc");
+    gd::EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
+        project, eventsBasedObject);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    auto &variantObject = variant.GetObjects().GetObject("MyChildObject");
+    REQUIRE(variantObject.GetVariables().Get("MyVariable").GetString() ==
+            "abc");
+    REQUIRE(variant.GetInitialInstances().HasInstancesOfObject("MyVariable") ==
+            false);
+  }
+}

Core/tests/ObjectAssetSerializer.cpp

@@ -33,7 +33,132 @@ using namespace gd;
 
 TEST_CASE("ObjectAssetSerializer", "[common]") {
 
-  SECTION("Can serialize custom objects as assets") {
+  SECTION("Can serialize custom objects as assets with variant") {
+    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");
+    auto &childObject = eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChild", 0);
+    auto &childInstance =
+        eventsBasedObject.GetInitialInstances().InsertNewInitialInstance();
+    childInstance.SetObjectName("MyChild");
+
+    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.GetObjects().InsertNewObject(
+        project, "MyEventsExtension::MyEventsBasedObject", "MyObject", 0);
+    auto *spriteConfiguration =
+        dynamic_cast<gd::SpriteObject *>(&childObject.GetConfiguration());
+    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("variants"));
+    auto &variantsElement = objectAssetElement.GetChild("variants");
+    variantsElement.ConsiderAsArrayOf("variant");
+    REQUIRE(variantsElement.GetChildrenCount() == 1);
+    auto &variantPairElement = variantsElement.GetChild(0);
+    REQUIRE(variantPairElement.GetStringAttribute("objectType") ==
+            "MyEventsExtension::MyEventsBasedObject");
+    REQUIRE(variantPairElement.HasChild("variant"));
+    auto &variantElement = variantPairElement.GetChild("variant");
+    REQUIRE(variantElement.GetStringAttribute("name") == "");
+    REQUIRE(variantElement.HasChild("objects"));
+    auto &objectsElement = variantElement.GetChild("objects");
+    objectsElement.ConsiderAsArrayOf("object");
+    REQUIRE(objectsElement.GetChildrenCount() == 1);
+    auto &childElement = objectsElement.GetChild(0);
+
+    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");
+
+    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");
+  }
+
+  SECTION("Can serialize custom objects as assets with children overriding") {
     gd::Platform platform;
     gd::Project project;
     SetupProjectWithDummyPlatform(project, platform);
@@ -59,6 +184,8 @@ TEST_CASE("ObjectAssetSerializer", "[common]") {
     auto &configuration = object.GetConfiguration();
     auto *customObjectConfiguration =
         dynamic_cast<gd::CustomObjectConfiguration *>(&configuration);
+    customObjectConfiguration
+        ->SetMarkedAsOverridingEventsBasedObjectChildrenConfiguration(true);
     auto *spriteConfiguration = dynamic_cast<gd::SpriteObject *>(
         &customObjectConfiguration->GetChildObjectConfiguration("MyChild"));
     REQUIRE(spriteConfiguration != nullptr);

Core/tests/ObjectsContainersList.cpp

@@ -150,7 +150,7 @@ TEST_CASE("ObjectContainersList (GetTypeOfObject)", "[common]") {
     gd::Object &object1 = layout.GetObjects().InsertNewObject(
         project, "MyExtension::Sprite", "MyObject1", 0);
     gd::Object &object2 = layout.GetObjects().InsertNewObject(
-        project, "FakeObjectWithDefaultBehavior", "MyObject2", 0);
+        project, "MyExtension::FakeObjectWithDefaultBehavior", "MyObject2", 0);
 
     auto &group = layout.GetObjects().GetObjectGroups().InsertNew("MyGroup", 0);
     group.AddObject(object1.GetName());

Core/tests/PropertyFunctionGenerator.cpp

@@ -116,14 +116,11 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterEvent.GetConditions().size() == 0);
       REQUIRE(setterEvent.GetActions().size() == 1);
       auto &setterAction = setterEvent.GetActions().at(0);
-      REQUIRE(
-          setterAction.GetType() ==
-          "MyEventsExtension::MyEventsBasedBehavior::SetPropertyMovementAngle");
-      REQUIRE(setterAction.GetParametersCount() == 4);
-      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
-      REQUIRE(setterAction.GetParameter(1).GetPlainString() == "Behavior");
-      REQUIRE(setterAction.GetParameter(2).GetPlainString() == "=");
-      REQUIRE(setterAction.GetParameter(3).GetPlainString() == "Value");
+      REQUIRE(setterAction.GetType() == "SetNumberVariable");
+      REQUIRE(setterAction.GetParametersCount() == 3);
+      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "MovementAngle");
+      REQUIRE(setterAction.GetParameter(1).GetPlainString() == "=");
+      REQUIRE(setterAction.GetParameter(2).GetPlainString() == "Value");
     }
   }
 
@@ -206,12 +203,12 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(getterEvent.GetActions().size() == 1);
 
       auto &getterCondition = getterEvent.GetConditions().at(0);
-      REQUIRE(getterCondition.GetType() ==
-              "MyEventsExtension::MyEventsBasedBehavior::PropertyRotate");
+      REQUIRE(getterCondition.GetType() == "BooleanVariable");
       REQUIRE(!getterCondition.IsInverted());
-      REQUIRE(getterCondition.GetParametersCount() == 2);
-      REQUIRE(getterCondition.GetParameter(0).GetPlainString() == "Object");
-      REQUIRE(getterCondition.GetParameter(1).GetPlainString() == "Behavior");
+      REQUIRE(getterCondition.GetParametersCount() == 3);
+      REQUIRE(getterCondition.GetParameter(0).GetPlainString() == "Rotate");
+      REQUIRE(getterCondition.GetParameter(1).GetPlainString() == "True");
+      REQUIRE(getterCondition.GetParameter(2).GetPlainString() == "");
 
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnBoolean");
@@ -257,19 +254,19 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterNoEvent.GetActions().size() == 1);
 
       auto &setterNoCondition = setterNoEvent.GetConditions().at(0);
-      REQUIRE(setterNoCondition.GetType() == "GetArgumentAsBoolean");
-      REQUIRE(setterNoCondition.IsInverted());
-      REQUIRE(setterNoCondition.GetParametersCount() == 1);
-      REQUIRE(setterNoCondition.GetParameter(0).GetPlainString() ==
-              "\"Value\"");
+      REQUIRE(setterNoCondition.GetType() == "BooleanVariable");
+      REQUIRE(!setterNoCondition.IsInverted());
+      REQUIRE(setterNoCondition.GetParametersCount() == 3);
+      REQUIRE(setterNoCondition.GetParameter(0).GetPlainString() == "Value");
+      REQUIRE(setterNoCondition.GetParameter(1).GetPlainString() == "False");
+      REQUIRE(setterNoCondition.GetParameter(2).GetPlainString() == "");
 
       auto &setterNoAction = setterNoEvent.GetActions().at(0);
-      REQUIRE(setterNoAction.GetType() ==
-              "MyEventsExtension::MyEventsBasedBehavior::SetPropertyRotate");
+      REQUIRE(setterNoAction.GetType() == "SetBooleanVariable");
       REQUIRE(setterNoAction.GetParametersCount() == 3);
-      REQUIRE(setterNoAction.GetParameter(0).GetPlainString() == "Object");
-      REQUIRE(setterNoAction.GetParameter(1).GetPlainString() == "Behavior");
-      REQUIRE(setterNoAction.GetParameter(2).GetPlainString() == "no");
+      REQUIRE(setterNoAction.GetParameter(0).GetPlainString() == "Rotate");
+      REQUIRE(setterNoAction.GetParameter(1).GetPlainString() == "False");
+      REQUIRE(setterNoAction.GetParameter(2).GetPlainString() == "");
 
       auto &setterYesEvent =
           dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(1));
@@ -277,19 +274,19 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterYesEvent.GetActions().size() == 1);
 
       auto &setterYesCondition = setterYesEvent.GetConditions().at(0);
-      REQUIRE(setterYesCondition.GetType() == "GetArgumentAsBoolean");
+      REQUIRE(setterYesCondition.GetType() == "BooleanVariable");
       REQUIRE(!setterYesCondition.IsInverted());
-      REQUIRE(setterYesCondition.GetParametersCount() == 1);
-      REQUIRE(setterYesCondition.GetParameter(0).GetPlainString() ==
-              "\"Value\"");
+      REQUIRE(setterYesCondition.GetParametersCount() == 3);
+      REQUIRE(setterYesCondition.GetParameter(0).GetPlainString() == "Value");
+      REQUIRE(setterYesCondition.GetParameter(1).GetPlainString() == "True");
+      REQUIRE(setterYesCondition.GetParameter(2).GetPlainString() == "");
 
       auto &setterYesAction = setterYesEvent.GetActions().at(0);
-      REQUIRE(setterYesAction.GetType() ==
-              "MyEventsExtension::MyEventsBasedBehavior::SetPropertyRotate");
+      REQUIRE(setterYesAction.GetType() == "SetBooleanVariable");
       REQUIRE(setterYesAction.GetParametersCount() == 3);
-      REQUIRE(setterYesAction.GetParameter(0).GetPlainString() == "Object");
-      REQUIRE(setterYesAction.GetParameter(1).GetPlainString() == "Behavior");
-      REQUIRE(setterYesAction.GetParameter(2).GetPlainString() == "yes");
+      REQUIRE(setterYesAction.GetParameter(0).GetPlainString() == "Rotate");
+      REQUIRE(setterYesAction.GetParameter(1).GetPlainString() == "True");
+      REQUIRE(setterYesAction.GetParameter(2).GetPlainString() == "");
     }
   }
   SECTION("Can generate functions for a number property in an object") {
@@ -366,11 +363,9 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterEvent.GetConditions().size() == 0);
       REQUIRE(setterEvent.GetActions().size() == 1);
       auto &setterAction = setterEvent.GetActions().at(0);
-      REQUIRE(
-          setterAction.GetType() ==
-          "MyEventsExtension::MyEventsBasedObject::SetPropertyMovementAngle");
+      REQUIRE(setterAction.GetType() == "SetNumberVariable");
       REQUIRE(setterAction.GetParametersCount() == 3);
-      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "MovementAngle");
       REQUIRE(setterAction.GetParameter(1).GetPlainString() == "=");
       REQUIRE(setterAction.GetParameter(2).GetPlainString() == "Value");
     }
@@ -454,11 +449,12 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(getterEvent.GetActions().size() == 1);
 
       auto &getterCondition = getterEvent.GetConditions().at(0);
-      REQUIRE(getterCondition.GetType() ==
-              "MyEventsExtension::MyEventsBasedObject::PropertyRotate");
+      REQUIRE(getterCondition.GetType() == "BooleanVariable");
       REQUIRE(!getterCondition.IsInverted());
-      REQUIRE(getterCondition.GetParametersCount() == 1);
-      REQUIRE(getterCondition.GetParameter(0).GetPlainString() == "Object");
+      REQUIRE(getterCondition.GetParametersCount() == 3);
+      REQUIRE(getterCondition.GetParameter(0).GetPlainString() == "Rotate");
+      REQUIRE(getterCondition.GetParameter(1).GetPlainString() == "True");
+      REQUIRE(getterCondition.GetParameter(2).GetPlainString() == "");
 
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnBoolean");
@@ -500,18 +496,19 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterNoEvent.GetActions().size() == 1);
 
       auto &setterNoCondition = setterNoEvent.GetConditions().at(0);
-      REQUIRE(setterNoCondition.GetType() == "GetArgumentAsBoolean");
-      REQUIRE(setterNoCondition.IsInverted());
-      REQUIRE(setterNoCondition.GetParametersCount() == 1);
-      REQUIRE(setterNoCondition.GetParameter(0).GetPlainString() ==
-              "\"Value\"");
+      REQUIRE(setterNoCondition.GetType() == "BooleanVariable");
+      REQUIRE(!setterNoCondition.IsInverted());
+      REQUIRE(setterNoCondition.GetParametersCount() == 3);
+      REQUIRE(setterNoCondition.GetParameter(0).GetPlainString() == "Value");
+      REQUIRE(setterNoCondition.GetParameter(1).GetPlainString() == "False");
+      REQUIRE(setterNoCondition.GetParameter(2).GetPlainString() == "");
 
       auto &setterNoAction = setterNoEvent.GetActions().at(0);
-      REQUIRE(setterNoAction.GetType() ==
-              "MyEventsExtension::MyEventsBasedObject::SetPropertyRotate");
-      REQUIRE(setterNoAction.GetParametersCount() == 2);
-      REQUIRE(setterNoAction.GetParameter(0).GetPlainString() == "Object");
-      REQUIRE(setterNoAction.GetParameter(1).GetPlainString() == "no");
+      REQUIRE(setterNoAction.GetType() == "SetBooleanVariable");
+      REQUIRE(setterNoAction.GetParametersCount() == 3);
+      REQUIRE(setterNoAction.GetParameter(0).GetPlainString() == "Rotate");
+      REQUIRE(setterNoAction.GetParameter(1).GetPlainString() == "False");
+      REQUIRE(setterNoAction.GetParameter(2).GetPlainString() == "");
 
       auto &setterYesEvent =
           dynamic_cast<gd::StandardEvent &>(setter.GetEvents().GetEvent(1));
@@ -519,18 +516,19 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterYesEvent.GetActions().size() == 1);
 
       auto &setterYesCondition = setterYesEvent.GetConditions().at(0);
-      REQUIRE(setterYesCondition.GetType() == "GetArgumentAsBoolean");
+      REQUIRE(setterYesCondition.GetType() == "BooleanVariable");
       REQUIRE(!setterYesCondition.IsInverted());
-      REQUIRE(setterYesCondition.GetParametersCount() == 1);
-      REQUIRE(setterYesCondition.GetParameter(0).GetPlainString() ==
-              "\"Value\"");
+      REQUIRE(setterYesCondition.GetParametersCount() == 3);
+      REQUIRE(setterYesCondition.GetParameter(0).GetPlainString() == "Value");
+      REQUIRE(setterYesCondition.GetParameter(1).GetPlainString() == "True");
+      REQUIRE(setterYesCondition.GetParameter(2).GetPlainString() == "");
 
       auto &setterYesAction = setterYesEvent.GetActions().at(0);
-      REQUIRE(setterYesAction.GetType() ==
-              "MyEventsExtension::MyEventsBasedObject::SetPropertyRotate");
-      REQUIRE(setterYesAction.GetParametersCount() == 2);
-      REQUIRE(setterYesAction.GetParameter(0).GetPlainString() == "Object");
-      REQUIRE(setterYesAction.GetParameter(1).GetPlainString() == "yes");
+      REQUIRE(setterYesAction.GetType() == "SetBooleanVariable");
+      REQUIRE(setterYesAction.GetParametersCount() == 3);
+      REQUIRE(setterYesAction.GetParameter(0).GetPlainString() == "Rotate");
+      REQUIRE(setterYesAction.GetParameter(1).GetPlainString() == "True");
+      REQUIRE(setterYesAction.GetParameter(2).GetPlainString() == "");
     }
   }
 
@@ -588,9 +586,11 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterEvent.GetConditions().size() == 0);
       REQUIRE(setterEvent.GetActions().size() == 1);
       auto &setterAction = setterEvent.GetActions().at(0);
-      REQUIRE(setterAction.GetType() ==
-              "MyEventsExtension::MyEventsBasedBehavior::"
-              "SetSharedPropertyMovementAngle");
+      REQUIRE(setterAction.GetType() == "SetNumberVariable");
+      REQUIRE(setterAction.GetParametersCount() == 3);
+      REQUIRE(setterAction.GetParameter(0).GetPlainString() == "MovementAngle");
+      REQUIRE(setterAction.GetParameter(1).GetPlainString() == "=");
+      REQUIRE(setterAction.GetParameter(2).GetPlainString() == "Value");
     }
   }
 

Core/tests/WholeProjectRefactorer-ApplyRefactoringForVariablesContainer.cpp

@@ -19,7 +19,7 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/GroupVariableHelper.h"
+#include "GDCore/IDE/ObjectVariableHelper.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
@@ -760,33 +760,33 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     // Check the first layout is updated.
     {
-      REQUIRE(event.GetActions().GetCount() == 19);
+      REQUIRE(event.GetActions().GetCount() == 40);
 
       // clang-format off
-      // All the actions using the removed variables are gone.
-      REQUIRE(event.GetActions()[0].GetParameter(0).GetPlainString() == "1 + MySceneVariable2");
-      REQUIRE(event.GetActions()[1].GetParameter(0).GetPlainString() == "1 + Object2.MyObjectVariable");
-      REQUIRE(event.GetActions()[2].GetParameter(0).GetPlainString() == "1 + Object2.MyObjectStructureVariable.MyChild");
-      REQUIRE(event.GetActions()[3].GetParameter(0).GetPlainString() == "1 + MySceneStructureVariable2.MyChild");
-      REQUIRE(event.GetActions()[4].GetParameter(0).GetPlainString() == "1 + MyGlobalVariable2");
-      REQUIRE(event.GetActions()[5].GetParameter(0).GetPlainString() == "1 + MyGlobalStructureVariable2.MyChild");
-      REQUIRE(event.GetActions()[6].GetParameter(0).GetPlainString() == "1 + MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object2, MyObjectVariable, Object2, MyObjectVariable)");
-      REQUIRE(event.GetActions()[7].GetParameter(0).GetPlainString() == "1 + MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object2, MyObjectStructureVariable.MyChild, Object2, MyObjectStructureVariable.MyChild)");
-      REQUIRE(event.GetActions()[8].GetParameter(0).GetPlainString() == "1 + Object2.GetObjectVariableAsNumber(MyObjectVariable)");
-      REQUIRE(event.GetActions()[9].GetParameter(0).GetPlainString() == "1 + Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild)");
-      REQUIRE(event.GetActions()[10].GetParameter(0).GetPlainString() == "1 + Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild.GrandChild)");
-      REQUIRE(event.GetActions()[11].GetParameter(0).GetPlainString() == "1 + MyExtension::GetGlobalVariableAsNumber(MyGlobalVariable2)");
-      REQUIRE(event.GetActions()[12].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(MySceneVariable2)");
-      REQUIRE(event.GetActions()[13].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(SharedVariableName)");
-      REQUIRE(event.GetActions()[14].GetParameter(0).GetPlainString() == "1 + MyExtension::GetGlobalVariableAsNumber(MyGlobalStructureVariable2.MyChild)");
-      REQUIRE(event.GetActions()[15].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(MySceneStructureVariable2.MyChild)");
-      REQUIRE(event.GetActions()[16].GetParameter(0).GetPlainString() == "1 + MyExtension::GetGlobalVariableAsNumber(MyGlobalStructureVariable2.MyChild.GrandChild)");
-      REQUIRE(event.GetActions()[17].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(MySceneStructureVariable2.MyChild.GrandChild)");
+      // All the actions using the removed variables are kept.
+      REQUIRE(event.GetActions()[1].GetParameter(0).GetPlainString() == "1 + MySceneVariable2");
+      REQUIRE(event.GetActions()[3].GetParameter(0).GetPlainString() == "1 + Object2.MyObjectVariable");
+      REQUIRE(event.GetActions()[5].GetParameter(0).GetPlainString() == "1 + Object2.MyObjectStructureVariable.MyChild");
+      REQUIRE(event.GetActions()[7].GetParameter(0).GetPlainString() == "1 + MySceneStructureVariable2.MyChild");
+      REQUIRE(event.GetActions()[9].GetParameter(0).GetPlainString() == "1 + MyGlobalVariable2");
+      REQUIRE(event.GetActions()[11].GetParameter(0).GetPlainString() == "1 + MyGlobalStructureVariable2.MyChild");
+      REQUIRE(event.GetActions()[13].GetParameter(0).GetPlainString() == "1 + MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object2, MyObjectVariable, Object2, MyObjectVariable)");
+      REQUIRE(event.GetActions()[15].GetParameter(0).GetPlainString() == "1 + MyExtension::GetStringWith2ObjectParamAnd2ObjectVarParam(Object2, MyObjectStructureVariable.MyChild, Object2, MyObjectStructureVariable.MyChild)");
+      REQUIRE(event.GetActions()[17].GetParameter(0).GetPlainString() == "1 + Object2.GetObjectVariableAsNumber(MyObjectVariable)");
+      REQUIRE(event.GetActions()[19].GetParameter(0).GetPlainString() == "1 + Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild)");
+      REQUIRE(event.GetActions()[21].GetParameter(0).GetPlainString() == "1 + Object2.GetObjectVariableAsNumber(MyObjectStructureVariable.MyChild.GrandChild)");
+      REQUIRE(event.GetActions()[23].GetParameter(0).GetPlainString() == "1 + MyExtension::GetGlobalVariableAsNumber(MyGlobalVariable2)");
+      REQUIRE(event.GetActions()[26].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(MySceneVariable2)");
+      REQUIRE(event.GetActions()[27].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(SharedVariableName)");
+      REQUIRE(event.GetActions()[29].GetParameter(0).GetPlainString() == "1 + MyExtension::GetGlobalVariableAsNumber(MyGlobalStructureVariable2.MyChild)");
+      REQUIRE(event.GetActions()[31].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(MySceneStructureVariable2.MyChild)");
+      REQUIRE(event.GetActions()[33].GetParameter(0).GetPlainString() == "1 + MyExtension::GetGlobalVariableAsNumber(MyGlobalStructureVariable2.MyChild.GrandChild)");
+      REQUIRE(event.GetActions()[35].GetParameter(0).GetPlainString() == "1 + MyExtension::GetVariableAsNumber(MySceneStructureVariable2.MyChild.GrandChild)");
 
-      REQUIRE(event.GetActions()[18].GetParameter(0).GetPlainString() == "MySceneVariable2");
-      REQUIRE(event.GetActions()[18].GetParameter(1).GetPlainString() == "MyGlobalVariable2");
-      REQUIRE(event.GetActions()[18].GetParameter(2).GetPlainString() == "Object2");
-      REQUIRE(event.GetActions()[18].GetParameter(3).GetPlainString() == "MyObjectVariable");
+      REQUIRE(event.GetActions()[39].GetParameter(0).GetPlainString() == "MySceneVariable2");
+      REQUIRE(event.GetActions()[39].GetParameter(1).GetPlainString() == "MyGlobalVariable2");
+      REQUIRE(event.GetActions()[39].GetParameter(2).GetPlainString() == "Object2");
+      REQUIRE(event.GetActions()[39].GetParameter(3).GetPlainString() == "MyObjectVariable");
       // clang-format on
     }
 
@@ -1021,6 +1021,233 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
             "MyVariable.MyRenamedChild");
   }
 
+  SECTION("Can rename an object variable") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &scene = project.InsertNewLayout("Scene", 0);
+    auto &object = scene.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "Object", 0);
+    object.GetVariables().InsertNew("MyVariable").SetValue(123);
+    auto &instance = scene.GetInitialInstances().InsertNewInitialInstance();
+    instance.SetObjectName("Object");
+    instance.GetVariables().InsertNew("MyVariable").SetValue(456);
+
+    gd::StandardEvent &event =
+        dynamic_cast<gd::StandardEvent &>(scene.GetEvents().InsertNewEvent(
+            project, "BuiltinCommonInstructions::Standard"));
+
+    {
+      gd::Instruction action;
+      action.SetType("SetNumberObjectVariable");
+      action.SetParametersCount(4);
+      action.SetParameter(0, gd::Expression("Object"));
+      action.SetParameter(1, gd::Expression("MyVariable"));
+      action.SetParameter(2, gd::Expression("="));
+      action.SetParameter(3, gd::Expression("Object.MyVariable"));
+      event.GetActions().Insert(action);
+    }
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().ResetPersistentUuid();
+    gd::SerializerElement originalSerializedVariables;
+    object.GetVariables().SerializeTo(originalSerializedVariables);
+
+    object.GetVariables().Rename("MyVariable", "MyRenamedVariable");
+    auto changeset =
+        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+            originalSerializedVariables, object.GetVariables());
+
+    REQUIRE(changeset.oldToNewVariableNames.size() == 1);
+
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
+
+    REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
+            "MyRenamedVariable");
+    REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
+            "Object.MyRenamedVariable");
+    REQUIRE(instance.GetVariables().Get("MyRenamedVariable").GetValue() == 456);
+  }
+
+  SECTION("Can rename an object variable (in events-based object)") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &eventsExtension =
+        project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+    auto &eventsBasedObject = eventsExtension.GetEventsBasedObjects().InsertNew(
+        "MyEventsBasedObject", 0);
+    auto &object = eventsBasedObject.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "MyChildObject", 0);
+    object.GetVariables().InsertNew("MyVariable").SetValue(123);
+    auto &instance =
+        eventsBasedObject.GetInitialInstances().InsertNewInitialInstance();
+    instance.SetObjectName("MyChildObject");
+    instance.GetVariables().InsertNew("MyVariable").SetValue(456);
+
+    auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+        eventsBasedObject.GetDefaultVariant(), 0);
+    gd::InitialInstance *variantInstance = nullptr;
+    variant.GetInitialInstances().IterateOverInstances(
+        [&variantInstance](gd::InitialInstance &instance) {
+          variantInstance = &instance;
+          return true;
+        });
+    REQUIRE(variantInstance != nullptr);
+    variant.GetObjects()
+        .GetObject("MyChildObject")
+        .GetVariables()
+        .Get("MyVariable")
+        .SetValue(111);
+    variantInstance->GetVariables().Get("MyVariable").SetValue(222);
+
+    auto &objectFunction =
+        eventsBasedObject.GetEventsFunctions().InsertNewEventsFunction(
+            "MyObjectEventsFunction", 0);
+    gd::StandardEvent &event = dynamic_cast<gd::StandardEvent &>(
+        objectFunction.GetEvents().InsertNewEvent(
+            project, "BuiltinCommonInstructions::Standard"));
+
+    {
+      gd::Instruction action;
+      action.SetType("SetNumberObjectVariable");
+      action.SetParametersCount(4);
+      action.SetParameter(0, gd::Expression("MyChildObject"));
+      action.SetParameter(1, gd::Expression("MyVariable"));
+      action.SetParameter(2, gd::Expression("="));
+      action.SetParameter(3, gd::Expression("MyChildObject.MyVariable"));
+      event.GetActions().Insert(action);
+    }
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().ResetPersistentUuid();
+    gd::SerializerElement originalSerializedVariables;
+    object.GetVariables().SerializeTo(originalSerializedVariables);
+
+    object.GetVariables().Rename("MyVariable", "MyRenamedVariable");
+    auto changeset =
+        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+            originalSerializedVariables, object.GetVariables());
+
+    REQUIRE(changeset.oldToNewVariableNames.size() == 1);
+
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), eventsBasedObject.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
+    gd::ObjectVariableHelper::ApplyChangesToVariants(
+        eventsBasedObject, "MyChildObject", changeset);
+
+    REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
+            "MyRenamedVariable");
+    REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
+            "MyChildObject.MyRenamedVariable");
+
+    REQUIRE(eventsBasedObject.GetObjects().HasObjectNamed("MyChildObject"));
+    REQUIRE(eventsBasedObject.GetObjects()
+                .GetObject("MyChildObject")
+                .GetVariables()
+                .Get("MyRenamedVariable")
+                .GetValue() == 123);
+    REQUIRE(instance.GetVariables().Get("MyRenamedVariable").GetValue() == 456);
+
+    REQUIRE(variant.GetObjects().HasObjectNamed("MyChildObject"));
+    REQUIRE(variant.GetObjects()
+                .GetObject("MyChildObject")
+                .GetVariables()
+                .Get("MyRenamedVariable")
+                .GetValue() == 111);
+    REQUIRE(
+        variantInstance->GetVariables().Get("MyRenamedVariable").GetValue() ==
+        222);
+  }
+
+  SECTION("Can delete an object variable") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &scene = project.InsertNewLayout("Scene", 0);
+    auto &object = scene.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "Object", 0);
+    object.GetVariables().InsertNew("MyVariable").SetValue(123);
+    auto &instance = scene.GetInitialInstances().InsertNewInitialInstance();
+    instance.SetObjectName("Object");
+    instance.GetVariables().InsertNew("MyVariable").SetValue(456);
+
+    gd::StandardEvent &event =
+        dynamic_cast<gd::StandardEvent &>(scene.GetEvents().InsertNewEvent(
+            project, "BuiltinCommonInstructions::Standard"));
+
+    {
+      gd::Instruction action;
+      action.SetType("SetNumberObjectVariable");
+      action.SetParametersCount(4);
+      action.SetParameter(0, gd::Expression("Object"));
+      action.SetParameter(1, gd::Expression("MyVariable"));
+      action.SetParameter(2, gd::Expression("="));
+      action.SetParameter(3, gd::Expression("Object.MyVariable"));
+      event.GetActions().Insert(action);
+    }
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().ResetPersistentUuid();
+    gd::SerializerElement originalSerializedVariables;
+    object.GetVariables().SerializeTo(originalSerializedVariables);
+
+    object.GetVariables().Remove("MyVariable");
+    auto changeset =
+        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+            originalSerializedVariables, object.GetVariables());
+    REQUIRE(changeset.removedVariableNames.size() == 1);
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
+
+    // Events are untouched
+    REQUIRE(scene.GetEvents().size() == 1);
+    REQUIRE(event.GetActions().size() == 1);
+    REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
+            "MyVariable");
+    REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
+            "Object.MyVariable");
+    // Instance variables are removed
+    REQUIRE(!instance.GetVariables().Has("MyVariable"));
+  }
+
+  SECTION("Can add an object variable") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &scene = project.InsertNewLayout("Scene", 0);
+    auto &object = scene.GetObjects().InsertNewObject(
+        project, "MyExtension::Sprite", "Object", 0);
+    auto &instance = scene.GetInitialInstances().InsertNewInitialInstance();
+    instance.SetObjectName("Object");
+
+    // Do the changes and launch the refactoring.
+    object.GetVariables().ResetPersistentUuid();
+    gd::SerializerElement originalSerializedVariables;
+    object.GetVariables().SerializeTo(originalSerializedVariables);
+
+    object.GetVariables().InsertNew("MyVariable").SetValue(123);
+    auto changeset =
+        gd::WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+            originalSerializedVariables, object.GetVariables());
+
+    REQUIRE(changeset.addedVariableNames.size() == 1);
+
+    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+        project, object.GetVariables(), changeset, originalSerializedVariables);
+
+    // Instance variables are NOT added
+    REQUIRE(!instance.GetVariables().Has("MyVariable"));
+  }
+
   SECTION("Can rename an object child variable") {
     gd::Project project;
     gd::Platform platform;
@@ -1062,8 +1289,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object.GetVariables(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
             "MyVariable.MyRenamedChild");
@@ -1112,8 +1340,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object.GetVariables(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
             "MyVariable.MyRenamedChild");
@@ -1161,8 +1390,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object.GetVariables(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
             "MyVariable.MyChild.MyRenamedGrandChild");
@@ -1896,8 +2126,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.typeChangedVariableNames.find("MyObjectVariable") !=
             changeset.typeChangedVariableNames.end());
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object.GetVariables(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
 
     // Check the the action has changed to follow the variable type.
     REQUIRE(event.GetActions()[0].GetType() == "SetStringObjectVariable");
@@ -1947,8 +2178,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.typeChangedVariableNames.find("MyObjectVariable") !=
             changeset.typeChangedVariableNames.end());
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-        project, object.GetVariables(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
+        project, object.GetVariables(), scene.GetInitialInstances(),
+        object.GetName(), changeset, originalSerializedVariables);
 
     // Check the the action has changed to follow the variable type.
     REQUIRE(event.GetActions()[0].GetType() == "SetStringObjectVariable");
@@ -1977,7 +2209,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 1);
@@ -2009,7 +2241,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 1);
@@ -2029,7 +2261,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 0);
@@ -2050,7 +2282,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 0);
@@ -2075,7 +2307,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2094,8 +2326,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 456);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2121,7 +2354,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2140,8 +2373,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 456);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2167,7 +2401,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2188,8 +2422,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 111);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2215,7 +2450,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2236,8 +2471,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 0);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2263,7 +2499,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2282,8 +2518,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 0);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 111);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2318,7 +2555,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Count() == 1);
@@ -2336,8 +2573,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
             originalSerializedVariables, groupVariables);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(newObject.GetVariables().Count() == 2);
     REQUIRE(newObject.GetVariables().Get("MyGroupVariable").GetValue() == 123);
@@ -2369,7 +2607,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2390,8 +2628,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2428,7 +2667,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2448,8 +2687,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2486,7 +2726,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2506,8 +2746,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2558,7 +2799,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2579,8 +2820,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2613,11 +2855,14 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto &group = scene.GetObjects().GetObjectGroups().InsertNew("Group");
     group.AddObject("Object");
     group.AddObject("OtherObject");
+    auto &instance = scene.GetInitialInstances().InsertNewInitialInstance();
+    instance.SetObjectName("Object");
+    instance.GetVariables().InsertNew("MyGroupVariable").SetValue(456);
 
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2635,11 +2880,13 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.removedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(!object.GetVariables().Has("MyGroupVariable"));
     REQUIRE(!otherObject.GetVariables().Has("MyGroupVariable"));
+    REQUIRE(!instance.GetVariables().Has("MyGroupVariable"));
   }
 
   SECTION("Can add a group variable") {
@@ -2659,7 +2906,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Count() == 0);
@@ -2677,8 +2924,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.addedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 456);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2704,7 +2952,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Count() == 0);
@@ -2722,8 +2970,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.addedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     // The variable kept its original value.
     REQUIRE(object.GetVariables().Count() == 1);
@@ -2749,6 +2998,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto &group = scene.GetObjects().GetObjectGroups().InsertNew("Group");
     group.AddObject("Object");
     group.AddObject("OtherObject");
+    auto &instance = scene.GetInitialInstances().InsertNewInitialInstance();
+    instance.SetObjectName("Object");
+    instance.GetVariables().InsertNew("MyGroupVariable").SetValue(456);
 
     gd::StandardEvent &event =
         dynamic_cast<gd::StandardEvent &>(scene.GetEvents().InsertNewEvent(
@@ -2787,7 +3039,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2806,8 +3058,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.oldToNewVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Count() == 1);
     REQUIRE(object.GetVariables().Get("MyRenamedGroupVariable").GetValue() == 123);
@@ -2830,6 +3083,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
             "MyRenamedGroupVariable");
     REQUIRE(event.GetActions()[2].GetParameter(3).GetPlainString() ==
             "OtherObject.MyRenamedGroupVariable");
+    REQUIRE(instance.GetVariables().Get("MyRenamedGroupVariable").GetValue() == 456);
   }
 
   SECTION("Can rename a group variable when one of the object already has it") {
@@ -2887,7 +3141,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2906,8 +3160,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.oldToNewVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
         
     // The variable kept its original value.
     REQUIRE(object.GetVariables().Count() == 1);
@@ -2992,7 +3247,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -3016,8 +3271,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
             "MyGroupVariable.MyRenamedChild");
@@ -3067,7 +3323,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::GroupVariableHelper::MergeVariableContainers(
+        gd::ObjectVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -3086,8 +3342,9 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.oldToNewVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(), groupVariables,
-        group, changeset, originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(),
+        scene.GetInitialInstances(), groupVariables, group, changeset,
+        originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
             "MyGroupVariable");

Core/tests/WholeProjectRefactorer.cpp

@@ -1754,6 +1754,9 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       eventsBasedObject.GetObjects().InsertNewObject(
           project, "MyExtension::Sprite", "Object2", 0);
 
+      auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+          eventsBasedObject.GetDefaultVariant(), 0);
+
       // Create the objects container for the events function
       gd::ObjectsContainer parametersObjectsContainer(
           gd::ObjectsContainer::SourceType::Function);
@@ -1765,6 +1768,10 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       gd::WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
           project, projectScopedContainers, eventsBasedObject, "Object1",
           "Object3", /* isObjectGroup =*/false);
+
+      REQUIRE(variant.GetObjects().HasObjectNamed("Object1") == false);
+      REQUIRE(variant.GetObjects().HasObjectNamed("Object2") == true);
+      REQUIRE(variant.GetObjects().HasObjectNamed("Object3") == true);
       REQUIRE(eventsBasedObject.GetObjects().GetObjectGroups().size() == 1);
       REQUIRE(eventsBasedObject.GetObjects().GetObjectGroups()[0].Find(
                   "Object1") == false);
@@ -1772,6 +1779,17 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
                   "Object2") == true);
       REQUIRE(eventsBasedObject.GetObjects().GetObjectGroups()[0].Find(
                   "Object3") == true);
+
+      REQUIRE(variant.GetObjects().HasObjectNamed("Object1") == false);
+      REQUIRE(variant.GetObjects().HasObjectNamed("Object2") == true);
+      REQUIRE(variant.GetObjects().HasObjectNamed("Object3") == true);
+      REQUIRE(variant.GetObjects().GetObjectGroups().size() == 1);
+      REQUIRE(variant.GetObjects().GetObjectGroups()[0].Find("Object1") ==
+              false);
+      REQUIRE(variant.GetObjects().GetObjectGroups()[0].Find("Object2") ==
+              true);
+      REQUIRE(variant.GetObjects().GetObjectGroups()[0].Find("Object3") ==
+              true);
     }
 
     SECTION("Initial instances") {
@@ -1796,6 +1814,9 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       eventsBasedObject.GetInitialInstances().InsertInitialInstance(instance1);
       eventsBasedObject.GetInitialInstances().InsertInitialInstance(instance2);
 
+      auto &variant = eventsBasedObject.GetVariants().InsertVariant(
+          eventsBasedObject.GetDefaultVariant(), 0);
+
       // Create the objects container for the events function
       gd::ObjectsContainer parametersObjectsContainer(
           gd::ObjectsContainer::SourceType::Function);
@@ -1807,10 +1828,16 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
       gd::WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
           project, projectScopedContainers, eventsBasedObject, "Object1",
           "Object3", /* isObjectGroup =*/false);
+
       REQUIRE(eventsBasedObject.GetInitialInstances().HasInstancesOfObject(
                   "Object1") == false);
       REQUIRE(eventsBasedObject.GetInitialInstances().HasInstancesOfObject(
                   "Object3") == true);
+
+      REQUIRE(variant.GetInitialInstances().HasInstancesOfObject("Object1") ==
+              false);
+      REQUIRE(variant.GetInitialInstances().HasInstancesOfObject("Object3") ==
+              true);
     }
 
     SECTION("Events") {

Extensions/3D/A_RuntimeObject3D.ts

@@ -1,15 +1,4 @@
 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;
-  }
-
   const getValidDimensionValue = (value: float | undefined) =>
     value === undefined ? 100 : value <= 0 ? 1 : value;
 
@@ -35,11 +24,8 @@ namespace gdjs {
    */
   export abstract class RuntimeObject3D
     extends gdjs.RuntimeObject
-    implements
-      gdjs.Resizable,
-      gdjs.Scalable,
-      gdjs.Flippable,
-      gdjs.Base3DHandler {
+    implements gdjs.Resizable, gdjs.Scalable, gdjs.Flippable, gdjs.Base3DHandler
+  {
     /**
      * Position on the Z axis.
      */
@@ -84,7 +70,7 @@ namespace gdjs {
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
-      objectData: Object3DData
+      objectData: gdjs.Object3DData
     ) {
       super(instanceContainer, objectData);
       // TODO Should 0 be replaced by 0.01 instead of using the default value?

Extensions/3D/Base3DBehavior.ts

@@ -117,6 +117,17 @@ namespace gdjs {
     getUnrotatedAABBMaxZ(): number;
   }
 
+  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;
+  }
+
   export namespace Base3DHandler {
     export const is3D = (
       object: gdjs.RuntimeObject
@@ -131,7 +142,8 @@ namespace gdjs {
    */
   export class Base3DBehavior
     extends gdjs.RuntimeBehavior
-    implements Base3DHandler {
+    implements Base3DHandler
+  {
     private object: gdjs.RuntimeObject & Base3DHandler;
 
     constructor(

Extensions/3D/Cube3DRuntimeObject.ts

@@ -3,31 +3,31 @@ namespace gdjs {
   export interface Cube3DObjectData extends Object3DData {
     /** The base parameters of the Cube3D object */
     content: Object3DDataContent & {
-      enableTextureTransparency: boolean;
-      facesOrientation: 'Y' | 'Z';
+      enableTextureTransparency: boolean | undefined;
+      facesOrientation: 'Y' | 'Z' | undefined;
       frontFaceResourceName: string;
       backFaceResourceName: string;
-      backFaceUpThroughWhichAxisRotation: 'X' | 'Y';
+      backFaceUpThroughWhichAxisRotation: 'X' | 'Y' | undefined;
       leftFaceResourceName: string;
       rightFaceResourceName: string;
       topFaceResourceName: string;
       bottomFaceResourceName: string;
-      frontFaceResourceRepeat: boolean;
-      backFaceResourceRepeat: boolean;
-      leftFaceResourceRepeat: boolean;
-      rightFaceResourceRepeat: boolean;
-      topFaceResourceRepeat: boolean;
-      bottomFaceResourceRepeat: boolean;
+      frontFaceResourceRepeat: boolean | undefined;
+      backFaceResourceRepeat: boolean | undefined;
+      leftFaceResourceRepeat: boolean | undefined;
+      rightFaceResourceRepeat: boolean | undefined;
+      topFaceResourceRepeat: boolean | undefined;
+      bottomFaceResourceRepeat: boolean | undefined;
       frontFaceVisible: boolean;
       backFaceVisible: boolean;
       leftFaceVisible: boolean;
       rightFaceVisible: boolean;
       topFaceVisible: boolean;
       bottomFaceVisible: boolean;
+      tint: string | undefined;
       materialType: 'Basic' | 'StandardWithoutMetalness';
     };
   }
-
   type FaceName = 'front' | 'back' | 'left' | 'right' | 'top' | 'bottom';
   const faceNameToBitmaskIndex = {
     front: 0,
@@ -45,6 +45,7 @@ namespace gdjs {
     trfb: integer;
     frn: [string, string, string, string, string, string];
     mt: number;
+    tint: string;
   };
 
   type Cube3DObjectNetworkSyncData = Object3DNetworkSyncData &
@@ -67,10 +68,11 @@ namespace gdjs {
       string,
       string,
       string,
-      string
+      string,
     ];
     _materialType: gdjs.Cube3DRuntimeObject.MaterialType =
       gdjs.Cube3DRuntimeObject.MaterialType.Basic;
+    _tint: string;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -117,6 +119,9 @@ namespace gdjs {
         objectData.content.topFaceResourceName,
         objectData.content.bottomFaceResourceName,
       ];
+
+      this._tint = objectData.content.tint || '255;255;255';
+
       this._materialType = this._convertMaterialType(
         objectData.content.materialType
       );
@@ -134,7 +139,7 @@ namespace gdjs {
      * Sets the visibility of a face of the 3D box.
      *
      * @param faceName - The name of the face to set visibility for.
-     * @param value - The visibility value to set.
+     * @param enable - The visibility value to set.
      */
     setFaceVisibility(faceName: FaceName, enable: boolean) {
       const faceIndex = faceNameToBitmaskIndex[faceName];
@@ -157,7 +162,7 @@ namespace gdjs {
      * Sets the texture repeat of a face of the 3D box.
      *
      * @param faceName - The name of the face to set visibility for.
-     * @param value - The visibility value to set.
+     * @param enable - The visibility value to set.
      */
     setRepeatTextureOnFace(faceName: FaceName, enable: boolean) {
       const faceIndex = faceNameToBitmaskIndex[faceName];
@@ -203,11 +208,22 @@ namespace gdjs {
       if (this._faceResourceNames[faceIndex] === resourceName) {
         return;
       }
-
       this._faceResourceNames[faceIndex] = resourceName;
       this._renderer.updateFace(faceIndex);
     }
 
+    setColor(tint: string): void {
+      if (this._tint === tint) {
+        return;
+      }
+      this._tint = tint;
+      this._renderer.updateTint();
+    }
+
+    getColor(): string {
+      return this._tint;
+    }
+
     /** @internal */
     getFaceAtIndexResourceName(faceIndex: integer): string {
       return this._faceResourceNames[faceIndex];
@@ -291,6 +307,10 @@ namespace gdjs {
           newObjectData.content.frontFaceResourceName
         );
       }
+      if (oldObjectData.content.tint !== newObjectData.content.tint) {
+        this.setColor(newObjectData.content.tint || '255;255;255');
+      }
+
       if (
         oldObjectData.content.backFaceResourceName !==
         newObjectData.content.backFaceResourceName
@@ -342,7 +362,7 @@ namespace gdjs {
       ) {
         this.setRepeatTextureOnFace(
           'front',
-          newObjectData.content.frontFaceResourceRepeat
+          newObjectData.content.frontFaceResourceRepeat || false
         );
       }
       if (
@@ -351,7 +371,7 @@ namespace gdjs {
       ) {
         this.setRepeatTextureOnFace(
           'back',
-          newObjectData.content.backFaceResourceRepeat
+          newObjectData.content.backFaceResourceRepeat || false
         );
       }
       if (
@@ -360,7 +380,7 @@ namespace gdjs {
       ) {
         this.setRepeatTextureOnFace(
           'left',
-          newObjectData.content.leftFaceResourceRepeat
+          newObjectData.content.leftFaceResourceRepeat || false
         );
       }
       if (
@@ -369,7 +389,7 @@ namespace gdjs {
       ) {
         this.setRepeatTextureOnFace(
           'right',
-          newObjectData.content.rightFaceResourceRepeat
+          newObjectData.content.rightFaceResourceRepeat || false
         );
       }
       if (
@@ -378,7 +398,7 @@ namespace gdjs {
       ) {
         this.setRepeatTextureOnFace(
           'top',
-          newObjectData.content.topFaceResourceRepeat
+          newObjectData.content.topFaceResourceRepeat || false
         );
       }
       if (
@@ -387,7 +407,7 @@ namespace gdjs {
       ) {
         this.setRepeatTextureOnFace(
           'bottom',
-          newObjectData.content.bottomFaceResourceRepeat
+          newObjectData.content.bottomFaceResourceRepeat || false
         );
       }
       if (
@@ -395,14 +415,14 @@ namespace gdjs {
         newObjectData.content.backFaceUpThroughWhichAxisRotation
       ) {
         this.setBackFaceUpThroughWhichAxisRotation(
-          newObjectData.content.backFaceUpThroughWhichAxisRotation
+          newObjectData.content.backFaceUpThroughWhichAxisRotation || 'X'
         );
       }
       if (
         oldObjectData.content.facesOrientation !==
         newObjectData.content.facesOrientation
       ) {
-        this.setFacesOrientation(newObjectData.content.facesOrientation);
+        this.setFacesOrientation(newObjectData.content.facesOrientation || 'Y');
       }
       if (
         oldObjectData.content.materialType !==
@@ -423,6 +443,7 @@ namespace gdjs {
         vfb: this._visibleFacesBitmask,
         trfb: this._textureRepeatFacesBitmask,
         frn: this._faceResourceNames,
+        tint: this._tint,
       };
     }
 
@@ -476,6 +497,12 @@ namespace gdjs {
           }
         }
       }
+      if (networkSyncData.tint !== undefined) {
+        if (this._tint !== networkSyncData.tint) {
+          this._tint = networkSyncData.tint;
+          this._renderer.updateTint();
+        }
+      }
     }
 
     /**

Extensions/3D/Cube3DRuntimeObjectPixiRenderer.ts

@@ -62,6 +62,7 @@ namespace gdjs {
         forceBasicMaterial:
           runtimeObject._materialType ===
           gdjs.Cube3DRuntimeObject.MaterialType.Basic,
+        vertexColors: true,
       });
   };
 
@@ -74,15 +75,13 @@ namespace gdjs {
       instanceContainer: gdjs.RuntimeInstanceContainer
     ) {
       const geometry = new THREE.BoxGeometry(1, 1, 1);
-      // TODO (3D) - feature: support color instead of texture?
-      const materials = [
-        getFaceMaterial(runtimeObject, materialIndexToFaceIndex[0]),
-        getFaceMaterial(runtimeObject, materialIndexToFaceIndex[1]),
-        getFaceMaterial(runtimeObject, materialIndexToFaceIndex[2]),
-        getFaceMaterial(runtimeObject, materialIndexToFaceIndex[3]),
-        getFaceMaterial(runtimeObject, materialIndexToFaceIndex[4]),
-        getFaceMaterial(runtimeObject, materialIndexToFaceIndex[5]),
-      ];
+
+      const materials: THREE.Material[] = new Array(6)
+        .fill(0)
+        .map((_, index) =>
+          getFaceMaterial(runtimeObject, materialIndexToFaceIndex[index])
+        );
+
       const boxMesh = new THREE.Mesh(geometry, materials);
 
       super(runtimeObject, instanceContainer, boxMesh);
@@ -92,6 +91,28 @@ namespace gdjs {
       this.updateSize();
       this.updatePosition();
       this.updateRotation();
+      this.updateTint();
+    }
+
+    updateTint() {
+      const tints: number[] = [];
+
+      const normalizedTint = gdjs
+        .rgbOrHexToRGBColor(this._cube3DRuntimeObject.getColor())
+        .map((component) => component / 255);
+
+      for (
+        let i = 0;
+        i < this._boxMesh.geometry.attributes.position.count;
+        i++
+      ) {
+        tints.push(...normalizedTint);
+      }
+
+      this._boxMesh.geometry.setAttribute(
+        'color',
+        new THREE.BufferAttribute(new Float32Array(tints), 3)
+      );
     }
 
     updateFace(faceIndex: integer) {
@@ -121,13 +142,11 @@ namespace gdjs {
      */
     updateTextureUvMapping(faceIndex?: number) {
       // @ts-ignore - position is stored as a Float32BufferAttribute
-      const pos: THREE.BufferAttribute = this._boxMesh.geometry.getAttribute(
-        'position'
-      );
+      const pos: THREE.BufferAttribute =
+        this._boxMesh.geometry.getAttribute('position');
       // @ts-ignore - uv is stored as a Float32BufferAttribute
-      const uvMapping: THREE.BufferAttribute = this._boxMesh.geometry.getAttribute(
-        'uv'
-      );
+      const uvMapping: THREE.BufferAttribute =
+        this._boxMesh.geometry.getAttribute('uv');
       const startIndex =
         faceIndex === undefined ? 0 : faceIndexToMaterialIndex[faceIndex] * 4;
       const endIndex =
@@ -149,9 +168,10 @@ namespace gdjs {
           continue;
         }
 
-        const shouldRepeatTexture = this._cube3DRuntimeObject.shouldRepeatTextureOnFaceAtIndex(
-          materialIndexToFaceIndex[materialIndex]
-        );
+        const shouldRepeatTexture =
+          this._cube3DRuntimeObject.shouldRepeatTextureOnFaceAtIndex(
+            materialIndexToFaceIndex[materialIndex]
+          );
 
         const shouldOrientateFacesTowardsY =
           this._cube3DRuntimeObject.getFacesOrientation() === 'Y';
@@ -180,12 +200,10 @@ namespace gdjs {
               if (shouldOrientateFacesTowardsY) {
                 [x, y] = noRepeatTextureVertexIndexToUvMapping[vertexIndex % 4];
               } else {
-                [
-                  x,
-                  y,
-                ] = noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
-                  vertexIndex % 4
-                ];
+                [x, y] =
+                  noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
+                    vertexIndex % 4
+                  ];
               }
             }
             break;
@@ -211,12 +229,10 @@ namespace gdjs {
               if (shouldOrientateFacesTowardsY) {
                 [x, y] = noRepeatTextureVertexIndexToUvMapping[vertexIndex % 4];
               } else {
-                [
-                  x,
-                  y,
-                ] = noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
-                  vertexIndex % 4
-                ];
+                [x, y] =
+                  noRepeatTextureVertexIndexToUvMappingForLeftAndRightFacesTowardsZ[
+                    vertexIndex % 4
+                  ];
                 x = -x;
                 y = -y;
               }

Extensions/3D/CustomRuntimeObject3D.ts

@@ -1,21 +1,11 @@
 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 {
+    implements gdjs.Base3DHandler
+  {
     /**
      * Position on the Z axis.
      */
@@ -41,13 +31,13 @@ namespace gdjs {
 
     constructor(
       parent: gdjs.RuntimeInstanceContainer,
-      objectData: Object3DData & CustomObjectConfiguration
+      objectData: gdjs.Object3DData & gdjs.CustomObjectConfiguration
     ) {
       super(parent, objectData);
       this._renderer.reinitialize(this, parent);
     }
 
-    protected _createRender() {
+    protected override _createRender() {
       const parent = this._runtimeScene;
       return new gdjs.CustomRuntimeObject3DRenderer(
         this,
@@ -56,21 +46,23 @@ namespace gdjs {
       );
     }
 
-    protected _reinitializeRenderer(): void {
+    protected override _reinitializeRenderer(): void {
       this.getRenderer().reinitialize(this, this.getParent());
     }
 
-    getRenderer(): gdjs.CustomRuntimeObject3DRenderer {
+    override getRenderer(): gdjs.CustomRuntimeObject3DRenderer {
       return super.getRenderer() as gdjs.CustomRuntimeObject3DRenderer;
     }
 
-    get3DRendererObject() {
+    override 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) {
+    override extraInitializationFromInitialInstance(
+      initialInstanceData: InstanceData
+    ) {
       super.extraInitializationFromInitialInstance(initialInstanceData);
       if (initialInstanceData.depth !== undefined) {
         this.setDepth(initialInstanceData.depth);
@@ -292,7 +284,7 @@ namespace gdjs {
       return this._maxZ - this._minZ;
     }
 
-    _updateUntransformedHitBoxes(): void {
+    override _updateUntransformedHitBoxes(): void {
       super._updateUntransformedHitBoxes();
 
       let minZ = Number.MAX_VALUE;

Extensions/3D/CustomRuntimeObject3DRenderer.ts

@@ -6,7 +6,8 @@ namespace gdjs {
    * The renderer for a {@link gdjs.CustomRuntimeObject3D} using Three.js.
    */
   export class CustomRuntimeObject3DRenderer
-    implements gdjs.RuntimeInstanceContainerRenderer {
+    implements gdjs.RuntimeInstanceContainerRenderer
+  {
     _object: gdjs.CustomRuntimeObject3D;
     _instanceContainer: gdjs.CustomRuntimeObjectInstanceContainer;
     _isContainerDirty: boolean = true;
@@ -139,16 +140,16 @@ namespace gdjs {
       imageManager: gdjs.PixiImageManager
     ): ThreeAnimationFrameTextureManager {
       if (!imageManager._threeAnimationFrameTextureManager) {
-        imageManager._threeAnimationFrameTextureManager = new ThreeAnimationFrameTextureManager(
-          imageManager
-        );
+        imageManager._threeAnimationFrameTextureManager =
+          new ThreeAnimationFrameTextureManager(imageManager);
       }
       return imageManager._threeAnimationFrameTextureManager;
     }
   }
 
   class ThreeAnimationFrameTextureManager
-    implements gdjs.AnimationFrameTextureManager<THREE.Material> {
+    implements gdjs.AnimationFrameTextureManager<THREE.Material>
+  {
     private _imageManager: gdjs.PixiImageManager;
 
     constructor(imageManager: gdjs.PixiImageManager) {
@@ -159,20 +160,21 @@ namespace gdjs {
       return this._imageManager.getThreeMaterial(imageName, {
         useTransparentTexture: true,
         forceBasicMaterial: true,
+        vertexColors: false,
       });
     }
 
     getAnimationFrameWidth(material: THREE.Material) {
-      const map = (material as
-        | THREE.MeshBasicMaterial
-        | THREE.MeshStandardMaterial).map;
+      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;
+      const map = (
+        material as THREE.MeshBasicMaterial | THREE.MeshStandardMaterial
+      ).map;
       return map ? map.image.height : 0;
     }
   }

Extensions/3D/JsExtension.js

@@ -21,7 +21,9 @@ module.exports = {
       .setExtensionInformation(
         'Scene3D',
         _('3D'),
-        _('Support for 3D in GDevelop.'),
+        _(
+          'Support for 3D in GDevelop: this provides 3D objects and the common features for all 3D objects.'
+        ),
         'Florian Rival',
         'MIT'
       )
@@ -36,7 +38,9 @@ module.exports = {
           'Base3DBehavior',
           _('3D capability'),
           'Object3D',
-          _('Move the object in 3D space.'),
+          _(
+            'Common features for all 3D objects: position in 3D space (including the Z axis, in addition to X and Y), size (including depth, in addition to width and height), rotation (on X and Y axis, in addition to the Z axis), scale (including Z axis, in addition to X and Y), flipping (on Z axis, in addition to horizontal (Y)/vertical (X) flipping).'
+          ),
           '',
           'res/conditions/3d_box.svg',
           'Base3DBehavior',
@@ -69,7 +73,7 @@ module.exports = {
           _('Center Z position'),
           _('the Z position of the center of rotation'),
           _('the Z position of the center'),
-          _('Position/Center'),
+          _('Position ❯ Center'),
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D object'), '', false)
@@ -800,6 +804,20 @@ module.exports = {
         .markAsSimple()
         .setHidden()
         .setFunctionName('hasAnimationEnded');
+
+      object
+        .addScopedAction(
+          'SetCrossfadeDuration',
+          _('Set crossfade duration'),
+          _('Set the crossfade duration when switching to a new animation.'),
+          _('Set crossfade duration of _PARAM0_ to _PARAM1_ seconds'),
+          _('Animations and images'),
+          'res/conditions/animation24.png',
+          'res/conditions/animation.png'
+        )
+        .addParameter('object', _('3D model'), 'Model3DObject', false)
+        .addParameter('number', _('Crossfade duration (in seconds)'), '', false)
+        .setFunctionName('setCrossfadeDuration');
     }
 
     const Cube3DObject = new gd.ObjectJsImplementation();
@@ -822,7 +840,8 @@ module.exports = {
         propertyName === 'bottomFaceResourceName' ||
         propertyName === 'backFaceUpThroughWhichAxisRotation' ||
         propertyName === 'facesOrientation' ||
-        propertyName === 'materialType'
+        propertyName === 'materialType' ||
+        propertyName === 'tint'
       ) {
         objectContent[propertyName] = newValue;
         return true;
@@ -902,6 +921,12 @@ module.exports = {
         .setLabel(_('Depth'))
         .setMeasurementUnit(gd.MeasurementUnit.getPixel())
         .setGroup(_('Default size'));
+      objectProperties
+        .getOrCreate('tint')
+        .setValue(objectContent.tint || '255;255;255')
+        .setType('Color')
+        .setLabel(_('Tint'))
+        .setGroup(_('Texture'));
 
       objectProperties
         .getOrCreate('frontFaceResourceName')
@@ -1092,6 +1117,7 @@ module.exports = {
       topFaceResourceRepeat: false,
       bottomFaceResourceRepeat: false,
       materialType: 'Basic',
+      tint: '255;255;255',
     };
 
     Cube3DObject.updateInitialInstanceProperty = function (
@@ -1568,6 +1594,21 @@ module.exports = {
       .addParameter('imageResource', _('Image'), '', false)
       .setFunctionName('setFaceResourceName');
 
+    object
+      .addScopedAction(
+        'SetTint',
+        _('Tint color'),
+        _('Change the tint of the cube.'),
+        _('Change the tint of _PARAM0_ to _PARAM1_'),
+        _('Effects'),
+        'res/actions/color24.png',
+        'res/actions/color.png'
+      )
+      .addParameter('object', _('3D Cube'), 'Cube3DObject', false)
+      .addParameter('color', _('Tint'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('setColor');
+
     extension
       .addExpressionAndConditionAndAction(
         'number',
@@ -2062,6 +2103,10 @@ module.exports = {
       3: [1, 0],
     };
 
+    /**
+     * @param {*} objectConfiguration
+     * @returns {string | null}
+     */
     const getFirstVisibleFaceResourceName = (objectConfiguration) => {
       const object = gd.castObject(
         objectConfiguration,
@@ -2090,25 +2135,44 @@ module.exports = {
       return null;
     };
 
+    /** @type {THREE.MeshBasicMaterial | null} */
     let transparentMaterial = null;
+    /**
+     * @returns {THREE.MeshBasicMaterial}
+     */
     const getTransparentMaterial = () => {
-      if (!transparentMaterial)
-        transparentMaterial = new THREE.MeshBasicMaterial({
-          transparent: true,
-          opacity: 0,
-          // Set the alpha test to to ensure the faces behind are rendered
-          // (no "back face culling" that would still be done if alphaTest is not set).
-          alphaTest: 1,
-        });
-
-      return transparentMaterial;
+      if (transparentMaterial) {
+        return transparentMaterial;
+      }
+      const newTransparentMaterial = new THREE.MeshBasicMaterial({
+        transparent: true,
+        opacity: 0,
+        // Set the alpha test to to ensure the faces behind are rendered
+        // (no "back face culling" that would still be done if alphaTest is not set).
+        alphaTest: 1,
+      });
+      transparentMaterial = newTransparentMaterial;
+      return newTransparentMaterial;
     };
 
     class RenderedCube3DObject2DInstance extends RenderedInstance {
+      /** @type {number} */
+      _defaultWidth;
+      /** @type {number} */
+      _defaultHeight;
+      /** @type {number} */
+      _defaultDepth;
       /** @type {number} */
       _centerX = 0;
       /** @type {number} */
       _centerY = 0;
+      /**
+       * The name of the resource that is rendered.
+       * If no face is visible, this will be null.
+       * @type {string | null | undefined}
+       */
+      _renderedResourceName = undefined;
+      _renderFallbackObject = false;
 
       constructor(
         project,
@@ -2124,11 +2188,6 @@ module.exports = {
           pixiContainer,
           pixiResourcesLoader
         );
-
-        // Name of the resource that is rendered.
-        // If no face is visible, this will be null.
-        this._renderedResourceName = undefined;
-
         const object = gd.castObject(
           this._associatedObjectConfiguration,
           gd.ObjectJsImplementation
@@ -2145,7 +2204,6 @@ module.exports = {
         this._pixiObject.addChild(this._pixiTexturedObject);
         this._pixiObject.addChild(this._pixiFallbackObject);
         this._pixiContainer.addChild(this._pixiObject);
-        this._renderFallbackObject = false;
         this.updateTexture();
       }
 
@@ -2160,9 +2218,10 @@ module.exports = {
       }
 
       static getThumbnail(project, resourcesLoader, objectConfiguration) {
-        const textureResourceName = RenderedCube3DObject2DInstance._getResourceNameToDisplay(
-          objectConfiguration
-        );
+        const textureResourceName =
+          RenderedCube3DObject2DInstance._getResourceNameToDisplay(
+            objectConfiguration
+          );
         if (textureResourceName) {
           return resourcesLoader.getResourceFullUrl(
             project,
@@ -2174,18 +2233,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;
@@ -2308,6 +2369,17 @@ module.exports = {
     }
 
     class RenderedCube3DObject3DInstance extends Rendered3DInstance {
+      _defaultWidth = 1;
+      _defaultHeight = 1;
+      _defaultDepth = 1;
+      _faceResourceNames = new Array(6).fill(null);
+      _faceVisibilities = new Array(6).fill(null);
+      _shouldRepeatTextureOnFace = new Array(6).fill(null);
+      _facesOrientation = 'Y';
+      _backFaceUpThroughWhichAxisRotation = 'X';
+      _shouldUseTransparentTexture = false;
+      _tint = '';
+
       constructor(
         project,
         instance,
@@ -2324,21 +2396,9 @@ module.exports = {
           threeGroup,
           pixiResourcesLoader
         );
-
-        this._defaultWidth = 1;
-        this._defaultHeight = 1;
-        this._defaultDepth = 1;
-
         this._pixiObject = new PIXI.Graphics();
         this._pixiContainer.addChild(this._pixiObject);
 
-        this._faceResourceNames = new Array(6).fill(null);
-        this._faceVisibilities = new Array(6).fill(null);
-        this._shouldRepeatTextureOnFace = new Array(6).fill(null);
-        this._facesOrientation = 'Y';
-        this._backFaceUpThroughWhichAxisRotation = 'X';
-        this._shouldUseTransparentTexture = false;
-
         const geometry = new THREE.BoxGeometry(1, 1, 1);
         const materials = [
           getTransparentMaterial(),
@@ -2357,8 +2417,9 @@ module.exports = {
 
       async _updateThreeObjectMaterials() {
         const getFaceMaterial = async (project, faceIndex) => {
-          if (!this._faceVisibilities[faceIndex])
+          if (!this._faceVisibilities[faceIndex]) {
             return getTransparentMaterial();
+          }
 
           return await this._pixiResourcesLoader.getThreeMaterial(
             project,
@@ -2389,11 +2450,35 @@ module.exports = {
         this._updateTextureUvMapping();
       }
 
+      _updateTint() {
+        const tints = [];
+        const normalizedTint = objectsRenderingService
+          .hexNumberToRGBArray(
+            objectsRenderingService.rgbOrHexToHexNumber(this._tint)
+          )
+          .map((component) => component / 255);
+
+        for (
+          let i = 0;
+          i < this._threeObject.geometry.attributes.position.count;
+          i++
+        ) {
+          tints.push(...normalizedTint);
+        }
+
+        this._threeObject.geometry.setAttribute(
+          'color',
+          new THREE.BufferAttribute(new Float32Array(tints), 3)
+        );
+      }
+
       static _getResourceNameToDisplay(objectConfiguration) {
         return getFirstVisibleFaceResourceName(objectConfiguration);
       }
 
       updateThreeObject() {
+        /** @type {gdjs.Cube3DObjectData} */
+        //@ts-ignore This works because the properties are set to `content` in JavaScript.
         const object = gd.castObject(
           this._associatedObjectConfiguration,
           gd.ObjectJsImplementation
@@ -2421,13 +2506,19 @@ module.exports = {
 
         let materialsDirty = false;
         let uvMappingDirty = false;
+        let tintDirty = false;
 
         const shouldUseTransparentTexture =
-          object.content.enableTextureTransparency;
+          object.content.enableTextureTransparency || false;
         if (this._shouldUseTransparentTexture !== shouldUseTransparentTexture) {
           this._shouldUseTransparentTexture = shouldUseTransparentTexture;
           materialsDirty = true;
         }
+        const tint = object.content.tint || '255;255;255';
+        if (this._tint !== tint) {
+          this._tint = tint;
+          tintDirty = true;
+        }
 
         const faceResourceNames = [
           object.content.frontFaceResourceName,
@@ -2471,12 +2562,12 @@ module.exports = {
         }
 
         const shouldRepeatTextureOnFace = [
-          object.content.frontFaceResourceRepeat,
-          object.content.backFaceResourceRepeat,
-          object.content.leftFaceResourceRepeat,
-          object.content.rightFaceResourceRepeat,
-          object.content.topFaceResourceRepeat,
-          object.content.bottomFaceResourceRepeat,
+          object.content.frontFaceResourceRepeat || false,
+          object.content.backFaceResourceRepeat || false,
+          object.content.leftFaceResourceRepeat || false,
+          object.content.rightFaceResourceRepeat || false,
+          object.content.topFaceResourceRepeat || false,
+          object.content.bottomFaceResourceRepeat || false,
         ];
         if (
           this._shouldRepeatTextureOnFace[0] !== shouldRepeatTextureOnFace[0] ||
@@ -2491,16 +2582,17 @@ module.exports = {
         }
 
         const backFaceUpThroughWhichAxisRotation =
-          object.content.backFaceUpThroughWhichAxisRotation;
+          object.content.backFaceUpThroughWhichAxisRotation || 'X';
         if (
           backFaceUpThroughWhichAxisRotation !==
           this._backFaceUpThroughWhichAxisRotation
         ) {
-          this._backFaceUpThroughWhichAxisRotation = backFaceUpThroughWhichAxisRotation;
+          this._backFaceUpThroughWhichAxisRotation =
+            backFaceUpThroughWhichAxisRotation;
           uvMappingDirty = true;
         }
 
-        const facesOrientation = object.content.facesOrientation;
+        const facesOrientation = object.content.facesOrientation || 'Y';
         if (facesOrientation !== this._facesOrientation) {
           this._facesOrientation = facesOrientation;
           uvMappingDirty = true;
@@ -2520,6 +2612,7 @@ module.exports = {
 
         if (materialsDirty) this._updateThreeObjectMaterials();
         if (uvMappingDirty) this._updateTextureUvMapping();
+        if (tintDirty) this._updateTint();
       }
 
       /**
@@ -2529,11 +2622,11 @@ module.exports = {
        * for the method to work.
        */
       _updateTextureUvMapping() {
+        /** @type {THREE.BufferAttribute} */
         // @ts-ignore - position is stored as a Float32BufferAttribute
-        /** @type {THREE.BufferAttribute} */
         const pos = this._threeObject.geometry.getAttribute('position');
-        // @ts-ignore - uv is stored as a Float32BufferAttribute
         /** @type {THREE.BufferAttribute} */
+        // @ts-ignore - uv is stored as a Float32BufferAttribute
         const uvMapping = this._threeObject.geometry.getAttribute('uv');
         const startIndex = 0;
         const endIndex = 23;
@@ -2552,9 +2645,10 @@ module.exports = {
             continue;
           }
 
-          const shouldRepeatTexture = this._shouldRepeatTextureOnFace[
-            materialIndexToFaceIndex[materialIndex]
-          ];
+          const shouldRepeatTexture =
+            this._shouldRepeatTextureOnFace[
+              materialIndexToFaceIndex[materialIndex]
+            ];
 
           const shouldOrientateFacesTowardsY = this._facesOrientation === 'Y';
 
@@ -2589,16 +2683,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;
@@ -2628,16 +2719,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;
                 }
@@ -2786,6 +2874,19 @@ module.exports = {
     const epsilon = 1 / (1 << 16);
 
     class Model3DRendered2DInstance extends RenderedInstance {
+      /** @type {number} */
+      _defaultWidth;
+      /** @type {number} */
+      _defaultHeight;
+      /** @type {number} */
+      _defaultDepth;
+
+      /** @type {[number, number, number] | null} */
+      _originPoint;
+      /** @type {[number, number, number] | null} */
+      _centerPoint;
+
+      /** @type {[number, number, number]} */
       _modelOriginPoint = [0, 0, 0];
 
       constructor(
@@ -3028,10 +3129,15 @@ module.exports = {
       }
     }
 
+    /**
+     * @param {[number, number, number] | null} point1
+     * @param {[number, number, number] | null} point2
+     * @returns {boolean}
+     */
     const isSamePoint = (point1, point2) => {
-      if (!point1 && !point2) return true;
-      if (point1 && !point2) return false;
-      if (!point1 && point2) return false;
+      if (!!point1 !== !!point2) return false;
+      // At this point || or && doesn't matter and the type checking prefer ||.
+      if (!point1 || !point2) return true;
       return (
         point1[0] === point2[0] &&
         point1[1] === point2[1] &&
@@ -3039,6 +3145,10 @@ module.exports = {
       );
     };
 
+    /**
+     * @param {string} location
+     * @returns {[number, number, number] | null}
+     */
     const getPointForLocation = (location) => {
       switch (location) {
         case 'ModelOrigin':
@@ -3057,8 +3167,27 @@ module.exports = {
     };
 
     class Model3DRendered3DInstance extends Rendered3DInstance {
+      _defaultWidth = 1;
+      _defaultHeight = 1;
+      _defaultDepth = 1;
+      _originalWidth = 1;
+      _originalHeight = 1;
+      _originalDepth = 1;
+      _rotationX = 0;
+      _rotationY = 0;
+      _rotationZ = 0;
+      _keepAspectRatio = false;
+      /** @type {[number, number, number] | null} */
+      _originPoint = null;
+      /** @type {[number, number, number] | null} */
+      _centerPoint = null;
+
+      /** @type {[number, number, number]} */
       _modelOriginPoint = [0, 0, 0];
 
+      /** @type {THREE.Object3D | null} */
+      _clonedModel3D = null;
+
       constructor(
         project,
         instance,
@@ -3076,29 +3205,12 @@ module.exports = {
           pixiResourcesLoader
         );
 
-        this._defaultWidth = 1;
-        this._defaultHeight = 1;
-        this._defaultDepth = 1;
-        this._originalWidth = 1;
-        this._originalHeight = 1;
-        this._originalDepth = 1;
-        this._rotationX = 0;
-        this._rotationY = 0;
-        this._rotationZ = 0;
-        this._keepAspectRatio = false;
-
-        this._originPoint = null;
-        this._centerPoint = null;
-
         this._pixiObject = new PIXI.Graphics();
         this._pixiContainer.addChild(this._pixiObject);
 
         this._threeObject = new THREE.Group();
         this._threeObject.rotation.order = 'ZYX';
         this._threeGroup.add(this._threeObject);
-
-        this._threeModelGroup = null;
-        this._clonedModel3D = null;
       }
 
       getOriginX() {
@@ -3140,27 +3252,30 @@ module.exports = {
       }
 
       _updateDefaultTransformation() {
-        if (!this._clonedModel3D) return; // Model is not ready - nothing to do.
+        if (!this._clonedModel3D) {
+          // Model is not ready - nothing to do.
+          return;
+        }
 
         if (this._threeModelGroup) {
           // Remove any previous container as we will recreate it just below
           this._threeObject.clear();
         }
+
         // This group hold the rotation defined by properties.
         // Always restart from a new group to avoid miscomputing bounding boxes/sizes.
-        this._threeModelGroup = new THREE.Group();
-        this._threeModelGroup.rotation.order = 'ZYX';
-        this._threeModelGroup.add(this._clonedModel3D);
+        const threeModelGroup = new THREE.Group();
+        this._threeModelGroup = threeModelGroup;
+        threeModelGroup.rotation.order = 'ZYX';
+        threeModelGroup.add(this._clonedModel3D);
 
-        this._threeModelGroup.rotation.set(
+        threeModelGroup.rotation.set(
           (this._rotationX * Math.PI) / 180,
           (this._rotationY * Math.PI) / 180,
           (this._rotationZ * Math.PI) / 180
         );
-        this._threeModelGroup.updateMatrixWorld(true);
-        const boundingBox = new THREE.Box3().setFromObject(
-          this._threeModelGroup
-        );
+        threeModelGroup.updateMatrixWorld(true);
+        const boundingBox = new THREE.Box3().setFromObject(threeModelGroup);
 
         const shouldKeepModelOrigin = !this._originPoint;
         if (shouldKeepModelOrigin) {
@@ -3187,7 +3302,7 @@ module.exports = {
         // Center the model.
         const centerPoint = this._centerPoint;
         if (centerPoint) {
-          this._threeModelGroup.position.set(
+          threeModelGroup.position.set(
             -(boundingBox.min.x + modelWidth * centerPoint[0]),
             // The model is flipped on Y axis.
             -(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
@@ -3196,8 +3311,8 @@ module.exports = {
         }
 
         // Rotate the model.
-        this._threeModelGroup.scale.set(1, 1, 1);
-        this._threeModelGroup.rotation.set(
+        threeModelGroup.scale.set(1, 1, 1);
+        threeModelGroup.rotation.set(
           (this._rotationX * Math.PI) / 180,
           (this._rotationY * Math.PI) / 180,
           (this._rotationZ * Math.PI) / 180
@@ -3212,8 +3327,8 @@ module.exports = {
         // Flip on Y because the Y axis is on the opposite side of direct basis.
         // It avoids models to be like a mirror refection.
         scaleMatrix.makeScale(scaleX, -scaleY, scaleZ);
-        this._threeModelGroup.updateMatrix();
-        this._threeModelGroup.applyMatrix4(scaleMatrix);
+        threeModelGroup.updateMatrix();
+        threeModelGroup.applyMatrix4(scaleMatrix);
 
         if (this._keepAspectRatio) {
           // Reduce the object dimensions to keep aspect ratio.
@@ -3280,7 +3395,7 @@ module.exports = {
           this._defaultDepth = this._originalDepth;
         }
 
-        this._threeObject.add(this._threeModelGroup);
+        this._threeObject.add(threeModelGroup);
       }
 
       updateThreeObject() {

Extensions/3D/Model3DObjectConfiguration.cpp

@@ -23,7 +23,7 @@ Model3DObjectConfiguration::Model3DObjectConfiguration()
     : width(100), height(100), depth(100), rotationX(0), rotationY(0),
       rotationZ(0), modelResourceName(""), materialType("StandardWithoutMetalness"),
       originLocation("ModelOrigin"), centerLocation("ModelOrigin"),
-      keepAspectRatio(true) {}
+      keepAspectRatio(true), crossfadeDuration(0.1f) {}
 
 bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
                                                 const gd::String &newValue) {
@@ -71,6 +71,10 @@ bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
     keepAspectRatio = newValue == "1";
     return true;
   }
+  if(propertyName == "crossfadeDuration") {
+    crossfadeDuration = newValue.To<double>();
+    return true;
+  }
 
   return false;
 }
@@ -167,6 +171,13 @@ Model3DObjectConfiguration::GetProperties() const {
       .SetGroup(_("Points"))
       .SetAdvanced(true);
 
+  objectProperties["crossfadeDuration"]
+      .SetValue(gd::String::From(crossfadeDuration))
+      .SetType("number")
+      .SetLabel(_("Crossfade duration"))
+      .SetGroup(_("Animations"))
+      .SetMeasurementUnit(gd::MeasurementUnit::GetSecond());
+
   return objectProperties;
 }
 
@@ -198,6 +209,7 @@ void Model3DObjectConfiguration::DoUnserializeFrom(
   originLocation = content.GetStringAttribute("originLocation");
   centerLocation = content.GetStringAttribute("centerLocation");
   keepAspectRatio = content.GetBoolAttribute("keepAspectRatio");
+  crossfadeDuration = content.GetDoubleAttribute("crossfadeDuration");
 
   RemoveAllAnimations();
   auto &animationsElement = content.GetChild("animations");
@@ -226,6 +238,7 @@ void Model3DObjectConfiguration::DoSerializeTo(
   content.SetAttribute("originLocation", originLocation);
   content.SetAttribute("centerLocation", centerLocation);
   content.SetAttribute("keepAspectRatio", keepAspectRatio);
+  content.SetAttribute("crossfadeDuration", crossfadeDuration);
 
   auto &animationsElement = content.AddChild("animations");
   animationsElement.ConsiderAsArrayOf("animation");

Extensions/3D/Model3DObjectConfiguration.h

@@ -152,6 +152,7 @@ public:
   double GetRotationX() const { return rotationX; };
   double GetRotationY() const { return rotationY; };
   double GetRotationZ() const { return rotationZ; };
+  double GetCrossfadeDuration() const { return crossfadeDuration; };
 
   const gd::String& GetModelResourceName() const { return modelResourceName; };
   const gd::String& GetMaterialType() const { return materialType; };
@@ -173,6 +174,7 @@ private:
   double rotationX;
   double rotationY;
   double rotationZ;
+  double crossfadeDuration;
 
   gd::String modelResourceName;
   gd::String materialType;

Extensions/3D/Model3DRuntimeObject.ts

@@ -9,6 +9,7 @@ namespace gdjs {
     ai: integer;
     ass: float;
     ap: boolean;
+    cfd: float;
   };
 
   type Model3DObjectNetworkSyncData = Object3DNetworkSyncData &
@@ -36,6 +37,7 @@ namespace gdjs {
         | 'BottomCenterZ'
         | 'BottomCenterY';
       animations: Model3DAnimation[];
+      crossfadeDuration: float;
     };
   }
 
@@ -63,7 +65,8 @@ namespace gdjs {
    */
   export class Model3DRuntimeObject
     extends gdjs.RuntimeObject3D
-    implements gdjs.Animatable {
+    implements gdjs.Animatable
+  {
     _renderer: gdjs.Model3DRuntimeObjectRenderer;
 
     _modelResourceName: string;
@@ -97,6 +100,7 @@ namespace gdjs {
     _currentAnimationIndex: integer = 0;
     _animationSpeedScale: float = 1;
     _animationPaused: boolean = false;
+    _crossfadeDuration: float = 0;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -121,6 +125,8 @@ namespace gdjs {
 
       this.onModelChanged(objectData);
 
+      this._crossfadeDuration = objectData.content.crossfadeDuration || 0;
+
       // *ALWAYS* call `this.onCreated()` at the very end of your object constructor.
       this.onCreated();
     }
@@ -202,6 +208,7 @@ namespace gdjs {
         ai: this._currentAnimationIndex,
         ass: this._animationSpeedScale,
         ap: this._animationPaused,
+        cfd: this._crossfadeDuration,
       };
     }
 
@@ -233,6 +240,9 @@ namespace gdjs {
           networkSyncData.ap ? this.pauseAnimation() : this.resumeAnimation();
         }
       }
+      if (networkSyncData.cfd !== undefined) {
+        this._crossfadeDuration = networkSyncData.cfd;
+      }
     }
 
     _reloadModel(objectData: Model3DObjectData) {
@@ -275,7 +285,7 @@ namespace gdjs {
 
     update(instanceContainer: gdjs.RuntimeInstanceContainer): void {
       const elapsedTime = this.getElapsedTime() / 1000;
-      this._renderer.updateAnimation(elapsedTime * this._animationSpeedScale);
+      this._renderer.updateAnimation(elapsedTime);
     }
 
     /**
@@ -348,6 +358,11 @@ namespace gdjs {
       return this._renderer.hasAnimationEnded();
     }
 
+    setCrossfadeDuration(duration: number): void {
+      if (this._crossfadeDuration === duration) return;
+      this._crossfadeDuration = duration;
+    }
+
     isAnimationPaused() {
       return this._animationPaused;
     }
@@ -368,6 +383,7 @@ namespace gdjs {
 
     setAnimationSpeedScale(ratio: float): void {
       this._animationSpeedScale = ratio;
+      this._renderer.setAnimationTimeScale(ratio);
     }
 
     getAnimationElapsedTime(): float {

Extensions/3D/Model3DRuntimeObject3DRenderer.ts

@@ -359,7 +359,6 @@ namespace gdjs {
     }
 
     playAnimation(animationName: string, shouldLoop: boolean) {
-      this._animationMixer.stopAllAction();
       const clip = THREE.AnimationClip.findByName(
         this._originalModel.animations,
         animationName
@@ -370,12 +369,27 @@ namespace gdjs {
         );
         return;
       }
+      const previousAction = this._action;
       this._action = this._animationMixer.clipAction(clip);
+      // Reset the animation and play it from the start.
+      // `clipAction` always gives back the same action for a given animation
+      // and its likely to be in a finished or at least started state.
+      this._action.reset();
       this._action.setLoop(
         shouldLoop ? THREE.LoopRepeat : THREE.LoopOnce,
         Number.POSITIVE_INFINITY
       );
       this._action.clampWhenFinished = true;
+      this._action.timeScale =
+        this._model3DRuntimeObject.getAnimationSpeedScale();
+
+      if (previousAction && previousAction !== this._action) {
+        this._action.crossFadeFrom(
+          previousAction,
+          this._model3DRuntimeObject._crossfadeDuration,
+          false
+        );
+      }
       this._action.play();
       // Make sure the first frame is displayed.
       this._animationMixer.update(0);
@@ -391,6 +405,12 @@ namespace gdjs {
       }
     }
 
+    setAnimationTimeScale(timeScale: float): void {
+      if (this._action) {
+        this._action.timeScale = timeScale;
+      }
+    }
+
     getAnimationDuration(animationName: string): float {
       const clip = THREE.AnimationClip.findByName(
         this._originalModel.animations,

Extensions/AdMob/JsExtension.js

@@ -38,7 +38,7 @@ module.exports = {
       .setName('Consent Cordova plugin')
       .setDependencyType('cordova')
       .setExportName('cordova-plugin-consent')
-      .setVersion('3.0.0-alpha.8')
+      .setVersion('3.0.0-alpha.9')
       .onlyIfOtherDependencyIsExported('AdMob Cordova plugin');
 
     extension
@@ -93,6 +93,68 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.setTestMode');
 
+    extension
+      .addAction(
+        'PreventAdmobAutoInitialization',
+        _('Prevent AdMob auto initialization'),
+        _(
+          'Prevent AdMob from initializing automatically. You will need to call "Initialize AdMob" action manually.\n' +
+            'This is useful if you want to control when the consent dialog will be shown (for example, after the user has accepted your game terms).'
+        ),
+        _('Prevent AdMob auto initialization'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.preventAdmobAutoInitialization');
+
+    extension
+      .addAction(
+        'InitializeAdmob',
+        _('Initialize AdMob manually'),
+        _(
+          'Initialize AdMob manually. This will trigger the consent dialog if needed, and then load the ads.\n' +
+            'Use this action if you have disabled the auto init and want to control when the consent dialog will be shown.'
+        ),
+        _('Initialize AdMob'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.initializeAdmob');
+
+    extension
+      .addCondition(
+        'AdmobInitializing',
+        _('AdMob initializing'),
+        _('Check if AdMob is initializing.'),
+        _('AdMob is initializing'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAdmobInitializing');
+
+    extension
+      .addCondition(
+        'AdmobInitialized',
+        _('AdMob initialized'),
+        _('Check if AdMob has been initialized.'),
+        _('AdMob has been initialized'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAdmobInitialized');
+
     // App Open
     extension
       .addCondition(

Extensions/AdMob/admobtools.ts

@@ -1,6 +1,7 @@
 namespace gdjs {
   declare var admob: any;
   declare var cordova: any;
+  declare var consent: any;
 
   export namespace adMob {
     const logger = new gdjs.Logger('AdMob');
@@ -108,26 +109,119 @@ namespace gdjs {
     let rewardedVideoRewardReceived = false; // Becomes true when the video is closed and the reward is received.
     let rewardedVideoErrored = false; // Becomes true when the video fails to load.
 
-    let npaValue = '0'; // TODO: expose an API to change this and also an automatic way using the consent SDK.
+    let npaValue = '0'; // 0 means that the user has consented to personalized ads, 1 means that the user has not consented to personalized ads.
+
+    let setupTimeoutId: NodeJS.Timeout | null = null;
+
+    const askForConsentAndInitializeAdmob = async () => {
+      if (admobStarted) {
+        logger.warn('AdMob is already started.');
+        return;
+      }
+
+      if (isStarting) {
+        logger.warn('AdMob is already starting.');
+        return;
+      }
+
+      try {
+        logger.info('Starting AdMob.');
+        isStarting = true;
+
+        if (cordova.platformId === 'ios') {
+          try {
+            /*
+            trackingStatus:
+            0 = notDetermined
+            1 = restricted
+            2 = denied
+            3 = authorized
+          */
+            let trackingStatus = await consent.trackingAuthorizationStatus();
+
+            // If tracking is not determined, we ask the user for tracking authorization.
+            if (trackingStatus === 0) {
+              trackingStatus = await consent.requestTrackingAuthorization();
+            }
+
+            // If tracking is restricted or denied, we set npaValue to 1.
+            if (trackingStatus === 1 || trackingStatus === 2) {
+              npaValue = '1';
+            }
+
+            // otherwise, we set npaValue to 0.
+            npaValue = '0';
+          } catch (error) {
+            logger.error(
+              'Error while asking for tracking authorization, continuing:',
+              error
+            );
+          }
+        }
+
+        try {
+          // ConsentStatus:
+          // Unknown = 0,
+          // Required = 1,
+          // NotRequired = 2,
+          // Obtained = 3,
+          const consentStatus = await consent.getConsentStatus();
+          if (consentStatus === consent.ConsentStatus.Required) {
+            await consent.requestInfoUpdate();
+          }
+          await consent.loadAndShowIfRequired();
+        } catch (error) {
+          logger.error('Error while asking for consent, continuing:', error);
+        }
+
+        // We should be looking at canRequestAds to know if we can request ads or not.
+        // But as we want to be able to test ads in debug or if the consent didn't work,
+        // we ignore this value for now.
+        // const canRequestAds = await consent.canRequestAds();
+        if (true) {
+          await admob.start();
+
+          logger.info('AdMob successfully started.');
+          isStarting = false;
+          admobStarted = true;
+        }
+      } catch (error) {
+        logger.error('Error while starting AdMob:', error);
+        isStarting = false;
+        admobStarted = false;
+      }
+    };
 
     // Admob initialization listener
     document.addEventListener(
       'deviceready',
       async () => {
-        // Obtain user consent ?
-
-        logger.info('Starting AdMob.');
         isStarting = true;
-
-        await admob.start();
-
-        logger.info('AdMob successfully started.');
-        isStarting = false;
-        admobStarted = true;
+        setupTimeoutId = setTimeout(async () => {
+          isStarting = false; // Reset to false, as it will be set to true in askForConsentAndInitializeAdmob.
+          await askForConsentAndInitializeAdmob();
+          // Wait a bit before starting admob, to avoid the consent appearing too soon.
+        }, 2000);
       },
       false
     );
 
+    export const preventAdmobAutoInitialization = () => {
+      if (setupTimeoutId) {
+        isStarting = false;
+        clearTimeout(setupTimeoutId);
+        setupTimeoutId = null;
+      }
+    };
+
+    export const initializeAdmob = async () => {
+      preventAdmobAutoInitialization();
+      await askForConsentAndInitializeAdmob();
+    };
+
+    export const isAdmobInitialized = () => admobStarted;
+    export const isAdmobInitializing = () => isStarting;
+
     /**
      * Helper to know if we are on mobile and admob is correctly initialized.
      */
@@ -334,6 +428,7 @@ namespace gdjs {
         position: atTop ? 'top' : 'bottom',
         size: bannerRequestedAdSizeType,
         offset: 0,
+        npa: npaValue,
       });
 
       banner.on('load', () => {

Extensions/AdvancedWindow/electron-advancedwindowtools.ts

@@ -1,10 +1,10 @@
 namespace gdjs {
-  /**
-   * Tools to manipulate the game window positioning and
-   * interactions with the operating system.
-   * @author arthuro555
-   */
   export namespace evtTools {
+    /**
+     * Tools to manipulate the game window positioning and
+     * interactions with the operating system.
+     * @author arthuro555
+     */
     export namespace advancedWindow {
       const getElectronBrowserWindow = (runtimeScene: gdjs.RuntimeScene) => {
         try {

Extensions/AnchorBehavior/anchorruntimebehavior.ts

@@ -20,25 +20,41 @@ namespace gdjs {
   }
 
   export class AnchorRuntimeBehavior extends gdjs.RuntimeBehavior {
-    _relativeToOriginalWindowSize: any;
+    // Configuration
+
+    _relativeToOriginalWindowSize: boolean;
     _leftEdgeAnchor: HorizontalAnchor;
     _rightEdgeAnchor: HorizontalAnchor;
-    _topEdgeAnchor: any;
-    _bottomEdgeAnchor: any;
-    _invalidDistances: boolean = true;
-    _leftEdgeDistance: number = 0;
-    _rightEdgeDistance: number = 0;
-    _topEdgeDistance: number = 0;
-    _bottomEdgeDistance: number = 0;
+    _topEdgeAnchor: VerticalAnchor;
+    _bottomEdgeAnchor: VerticalAnchor;
     _useLegacyBottomAndRightAnchors: boolean = false;
 
+    // State
+
+    _hasJustBeenCreated: boolean = true;
+    _leftEdgeDistance: float = 0;
+    _rightEdgeDistance: float = 0;
+    _topEdgeDistance: float = 0;
+    _bottomEdgeDistance: float = 0;
+
+    _oldDrawableX: float = 0;
+    _oldDrawableY: float = 0;
+    _oldWidth: float = 0;
+    _oldHeight: float = 0;
+
+    _parentOldMinX: float = 0;
+    _parentOldMinY: float = 0;
+    _parentOldMaxX: float = 0;
+    _parentOldMaxY: float = 0;
+
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
       behaviorData,
       owner: gdjs.RuntimeObject
     ) {
       super(instanceContainer, behaviorData, owner);
-      this._relativeToOriginalWindowSize = !!behaviorData.relativeToOriginalWindowSize;
+      this._relativeToOriginalWindowSize =
+        !!behaviorData.relativeToOriginalWindowSize;
       this._leftEdgeAnchor = behaviorData.leftEdgeAnchor;
       this._rightEdgeAnchor = behaviorData.rightEdgeAnchor;
       this._topEdgeAnchor = behaviorData.topEdgeAnchor;
@@ -49,7 +65,7 @@ namespace gdjs {
           : behaviorData.useLegacyBottomAndRightAnchors;
     }
 
-    updateFromBehaviorData(oldBehaviorData, newBehaviorData): boolean {
+    override updateFromBehaviorData(oldBehaviorData, newBehaviorData): boolean {
       if (oldBehaviorData.leftEdgeAnchor !== newBehaviorData.leftEdgeAnchor) {
         this._leftEdgeAnchor = newBehaviorData.leftEdgeAnchor;
       }
@@ -80,266 +96,381 @@ namespace gdjs {
       return true;
     }
 
-    onActivate() {
-      this._invalidDistances = true;
+    override onActivate(): void {
+      // This only has a side effect if the camera moved while the behavior was
+      // deactivated.
+      // The new position on the viewport is where the object should stay.
+      this._hasJustBeenCreated = true;
     }
 
-    doStepPreEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
+    override doStepPreEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
+      if (this._hasJustBeenCreated) {
+        this._initializeAnchorDistances(instanceContainer);
+        this._hasJustBeenCreated = false;
+
+        this._oldDrawableX = this.owner.getDrawableX();
+        this._oldDrawableY = this.owner.getDrawableY();
+        this._oldWidth = this.owner.getWidth();
+        this._oldHeight = this.owner.getHeight();
+      }
+      this._updateAnchorDistances(instanceContainer);
+      this._followAnchor(instanceContainer);
+
+      this._oldDrawableX = this.owner.getDrawableX();
+      this._oldDrawableY = this.owner.getDrawableY();
+      this._oldWidth = this.owner.getWidth();
+      this._oldHeight = this.owner.getHeight();
+    }
+
+    /**
+     * Evaluate the anchor distance according to the object position on the
+     * screen.
+     *
+     * The camera is taken into account.
+     */
+    private _initializeAnchorDistances(
+      instanceContainer: gdjs.RuntimeInstanceContainer
+    ) {
       const workingPoint: FloatPoint = gdjs.staticArray(
         gdjs.AnchorRuntimeBehavior.prototype.doStepPreEvents
       ) as FloatPoint;
+      const layer = instanceContainer.getLayer(this.owner.getLayer());
+
+      if (this._relativeToOriginalWindowSize) {
+        this._parentOldMinX =
+          instanceContainer.getInitialUnrotatedViewportMinX();
+        this._parentOldMinY =
+          instanceContainer.getInitialUnrotatedViewportMinY();
+        this._parentOldMaxX =
+          instanceContainer.getInitialUnrotatedViewportMaxX();
+        this._parentOldMaxY =
+          instanceContainer.getInitialUnrotatedViewportMaxY();
+      } else {
+        this._parentOldMinX = instanceContainer.getUnrotatedViewportMinX();
+        this._parentOldMinY = instanceContainer.getUnrotatedViewportMinY();
+        this._parentOldMaxX = instanceContainer.getUnrotatedViewportMaxX();
+        this._parentOldMaxY = instanceContainer.getUnrotatedViewportMaxY();
+      }
+      const parentMinX = this._parentOldMinX;
+      const parentMinY = this._parentOldMinY;
+      const parentMaxX = this._parentOldMaxX;
+      const parentMaxY = this._parentOldMaxY;
+
+      const parentCenterX = (parentMaxX + parentMinX) / 2;
+      const parentCenterY = (parentMaxY + parentMinY) / 2;
+      const parentWidth = parentMaxX - parentMinX;
+      const parentHeight = parentMaxY - parentMinY;
+
+      // Calculate the distances from the window's bounds.
+      const topLeftPixel = this._convertInverseCoords(
+        instanceContainer,
+        layer,
+        this.owner.getDrawableX(),
+        this.owner.getDrawableY(),
+        workingPoint
+      );
+
+      // Left edge
+      if (this._leftEdgeAnchor === HorizontalAnchor.WindowLeft) {
+        this._leftEdgeDistance = topLeftPixel[0] - parentMinX;
+      } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowRight) {
+        this._leftEdgeDistance = topLeftPixel[0] - parentMaxX;
+      } else if (this._leftEdgeAnchor === HorizontalAnchor.Proportional) {
+        this._leftEdgeDistance = (topLeftPixel[0] - parentMinX) / parentWidth;
+      } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowCenter) {
+        this._leftEdgeDistance = topLeftPixel[0] - parentCenterX;
+      }
+
+      // Top edge
+      if (this._topEdgeAnchor === VerticalAnchor.WindowTop) {
+        this._topEdgeDistance = topLeftPixel[1] - parentMinY;
+      } else if (this._topEdgeAnchor === VerticalAnchor.WindowBottom) {
+        this._topEdgeDistance = topLeftPixel[1] - parentMaxY;
+      } else if (this._topEdgeAnchor === VerticalAnchor.Proportional) {
+        this._topEdgeDistance = (topLeftPixel[1] - parentMinY) / parentHeight;
+      } else if (this._topEdgeAnchor === VerticalAnchor.WindowCenter) {
+        this._topEdgeDistance = topLeftPixel[1] - parentCenterY;
+      }
+
+      // It's fine to reuse workingPoint as topLeftPixel is no longer used.
+      const bottomRightPixel = this._convertInverseCoords(
+        instanceContainer,
+        layer,
+        this.owner.getDrawableX() + this.owner.getWidth(),
+        this.owner.getDrawableY() + this.owner.getHeight(),
+        workingPoint
+      );
+
+      // Right edge
+      if (this._rightEdgeAnchor === HorizontalAnchor.WindowLeft) {
+        this._rightEdgeDistance = bottomRightPixel[0] - parentMinX;
+      } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowRight) {
+        this._rightEdgeDistance = bottomRightPixel[0] - parentMaxX;
+      } else if (this._rightEdgeAnchor === HorizontalAnchor.Proportional) {
+        this._rightEdgeDistance =
+          (bottomRightPixel[0] - parentMinX) / parentWidth;
+      } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowCenter) {
+        this._rightEdgeDistance = bottomRightPixel[0] - parentCenterX;
+      }
+
+      // Bottom edge
+      if (this._bottomEdgeAnchor === VerticalAnchor.WindowTop) {
+        this._bottomEdgeDistance = bottomRightPixel[1] - parentMinY;
+      } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowBottom) {
+        this._bottomEdgeDistance = bottomRightPixel[1] - parentMaxY;
+      } else if (this._bottomEdgeAnchor === VerticalAnchor.Proportional) {
+        this._bottomEdgeDistance =
+          (bottomRightPixel[1] - parentMinY) / parentHeight;
+      } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowCenter) {
+        this._bottomEdgeDistance = bottomRightPixel[1] - parentCenterY;
+      }
+    }
+
+    /**
+     * Update the anchor distances according to the object position change in
+     * the scene.
+     *
+     * The camera is not taken into account. Indeed, a camera scrolling should
+     * not shift the anchored object on screen.
+     */
+    private _updateAnchorDistances(
+      instanceContainer: gdjs.RuntimeInstanceContainer
+    ) {
+      if (
+        this._oldDrawableX !== this.owner.getDrawableX() ||
+        this._oldWidth !== this.owner.getWidth()
+      ) {
+        const parentOldWidth = this._parentOldMaxX - this._parentOldMinX;
+
+        // Left edge
+        const deltaMinX = this.owner.getDrawableX() - this._oldDrawableX;
+        if (this._leftEdgeAnchor === HorizontalAnchor.Proportional) {
+          this._leftEdgeDistance += deltaMinX / parentOldWidth;
+        } else {
+          this._leftEdgeDistance += deltaMinX;
+        }
+
+        // Right edge
+        const deltaMaxX = deltaMinX + this.owner.getWidth() - this._oldWidth;
+        if (this._rightEdgeAnchor === HorizontalAnchor.Proportional) {
+          this._rightEdgeDistance += deltaMaxX / parentOldWidth;
+        } else {
+          this._rightEdgeDistance += deltaMaxX;
+        }
+      }
+      if (
+        this._oldDrawableY !== this.owner.getDrawableY() ||
+        this._oldHeight !== this.owner.getHeight()
+      ) {
+        const parentOldHeight = this._parentOldMaxY - this._parentOldMinY;
+
+        // Top edge
+        const deltaMinY = this.owner.getDrawableY() - this._oldDrawableY;
+        if (this._topEdgeAnchor === VerticalAnchor.Proportional) {
+          this._topEdgeDistance += deltaMinY / parentOldHeight;
+        } else {
+          this._topEdgeDistance += deltaMinY;
+        }
+
+        // Bottom edge
+        const deltaMaxY = deltaMinY + this.owner.getHeight() - this._oldHeight;
+        if (this._bottomEdgeAnchor === VerticalAnchor.Proportional) {
+          this._bottomEdgeDistance += deltaMaxY / parentOldHeight;
+        } else {
+          this._bottomEdgeDistance += deltaMaxY;
+        }
+      }
+    }
+
+    /**
+     * Update the object position to keep the object on screen according to the
+     * anchor distances.
+     *
+     * The camera is taken into account.
+     */
+    private _followAnchor(instanceContainer: gdjs.RuntimeInstanceContainer) {
       let parentMinX = instanceContainer.getUnrotatedViewportMinX();
       let parentMinY = instanceContainer.getUnrotatedViewportMinY();
       let parentMaxX = instanceContainer.getUnrotatedViewportMaxX();
       let parentMaxY = instanceContainer.getUnrotatedViewportMaxY();
-      let parentCenterX = (parentMaxX + parentMinX) / 2;
-      let parentCenterY = (parentMaxY + parentMinY) / 2;
-      let parentWidth = parentMaxX - parentMinX;
-      let parentHeight = parentMaxY - parentMinY;
+
+      if (
+        this._parentOldMinX === parentMinX &&
+        this._parentOldMinY === parentMinY &&
+        this._parentOldMaxX === parentMaxX &&
+        this._parentOldMaxY === parentMaxY
+      ) {
+        return;
+      }
+
+      const workingPoint: FloatPoint = gdjs.staticArray(
+        gdjs.AnchorRuntimeBehavior.prototype.doStepPreEvents
+      ) as FloatPoint;
       const layer = instanceContainer.getLayer(this.owner.getLayer());
-      if (this._invalidDistances) {
-        if (this._relativeToOriginalWindowSize) {
-          parentMinX = instanceContainer.getInitialUnrotatedViewportMinX();
-          parentMinY = instanceContainer.getInitialUnrotatedViewportMinY();
-          parentMaxX = instanceContainer.getInitialUnrotatedViewportMaxX();
-          parentMaxY = instanceContainer.getInitialUnrotatedViewportMaxY();
-          parentCenterX = (parentMaxX + parentMinX) / 2;
-          parentCenterY = (parentMaxY + parentMinY) / 2;
-          parentWidth = parentMaxX - parentMinX;
-          parentHeight = parentMaxY - parentMinY;
+
+      const parentCenterX = (parentMaxX + parentMinX) / 2;
+      const parentCenterY = (parentMaxY + parentMinY) / 2;
+      const parentWidth = parentMaxX - parentMinX;
+      const parentHeight = parentMaxY - parentMinY;
+
+      //Move and resize the object if needed
+      let leftPixel = 0;
+      let topPixel = 0;
+      let rightPixel = 0;
+      let bottomPixel = 0;
+
+      // Left edge
+      if (this._leftEdgeAnchor === HorizontalAnchor.WindowLeft) {
+        leftPixel = parentMinX + this._leftEdgeDistance;
+      } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowRight) {
+        leftPixel = parentMaxX + this._leftEdgeDistance;
+      } else if (this._leftEdgeAnchor === HorizontalAnchor.Proportional) {
+        leftPixel = parentMinX + this._leftEdgeDistance * parentWidth;
+      } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowCenter) {
+        leftPixel = parentCenterX + this._leftEdgeDistance;
+      }
+
+      // Top edge
+      if (this._topEdgeAnchor === VerticalAnchor.WindowTop) {
+        topPixel = parentMinY + this._topEdgeDistance;
+      } else if (this._topEdgeAnchor === VerticalAnchor.WindowBottom) {
+        topPixel = parentMaxY + this._topEdgeDistance;
+      } else if (this._topEdgeAnchor === VerticalAnchor.Proportional) {
+        topPixel = parentMinY + this._topEdgeDistance * parentHeight;
+      } else if (this._topEdgeAnchor === VerticalAnchor.WindowCenter) {
+        topPixel = parentCenterY + this._topEdgeDistance;
+      }
+
+      // Right edge
+      if (this._rightEdgeAnchor === HorizontalAnchor.WindowLeft) {
+        rightPixel = parentMinX + this._rightEdgeDistance;
+      } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowRight) {
+        rightPixel = parentMaxX + this._rightEdgeDistance;
+      } else if (this._rightEdgeAnchor === HorizontalAnchor.Proportional) {
+        rightPixel = parentMinX + this._rightEdgeDistance * parentWidth;
+      } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowCenter) {
+        rightPixel = parentCenterX + this._rightEdgeDistance;
+      }
+
+      // Bottom edge
+      if (this._bottomEdgeAnchor === VerticalAnchor.WindowTop) {
+        bottomPixel = parentMinY + this._bottomEdgeDistance;
+      } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowBottom) {
+        bottomPixel = parentMaxY + this._bottomEdgeDistance;
+      } else if (this._bottomEdgeAnchor === VerticalAnchor.Proportional) {
+        bottomPixel = parentMinY + this._bottomEdgeDistance * parentHeight;
+      } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowCenter) {
+        bottomPixel = parentCenterY + this._bottomEdgeDistance;
+      }
+
+      // It's fine to reuse workingPoint as topLeftPixel is no longer used.
+      const topLeftCoord = this._convertCoords(
+        instanceContainer,
+        layer,
+        leftPixel,
+        topPixel,
+        workingPoint
+      );
+      let left = topLeftCoord[0];
+      let top = topLeftCoord[1];
+
+      const bottomRightCoord = this._convertCoords(
+        instanceContainer,
+        layer,
+        rightPixel,
+        bottomPixel,
+        workingPoint
+      );
+      const right = bottomRightCoord[0];
+      const bottom = bottomRightCoord[1];
+
+      // Compatibility with GD <= 5.0.133
+      if (this._useLegacyBottomAndRightAnchors) {
+        //Move and resize the object according to the anchors
+        if (this._rightEdgeAnchor !== HorizontalAnchor.None) {
+          this.owner.setWidth(right - left);
         }
-
-        //Calculate the distances from the window's bounds.
-        const topLeftPixel = this._relativeToOriginalWindowSize
-          ? [this.owner.getDrawableX(), this.owner.getDrawableY()]
-          : this._convertInverseCoords(
-              instanceContainer,
-              layer,
-              this.owner.getDrawableX(),
-              this.owner.getDrawableY(),
-              workingPoint
-            );
-
-        // Left edge
-        if (this._leftEdgeAnchor === HorizontalAnchor.WindowLeft) {
-          this._leftEdgeDistance = topLeftPixel[0] - parentMinX;
-        } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowRight) {
-          this._leftEdgeDistance = topLeftPixel[0] - parentMaxX;
-        } else if (this._leftEdgeAnchor === HorizontalAnchor.Proportional) {
-          this._leftEdgeDistance = (topLeftPixel[0] - parentMinX) / parentWidth;
-        } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowCenter) {
-          this._leftEdgeDistance = topLeftPixel[0] - parentCenterX;
+        if (this._bottomEdgeAnchor !== VerticalAnchor.None) {
+          this.owner.setHeight(bottom - top);
         }
-
-        // Top edge
-        if (this._topEdgeAnchor === VerticalAnchor.WindowTop) {
-          this._topEdgeDistance = topLeftPixel[1] - parentMinY;
-        } else if (this._topEdgeAnchor === VerticalAnchor.WindowBottom) {
-          this._topEdgeDistance = topLeftPixel[1] - parentMaxY;
-        } else if (this._topEdgeAnchor === VerticalAnchor.Proportional) {
-          this._topEdgeDistance = (topLeftPixel[1] - parentMinY) / parentHeight;
-        } else if (this._topEdgeAnchor === VerticalAnchor.WindowCenter) {
-          this._topEdgeDistance = topLeftPixel[1] - parentCenterY;
+        if (this._leftEdgeAnchor !== HorizontalAnchor.None) {
+          this.owner.setX(left + this.owner.getX() - this.owner.getDrawableX());
         }
-
-        // It's fine to reuse workingPoint as topLeftPixel is no longer used.
-        const bottomRightPixel = this._relativeToOriginalWindowSize
-          ? [
-              this.owner.getDrawableX() + this.owner.getWidth(),
-              this.owner.getDrawableY() + this.owner.getHeight(),
-            ]
-          : this._convertInverseCoords(
-              instanceContainer,
-              layer,
-              this.owner.getDrawableX() + this.owner.getWidth(),
-              this.owner.getDrawableY() + this.owner.getHeight(),
-              workingPoint
-            );
-
-        // Right edge
-        if (this._rightEdgeAnchor === HorizontalAnchor.WindowLeft) {
-          this._rightEdgeDistance = bottomRightPixel[0] - parentMinX;
-        } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowRight) {
-          this._rightEdgeDistance = bottomRightPixel[0] - parentMaxX;
-        } else if (this._rightEdgeAnchor === HorizontalAnchor.Proportional) {
-          this._rightEdgeDistance =
-            (bottomRightPixel[0] - parentMinX) / parentWidth;
-        } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowCenter) {
-          this._rightEdgeDistance = bottomRightPixel[0] - parentCenterX;
+        if (this._topEdgeAnchor !== VerticalAnchor.None) {
+          this.owner.setY(top + this.owner.getY() - this.owner.getDrawableY());
         }
-
-        // Bottom edge
-        if (this._bottomEdgeAnchor === VerticalAnchor.WindowTop) {
-          this._bottomEdgeDistance = bottomRightPixel[1] - parentMinY;
-        } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowBottom) {
-          this._bottomEdgeDistance = bottomRightPixel[1] - parentMaxY;
-        } else if (this._bottomEdgeAnchor === VerticalAnchor.Proportional) {
-          this._bottomEdgeDistance =
-            (bottomRightPixel[1] - parentMinY) / parentHeight;
-        } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowCenter) {
-          this._bottomEdgeDistance = bottomRightPixel[1] - parentCenterY;
-        }
-
-        this._invalidDistances = false;
-      } else {
-        //Move and resize the object if needed
-        let leftPixel = 0;
-        let topPixel = 0;
-        let rightPixel = 0;
-        let bottomPixel = 0;
-
-        // Left edge
-        if (this._leftEdgeAnchor === HorizontalAnchor.WindowLeft) {
-          leftPixel = parentMinX + this._leftEdgeDistance;
-        } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowRight) {
-          leftPixel = parentMaxX + this._leftEdgeDistance;
-        } else if (this._leftEdgeAnchor === HorizontalAnchor.Proportional) {
-          leftPixel = parentMinX + this._leftEdgeDistance * parentWidth;
-        } else if (this._leftEdgeAnchor === HorizontalAnchor.WindowCenter) {
-          leftPixel = parentCenterX + this._leftEdgeDistance;
-        }
-
-        // Top edge
-        if (this._topEdgeAnchor === VerticalAnchor.WindowTop) {
-          topPixel = parentMinY + this._topEdgeDistance;
-        } else if (this._topEdgeAnchor === VerticalAnchor.WindowBottom) {
-          topPixel = parentMaxY + this._topEdgeDistance;
-        } else if (this._topEdgeAnchor === VerticalAnchor.Proportional) {
-          topPixel = parentMinY + this._topEdgeDistance * parentHeight;
-        } else if (this._topEdgeAnchor === VerticalAnchor.WindowCenter) {
-          topPixel = parentCenterY + this._topEdgeDistance;
-        }
-
-        // Right edge
-        if (this._rightEdgeAnchor === HorizontalAnchor.WindowLeft) {
-          rightPixel = parentMinX + this._rightEdgeDistance;
-        } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowRight) {
-          rightPixel = parentMaxX + this._rightEdgeDistance;
-        } else if (this._rightEdgeAnchor === HorizontalAnchor.Proportional) {
-          rightPixel = parentMinX + this._rightEdgeDistance * parentWidth;
-        } else if (this._rightEdgeAnchor === HorizontalAnchor.WindowCenter) {
-          rightPixel = parentCenterX + this._rightEdgeDistance;
-        }
-
-        // Bottom edge
-        if (this._bottomEdgeAnchor === VerticalAnchor.WindowTop) {
-          bottomPixel = parentMinY + this._bottomEdgeDistance;
-        } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowBottom) {
-          bottomPixel = parentMaxY + this._bottomEdgeDistance;
-        } else if (this._bottomEdgeAnchor === VerticalAnchor.Proportional) {
-          bottomPixel = parentMinY + this._bottomEdgeDistance * parentHeight;
-        } else if (this._bottomEdgeAnchor === VerticalAnchor.WindowCenter) {
-          bottomPixel = parentCenterY + this._bottomEdgeDistance;
-        }
-
-        // It's fine to reuse workingPoint as topLeftPixel is no longer used.
-        const topLeftCoord = this._convertCoords(
-          instanceContainer,
-          layer,
-          leftPixel,
-          topPixel,
-          workingPoint
-        );
-        let left = topLeftCoord[0];
-        let top = topLeftCoord[1];
-
-        const bottomRightCoord = this._convertCoords(
-          instanceContainer,
-          layer,
-          rightPixel,
-          bottomPixel,
-          workingPoint
-        );
-        const right = bottomRightCoord[0];
-        const bottom = bottomRightCoord[1];
-
-        // Compatibility with GD <= 5.0.133
-        if (this._useLegacyBottomAndRightAnchors) {
-          //Move and resize the object according to the anchors
-          if (this._rightEdgeAnchor !== HorizontalAnchor.None) {
-            this.owner.setWidth(right - left);
-          }
-          if (this._bottomEdgeAnchor !== VerticalAnchor.None) {
-            this.owner.setHeight(bottom - top);
-          }
+      }
+      // End of compatibility code
+      else {
+        // Resize if right and left anchors are set
+        if (
+          this._rightEdgeAnchor !== HorizontalAnchor.None &&
+          this._leftEdgeAnchor !== HorizontalAnchor.None
+        ) {
+          const width = right - left;
+          this.owner.setX(
+            this.owner.getX() === this.owner.getDrawableX()
+              ? left
+              : // It uses the position of the origin relatively to the object
+                // size to apply it with the new size.
+                // This is the same as doing:
+                // lerp(left, right, (this.owner.getX() - this.owner.getDrawableX() / this.owner.getWidth())
+                // But, the division is done at the end to avoid rounding errors.
+                left +
+                  ((this.owner.getX() - this.owner.getDrawableX()) * width) /
+                    this.owner.getWidth()
+          );
+          this.owner.setWidth(width);
+        } else {
           if (this._leftEdgeAnchor !== HorizontalAnchor.None) {
             this.owner.setX(
               left + this.owner.getX() - this.owner.getDrawableX()
             );
           }
+          if (this._rightEdgeAnchor !== HorizontalAnchor.None) {
+            this.owner.setX(
+              right +
+                this.owner.getX() -
+                this.owner.getDrawableX() -
+                this.owner.getWidth()
+            );
+          }
+        }
+
+        // Resize if top and bottom anchors are set
+        if (
+          this._bottomEdgeAnchor !== VerticalAnchor.None &&
+          this._topEdgeAnchor !== VerticalAnchor.None
+        ) {
+          const height = bottom - top;
+          this.owner.setY(
+            this.owner.getY() === this.owner.getDrawableY()
+              ? top
+              : top +
+                  ((this.owner.getY() - this.owner.getDrawableY()) * height) /
+                    this.owner.getHeight()
+          );
+          this.owner.setHeight(height);
+        } else {
           if (this._topEdgeAnchor !== VerticalAnchor.None) {
             this.owner.setY(
               top + this.owner.getY() - this.owner.getDrawableY()
             );
           }
-        }
-        // End of compatibility code
-        else {
-          // Resize if right and left anchors are set
-          if (
-            this._rightEdgeAnchor !== HorizontalAnchor.None &&
-            this._leftEdgeAnchor !== HorizontalAnchor.None
-          ) {
-            const width = right - left;
-            this.owner.setX(
-              this.owner.getX() === this.owner.getDrawableX()
-                ? left
-                : // It uses the position of the origin relatively to the object
-                  // size to apply it with the new size.
-                  // This is the same as doing:
-                  // lerp(left, right, (this.owner.getX() - this.owner.getDrawableX() / this.owner.getWidth())
-                  // But, the division is done at the end to avoid rounding errors.
-                  left +
-                    ((this.owner.getX() - this.owner.getDrawableX()) * width) /
-                      this.owner.getWidth()
-            );
-            this.owner.setWidth(width);
-          } else {
-            if (this._leftEdgeAnchor !== HorizontalAnchor.None) {
-              this.owner.setX(
-                left + this.owner.getX() - this.owner.getDrawableX()
-              );
-            }
-            if (this._rightEdgeAnchor !== HorizontalAnchor.None) {
-              this.owner.setX(
-                right +
-                  this.owner.getX() -
-                  this.owner.getDrawableX() -
-                  this.owner.getWidth()
-              );
-            }
-          }
-          // Resize if top and bottom anchors are set
-          if (
-            this._bottomEdgeAnchor !== VerticalAnchor.None &&
-            this._topEdgeAnchor !== VerticalAnchor.None
-          ) {
-            const height = bottom - top;
+          if (this._bottomEdgeAnchor !== VerticalAnchor.None) {
             this.owner.setY(
-              this.owner.getY() === this.owner.getDrawableY()
-                ? top
-                : top +
-                    ((this.owner.getY() - this.owner.getDrawableY()) * height) /
-                      this.owner.getHeight()
+              bottom +
+                this.owner.getY() -
+                this.owner.getDrawableY() -
+                this.owner.getHeight()
             );
-            this.owner.setHeight(height);
-          } else {
-            if (this._topEdgeAnchor !== VerticalAnchor.None) {
-              this.owner.setY(
-                top + this.owner.getY() - this.owner.getDrawableY()
-              );
-            }
-            if (this._bottomEdgeAnchor !== VerticalAnchor.None) {
-              this.owner.setY(
-                bottom +
-                  this.owner.getY() -
-                  this.owner.getDrawableY() -
-                  this.owner.getHeight()
-              );
-            }
           }
         }
       }
+      this._parentOldMinX = instanceContainer.getUnrotatedViewportMinX();
+      this._parentOldMinY = instanceContainer.getUnrotatedViewportMinY();
+      this._parentOldMaxX = instanceContainer.getUnrotatedViewportMaxX();
+      this._parentOldMaxY = instanceContainer.getUnrotatedViewportMaxY();
     }
 
     doStepPostEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {}

Extensions/AnchorBehavior/tests/AnchorRuntimeBehaviorInCustomObject.spec.js

@@ -0,0 +1,46 @@
+// @ts-check
+describe('gdjs.AnchorRuntimeBehavior', () => {
+  it('can fill a custom object with an child', async () => {
+    const runtimeGame = await gdjs.getPixiRuntimeGameWithAssets();
+    const runtimeScene = new gdjs.TestRuntimeScene(runtimeGame);
+    // The corresponding event-based object declaration is done by
+    // getPixiRuntimeGame.
+    const customObject = new gdjs.CustomRuntimeObject2D(runtimeScene, {
+      name: 'MyCustomObject',
+      type: 'MyExtension::MyLayoutedEventsBasedObject',
+      variant: '',
+      variables: [],
+      behaviors: [],
+      effects: [],
+      content: {},
+      childrenContent: {},
+    });
+    runtimeScene.addObject(customObject);
+    customObject.setPosition(500, 250);
+
+    const childObjects = customObject
+      .getChildrenContainer()
+      .getObjects('MySprite');
+    if (!childObjects || childObjects.length === 0) {
+      throw new Error("Can't get child objects.");
+    }
+    const childObject = childObjects[0];
+
+    runtimeScene.renderAndStep(1000 / 60);
+
+    // The child object keeps its initial location.
+    expect(childObject.getX()).to.equal(0);
+    expect(childObject.getY()).to.equal(0);
+    expect(childObject.getWidth()).to.equal(64);
+    expect(childObject.getHeight()).to.equal(64);
+
+    customObject.setWidth(2000);
+    customObject.setHeight(3000);
+    runtimeScene.renderAndStep(1000 / 60);
+
+    expect(childObject.getX()).to.equal(0);
+    expect(childObject.getY()).to.equal(0);
+    expect(childObject.getWidth()).to.equal(2000);
+    expect(childObject.getHeight()).to.equal(3000);
+  });
+});

Extensions/AnchorBehavior/tests/anchorruntimebehavior.spec.js

@@ -1,39 +1,49 @@
 // @ts-check
-describe('gdjs.AnchorRuntimeBehavior', function () {
-  const runtimeGame = gdjs.getPixiRuntimeGame({
-    propertiesOverrides: { windowHeight: 1000, windowWidth: 1000 },
-  });
+describe('gdjs.AnchorRuntimeBehavior', () => {
   const anchorBehaviorName = 'Anchor';
-  const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-  runtimeScene.loadFromScene({
-    sceneData: {
-      layers: [
-        {
-          name: '',
-          visibility: true,
-          cameras: [],
-          effects: [],
-          ambientLightColorR: 127,
-          ambientLightColorB: 127,
-          ambientLightColorG: 127,
-          isLightingLayer: false,
-          followBaseLayerCamera: false,
-        },
-      ],
-      variables: [],
-      r: 0,
-      v: 0,
-      b: 0,
-      mangledName: 'Scene1',
-      name: 'Scene1',
-      stopSoundsOnStartup: false,
-      title: '',
-      behaviorsSharedData: [],
-      objects: [],
-      instances: [],
-      usedResources: [],
-    },
-    usedExtensionsWithVariablesData: [],
+
+  /** @type {gdjs.RuntimeGame} */
+  let runtimeGame;
+  /** @type {gdjs.RuntimeScene} */
+  let runtimeScene;
+  /** @type {gdjs.RuntimeLayer} */
+  let layer;
+  beforeEach(() => {
+    runtimeGame = gdjs.getPixiRuntimeGame({
+      propertiesOverrides: { windowHeight: 1000, windowWidth: 1000 },
+    });
+    runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+    runtimeScene.loadFromScene({
+      sceneData: {
+        layers: [
+          {
+            name: '',
+            visibility: true,
+            cameras: [],
+            effects: [],
+            ambientLightColorR: 127,
+            ambientLightColorB: 127,
+            ambientLightColorG: 127,
+            isLightingLayer: false,
+            followBaseLayerCamera: false,
+          },
+        ],
+        variables: [],
+        r: 0,
+        v: 0,
+        b: 0,
+        mangledName: 'Scene1',
+        name: 'Scene1',
+        stopSoundsOnStartup: false,
+        title: '',
+        behaviorsSharedData: [],
+        objects: [],
+        instances: [],
+        usedResources: [],
+      },
+      usedExtensionsWithVariablesData: [],
+    });
+    layer = runtimeScene.getLayer('');
   });
 
   const setGameResolutionSizeAndStep = (width, height) => {
@@ -43,6 +53,11 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
     runtimeScene.renderAndStep(1000 / 60);
   };
 
+  const setCamera = (x, y) => {
+    layer.setCameraX(x);
+    layer.setCameraY(y);
+  };
+
   function createObject(behaviorProperties) {
     const object = new gdjs.TestRuntimeObject(runtimeScene, {
       name: 'obj1',
@@ -114,10 +129,50 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
     return object;
   };
 
-  describe('(anchor horizontal edge)', function () {
-    ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
-      it(`anchors the ${objectEdge} edge of object to window left (fixed)`, function () {
-        const object = createObject({ [objectEdge]: 1 });
+  describe('(anchor horizontal edge)', () => {
+    describe('(basic)', () => {
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window left (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window right (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1500);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1000);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the right and left edge of an object (fixed)', () => {
+        const object = createObject({ leftEdgeAnchor: 1, rightEdgeAnchor: 2 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -125,25 +180,11 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
 
         expect(object.getX()).to.equal(500);
         expect(object.getY()).to.equal(500);
-        expect(object.getWidth()).to.equal(10);
+        expect(object.getWidth()).to.equal(1010);
       });
-    });
-    ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
-      it(`anchors the ${objectEdge} edge of object to window right (fixed)`, function () {
-        const object = createObject({ [objectEdge]: 2 });
-        object.setPosition(500, 500);
-        runtimeScene.renderAndStep(1000 / 60);
 
-        setGameResolutionSizeAndStep(2000, 2000);
-
-        expect(object.getX()).to.equal(1500);
-        expect(object.getY()).to.equal(500);
-        expect(object.getWidth()).to.equal(10);
-      });
-    });
-    ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
-      it(`anchors the ${objectEdge} edge of object to window center (fixed)`, function () {
-        const object = createObject({ [objectEdge]: 4 });
+      it('anchors the left edge of an object (proportional)', () => {
+        const object = createObject({ leftEdgeAnchor: 3 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -154,36 +195,267 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
         expect(object.getWidth()).to.equal(10);
       });
     });
+    describe('(moving object)', () => {
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window left (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-    it('anchors the right and left edge of object (fixed)', function () {
-      const object = createObject({ leftEdgeAnchor: 1, rightEdgeAnchor: 2 });
-      object.setPosition(500, 500);
-      runtimeScene.renderAndStep(1000 / 60);
+          object.setPosition(600, 700);
+          setGameResolutionSizeAndStep(2000, 2000);
 
-      setGameResolutionSizeAndStep(2000, 2000);
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window right (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-      expect(object.getX()).to.equal(500);
-      expect(object.getY()).to.equal(500);
-      expect(object.getWidth()).to.equal(1010);
+          object.setPosition(600, 700);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1600);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1100);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the right and left edge of an object (fixed)', () => {
+        const object = createObject({ leftEdgeAnchor: 1, rightEdgeAnchor: 2 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(600);
+        expect(object.getY()).to.equal(700);
+        expect(object.getWidth()).to.equal(1010);
+      });
+
+      it('anchors the left edge of an object (proportional)', () => {
+        const object = createObject({ leftEdgeAnchor: 3 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(1200);
+        expect(object.getY()).to.equal(700);
+        expect(object.getWidth()).to.equal(10);
+      });
     });
+    describe('(moving camera)', () => {
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window left (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-    it('anchors the left edge of object (proportional)', function () {
-      const object = createObject({ leftEdgeAnchor: 3 });
-      object.setPosition(500, 500);
-      runtimeScene.renderAndStep(1000 / 60);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
 
-      setGameResolutionSizeAndStep(2000, 2000);
+          expect(object.getX()).to.equal(800);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window right (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-      expect(object.getX()).to.equal(1000);
-      expect(object.getY()).to.equal(500);
-      expect(object.getWidth()).to.equal(10);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1800);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1300);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the right and left edge of an object (fixed)', () => {
+        const object = createObject({ leftEdgeAnchor: 1, rightEdgeAnchor: 2 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(800);
+        expect(object.getY()).to.equal(500);
+        expect(object.getWidth()).to.equal(1010);
+      });
+
+      it('anchors the left edge of an object (proportional)', () => {
+        const object = createObject({ leftEdgeAnchor: 3 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(1300);
+        expect(object.getY()).to.equal(500);
+        expect(object.getWidth()).to.equal(10);
+      });
+    });
+    describe('(moving object and camera)', () => {
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window left (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(900);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window right (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1900);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['rightEdgeAnchor', 'leftEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of an object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(1400);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the right and left edge of an object (fixed)', () => {
+        const object = createObject({ leftEdgeAnchor: 1, rightEdgeAnchor: 2 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(900);
+        expect(object.getY()).to.equal(700);
+        expect(object.getWidth()).to.equal(1010);
+      });
+
+      it('anchors the left edge of an object (proportional)', () => {
+        const object = createObject({ leftEdgeAnchor: 3 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(1500);
+        expect(object.getY()).to.equal(700);
+        expect(object.getWidth()).to.equal(10);
+      });
     });
   });
 
-  describe('(anchor vertical edge)', function () {
-    ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
-      it(`anchors the ${objectEdge} edge of object to window top (fixed)`, function () {
-        const object = createObject({ [objectEdge]: 1 });
+  describe('(anchor vertical edge)', () => {
+    describe('(basic)', () => {
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window top (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window bottom (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(1500);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(1000);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the top and bottom edge of object (fixed)', () => {
+        const object = createObject({ topEdgeAnchor: 1, bottomEdgeAnchor: 2 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -191,25 +463,11 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
 
         expect(object.getX()).to.equal(500);
         expect(object.getY()).to.equal(500);
-        expect(object.getWidth()).to.equal(10);
+        expect(object.getHeight()).to.equal(1010);
       });
-    });
-    ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
-      it(`anchors the ${objectEdge} edge of object to window bottom (fixed)`, function () {
-        const object = createObject({ [objectEdge]: 2 });
-        object.setPosition(500, 500);
-        runtimeScene.renderAndStep(1000 / 60);
 
-        setGameResolutionSizeAndStep(2000, 2000);
-
-        expect(object.getX()).to.equal(500);
-        expect(object.getY()).to.equal(1500);
-        expect(object.getWidth()).to.equal(10);
-      });
-    });
-    ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
-      it(`anchors the ${objectEdge} edge of object to window center (fixed)`, function () {
-        const object = createObject({ [objectEdge]: 4 });
+      it('anchors the top edge of object (proportional)', () => {
+        const object = createObject({ topEdgeAnchor: 3 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -220,71 +478,262 @@ describe('gdjs.AnchorRuntimeBehavior', function () {
         expect(object.getWidth()).to.equal(10);
       });
     });
+    describe('(moving object)', () => {
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window top (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-    it('anchors the top and bottom edge of object (fixed)', function () {
-      const object = createObject({ topEdgeAnchor: 1, bottomEdgeAnchor: 2 });
-      object.setPosition(500, 500);
-      runtimeScene.renderAndStep(1000 / 60);
+          object.setPosition(600, 700);
+          setGameResolutionSizeAndStep(2000, 2000);
 
-      setGameResolutionSizeAndStep(2000, 2000);
-
-      expect(object.getX()).to.equal(500);
-      expect(object.getY()).to.equal(500);
-      expect(object.getHeight()).to.equal(1010);
-    });
-
-    it('anchors the top edge of object (proportional)', function () {
-      const object = createObject({ topEdgeAnchor: 3 });
-      object.setPosition(500, 500);
-      runtimeScene.renderAndStep(1000 / 60);
-
-      setGameResolutionSizeAndStep(2000, 2000);
-
-      expect(object.getX()).to.equal(500);
-      expect(object.getY()).to.equal(1000);
-      expect(object.getWidth()).to.equal(10);
-    });
-
-    it('can fill the screen with an object (with custom origin)', function () {
-      setGameResolutionSizeAndStep(1000, 500);
-
-      const object = createSpriteWithOriginAtCenter({
-        leftEdgeAnchor: 1,
-        topEdgeAnchor: 1,
-        rightEdgeAnchor: 2,
-        bottomEdgeAnchor: 2,
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(700);
+          expect(object.getWidth()).to.equal(10);
+        });
       });
-      object.setCustomWidthAndHeight(1000, 500);
-      object.setPosition(500, 250);
-      runtimeScene.renderAndStep(1000 / 60);
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window bottom (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-      setGameResolutionSizeAndStep(2000, 3000);
+          object.setPosition(600, 700);
+          setGameResolutionSizeAndStep(2000, 2000);
 
-      expect(object.getX()).to.equal(1000);
-      expect(object.getY()).to.equal(1500);
-      expect(object.getWidth()).to.equal(2000);
-      expect(object.getHeight()).to.equal(3000);
-    });
-
-    it('can fill the screen with an object using proportional anchors (with custom origin)', () => {
-      setGameResolutionSizeAndStep(1000, 500);
-
-      const object = createSpriteWithOriginAtCenter({
-        leftEdgeAnchor: 3,
-        topEdgeAnchor: 3,
-        rightEdgeAnchor: 3,
-        bottomEdgeAnchor: 3,
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(1700);
+          expect(object.getWidth()).to.equal(10);
+        });
       });
-      object.setCustomWidthAndHeight(1000, 500);
-      object.setPosition(500, 250);
-      runtimeScene.renderAndStep(1000 / 60);
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
 
-      setGameResolutionSizeAndStep(2000, 3000);
+          object.setPosition(600, 700);
+          setGameResolutionSizeAndStep(2000, 2000);
 
-      expect(object.getX()).to.equal(1000);
-      expect(object.getY()).to.equal(1500);
-      expect(object.getWidth()).to.equal(2000);
-      expect(object.getHeight()).to.equal(3000);
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(1200);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the top and bottom edge of object (fixed)', () => {
+        const object = createObject({ topEdgeAnchor: 1, bottomEdgeAnchor: 2 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(600);
+        expect(object.getY()).to.equal(700);
+        expect(object.getHeight()).to.equal(1010);
+      });
+
+      it('anchors the top edge of object (proportional)', () => {
+        const object = createObject({ topEdgeAnchor: 3 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(600);
+        expect(object.getY()).to.equal(1400);
+        expect(object.getWidth()).to.equal(10);
+      });
+    });
+    describe('(moving camera)', () => {
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window top (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(900);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window bottom (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(1900);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(500);
+          expect(object.getY()).to.equal(1400);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the top and bottom edge of object (fixed)', () => {
+        const object = createObject({ topEdgeAnchor: 1, bottomEdgeAnchor: 2 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(500);
+        expect(object.getY()).to.equal(900);
+        expect(object.getHeight()).to.equal(1010);
+      });
+
+      it('anchors the top edge of object (proportional)', () => {
+        const object = createObject({ topEdgeAnchor: 3 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(500);
+        expect(object.getY()).to.equal(1400);
+        expect(object.getWidth()).to.equal(10);
+      });
+    });
+    describe('(moving object and camera)', () => {
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window top (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 1 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(1100);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window bottom (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 2 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(2100);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+      ['topEdgeAnchor', 'bottomEdgeAnchor'].forEach((objectEdge) => {
+        it(`anchors the ${objectEdge} edge of object to window center (fixed)`, () => {
+          const object = createObject({ [objectEdge]: 4 });
+          object.setPosition(500, 500);
+          runtimeScene.renderAndStep(1000 / 60);
+
+          object.setPosition(600, 700);
+          setCamera(1300, 1400);
+          setGameResolutionSizeAndStep(2000, 2000);
+
+          expect(object.getX()).to.equal(600);
+          expect(object.getY()).to.equal(1600);
+          expect(object.getWidth()).to.equal(10);
+        });
+      });
+
+      it('anchors the top and bottom edge of object (fixed)', () => {
+        const object = createObject({ topEdgeAnchor: 1, bottomEdgeAnchor: 2 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(600);
+        expect(object.getY()).to.equal(1100);
+        expect(object.getHeight()).to.equal(1010);
+      });
+
+      it('anchors the top edge of object (proportional)', () => {
+        const object = createObject({ topEdgeAnchor: 3 });
+        object.setPosition(500, 500);
+        runtimeScene.renderAndStep(1000 / 60);
+
+        object.setPosition(600, 700);
+        setCamera(1300, 1400);
+        setGameResolutionSizeAndStep(2000, 2000);
+
+        expect(object.getX()).to.equal(600);
+        expect(object.getY()).to.equal(1800);
+        expect(object.getWidth()).to.equal(10);
+      });
     });
   });
+
+  it('can fill the screen with an object (with custom origin)', () => {
+    setGameResolutionSizeAndStep(1000, 500);
+
+    const object = createSpriteWithOriginAtCenter({
+      leftEdgeAnchor: 1,
+      topEdgeAnchor: 1,
+      rightEdgeAnchor: 2,
+      bottomEdgeAnchor: 2,
+    });
+    object.setCustomWidthAndHeight(1000, 500);
+    object.setPosition(500, 250);
+    runtimeScene.renderAndStep(1000 / 60);
+
+    setGameResolutionSizeAndStep(2000, 3000);
+
+    expect(object.getX()).to.equal(1000);
+    expect(object.getY()).to.equal(1500);
+    expect(object.getWidth()).to.equal(2000);
+    expect(object.getHeight()).to.equal(3000);
+  });
+
+  it('can fill the screen with an object using proportional anchors (with custom origin)', () => {
+    setGameResolutionSizeAndStep(1000, 500);
+
+    const object = createSpriteWithOriginAtCenter({
+      leftEdgeAnchor: 3,
+      topEdgeAnchor: 3,
+      rightEdgeAnchor: 3,
+      bottomEdgeAnchor: 3,
+    });
+    object.setCustomWidthAndHeight(1000, 500);
+    object.setPosition(500, 250);
+    runtimeScene.renderAndStep(1000 / 60);
+
+    setGameResolutionSizeAndStep(2000, 3000);
+
+    expect(object.getX()).to.equal(1000);
+    expect(object.getY()).to.equal(1500);
+    expect(object.getWidth()).to.equal(2000);
+    expect(object.getHeight()).to.equal(3000);
+  });
 });

Extensions/BBText/JsExtension.js

@@ -54,7 +54,7 @@ module.exports = {
       objectProperties
         .getOrCreate('text')
         .setValue(objectContent.text)
-        .setType('textarea')
+        .setType('multilinestring')
         .setLabel(_('BBCode text'));
 
       objectProperties
@@ -81,6 +81,19 @@ module.exports = {
         .setLabel(_('Base alignment'))
         .setGroup(_('Appearance'));
 
+      if (!objectContent.verticalTextAlignment) {
+        objectContent.verticalTextAlignment = 'top';
+      }
+      objectProperties
+        .getOrCreate('verticalTextAlignment')
+        .setValue(objectContent.verticalTextAlignment)
+        .setType('choice')
+        .addExtraInfo('top')
+        .addExtraInfo('center')
+        .addExtraInfo('bottom')
+        .setLabel(_('Vertical alignment'))
+        .setGroup(_('Appearance'));
+
       objectProperties
         .getOrCreate('fontFamily')
         .setValue(objectContent.fontFamily)
@@ -89,13 +102,6 @@ module.exports = {
         .setLabel(_('Font'))
         .setGroup(_('Font'));
 
-      objectProperties
-        .getOrCreate('wordWrap')
-        .setValue(objectContent.wordWrap ? 'true' : 'false')
-        .setType('boolean')
-        .setLabel(_('Word wrapping'))
-        .setGroup(_('Appearance'));
-
       objectProperties
         .getOrCreate('visible')
         .setValue(objectContent.visible ? 'true' : 'false')
@@ -106,15 +112,14 @@ module.exports = {
       return objectProperties;
     };
     objectBBText.content = {
-      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,
       color: '0;0;0',
       fontFamily: 'Arial',
       align: 'left',
-      wordWrap: true,
+      verticalTextAlignment: 'top',
     };
 
     objectBBText.updateInitialInstanceProperty = function (
@@ -193,9 +198,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)
@@ -245,9 +251,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)
@@ -370,19 +377,6 @@ module.exports = {
         expressionLabel: _('Get the text alignment'),
         expressionDescription: _('Get the text alignment'),
       },
-      {
-        functionName: 'WordWrap',
-        iconPath: 'res/actions/scaleWidth24_black.png',
-        type: 'boolean',
-        instructionLabel: _('Word wrap'),
-        paramLabel: _('Word wrap'),
-        conditionDescription: _('Check if word wrap is enabled.'),
-        conditionSentence: _('Word wrap is enabled'),
-        actionDescription: _('Set word wrap'),
-        actionSentence: _('Activate word wrap for _PARAM0_: _PARAM1_'),
-        expressionLabel: '',
-        expressionDescription: '',
-      },
       {
         functionName: 'WrappingWidth',
         iconPath: 'res/actions/scaleWidth24_black.png',
@@ -404,6 +398,35 @@ module.exports = {
 
     addSettersAndGettersToObject(object, setterAndGetterProperties, 'BBText');
 
+    object
+      .addCondition(
+        'IsWordWrap',
+        _('Word wrapping'),
+        _('Check if word wrapping is enabled.'),
+        _('_PARAM0_ word wrapping is enabled'),
+        '',
+        'res/conditions/wordWrap24_black.png',
+        'res/conditions/wordWrap_black.png'
+      )
+      .addParameter('object', 'BBText', 'BBText', false)
+      .getCodeExtraInformation()
+      .setFunctionName('isWrapping');
+
+    object
+      .addAction(
+        'SetWordWrap',
+        _('Word wrapping'),
+        _('De/activate word wrapping.'),
+        _('Activate word wrapping of _PARAM0_: _PARAM1_'),
+        '',
+        'res/actions/wordWrap24_black.png',
+        'res/actions/wordWrap_black.png'
+      )
+      .addParameter('object', 'BBText', 'BBText', false)
+      .addParameter('yesorno', _('Activate word wrapping'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('setWrapping');
+
     object
       .addAction(
         `SetFontFamily2`,
@@ -484,14 +507,16 @@ module.exports = {
         instance,
         associatedObjectConfiguration,
         pixiContainer,
-        pixiResourcesLoader
+        pixiResourcesLoader,
+        propertyOverridings
       ) {
         super(
           project,
           instance,
           associatedObjectConfiguration,
           pixiContainer,
-          pixiResourcesLoader
+          pixiResourcesLoader,
+          propertyOverridings
         );
 
         const bbTextStyles = {
@@ -501,7 +526,6 @@ module.exports = {
             fontSize: '24px',
             fill: '#cccccc',
             tagStyle: 'bbcode',
-            wordWrap: true,
             wordWrapWidth: 250, // This value is the default wrapping width of the runtime object.
             align: 'left',
           },
@@ -531,7 +555,9 @@ module.exports = {
           gd.ObjectJsImplementation
         );
 
-        const rawText = object.content.text;
+        const rawText = this._propertyOverridings.has('Text')
+          ? this._propertyOverridings.get('Text')
+          : object.content.text;
         if (rawText !== this._pixiObject.text) {
           this._pixiObject.text = rawText;
         }
@@ -573,11 +599,18 @@ module.exports = {
             });
         }
 
-        const wordWrap = object.content.wordWrap;
+        const wordWrap = this._instance.hasCustomSize();
         if (wordWrap !== this._pixiObject._style.wordWrap) {
           this._pixiObject._style.wordWrap = wordWrap;
           this._pixiObject.dirty = true;
         }
+        if (this._instance.hasCustomSize()) {
+          const customWidth = this.getCustomWidth();
+          if (this._pixiObject._style.wordWrapWidth !== customWidth) {
+            this._pixiObject._style.wordWrapWidth = customWidth;
+            this._pixiObject.dirty = true;
+          }
+        }
 
         const align = object.content.align;
         if (align !== this._pixiObject._style.align) {
@@ -585,25 +618,42 @@ module.exports = {
           this._pixiObject.dirty = true;
         }
 
-        this._pixiObject.position.x =
-          this._instance.getX() + this._pixiObject.width / 2;
+        if (this._instance.hasCustomSize() && this._pixiObject.width !== 0) {
+          const alignmentX =
+            object.content.align === 'right'
+              ? 1
+              : object.content.align === 'center'
+                ? 0.5
+                : 0;
+
+          const width = this.getCustomWidth();
+
+          // A vector from the custom size center to the renderer center.
+          const centerToCenterX =
+            (width - this._pixiObject.width) * (alignmentX - 0.5);
+
+          this._pixiObject.position.x = this._instance.getX() + width / 2;
+          this._pixiObject.anchor.x =
+            0.5 - centerToCenterX / this._pixiObject.width;
+        } else {
+          this._pixiObject.position.x =
+            this._instance.getX() + this._pixiObject.width / 2;
+          this._pixiObject.anchor.x = 0.5;
+        }
+        const alignmentY =
+          object.content.verticalTextAlignment === 'bottom'
+            ? 1
+            : object.content.verticalTextAlignment === 'center'
+              ? 0.5
+              : 0;
         this._pixiObject.position.y =
-          this._instance.getY() + this._pixiObject.height / 2;
+          this._instance.getY() + this._pixiObject.height * (0.5 - alignmentY);
+        this._pixiObject.anchor.y = 0.5;
+
         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;
-          }
-        }
-
         // Do not hide completely an object so it can still be manipulated
         const alphaForDisplay = Math.max(
           this._instance.getOpacity() / 255,
@@ -625,6 +675,19 @@ module.exports = {
       getDefaultHeight() {
         return this._pixiObject.height;
       }
+
+      getOriginY() {
+        const object = gd.castObject(
+          this._associatedObjectConfiguration,
+          gd.ObjectJsImplementation
+        );
+        const height = this.getHeight();
+        return object.content.verticalTextAlignment === 'bottom'
+          ? height
+          : object.content.verticalTextAlignment === 'center'
+            ? height / 2
+            : 0;
+      }
     }
 
     objectsRenderingService.registerInstanceRenderer(

Extensions/BBText/bbtextruntimeobject-pixi-renderer.ts

@@ -29,9 +29,9 @@ namespace gdjs {
             runtimeObject._color[2]
           ),
           tagStyle: 'bbcode',
-          wordWrap: runtimeObject._wordWrap,
+          wordWrap: runtimeObject._wrapping,
           wordWrapWidth: runtimeObject._wrappingWidth,
-          align: runtimeObject._align as PIXI.TextStyleAlign | undefined,
+          align: runtimeObject._textAlign as PIXI.TextStyleAlign | undefined,
         },
       });
       instanceContainer
@@ -39,10 +39,7 @@ namespace gdjs {
         .getRenderer()
         .addRendererObject(this._pixiObject, runtimeObject.getZOrder());
 
-      // Set the anchor in the center, so that the object rotates around
-      // its center
-      this._pixiObject.anchor.x = 0.5;
-      this._pixiObject.anchor.y = 0.5;
+      this.updateAlignment();
       this.updateText();
       this.updatePosition();
       this.updateAngle();
@@ -55,7 +52,7 @@ namespace gdjs {
 
     updateWordWrap(): void {
       //@ts-ignore Private member usage.
-      this._pixiObject._style.wordWrap = this._object._wordWrap;
+      this._pixiObject._style.wordWrap = this._object._wrapping;
       this._pixiObject.dirty = true;
       this.updatePosition();
     }
@@ -84,7 +81,7 @@ namespace gdjs {
 
     updateAlignment(): void {
       //@ts-ignore Private member usage.
-      this._pixiObject._style.align = this._object._align;
+      this._pixiObject._style.align = this._object._textAlign;
       this._pixiObject.dirty = true;
     }
 
@@ -106,9 +103,38 @@ namespace gdjs {
     }
 
     updatePosition(): void {
-      this._pixiObject.position.x = this._object.x + this._pixiObject.width / 2;
+      if (this._object.isWrapping() && this._pixiObject.width !== 0) {
+        const alignmentX =
+          this._object._textAlign === 'right'
+            ? 1
+            : this._object._textAlign === 'center'
+              ? 0.5
+              : 0;
+
+        const width = this._object.getWrappingWidth();
+
+        // A vector from the custom size center to the renderer center.
+        const centerToCenterX =
+          (width - this._pixiObject.width) * (alignmentX - 0.5);
+
+        this._pixiObject.position.x = this._object.x + width / 2;
+        this._pixiObject.anchor.x =
+          0.5 - centerToCenterX / this._pixiObject.width;
+      } else {
+        this._pixiObject.position.x =
+          this._object.x + this._pixiObject.width / 2;
+        this._pixiObject.anchor.x = 0.5;
+      }
+
+      const alignmentY =
+        this._object._verticalTextAlignment === 'bottom'
+          ? 1
+          : this._object._verticalTextAlignment === 'center'
+            ? 0.5
+            : 0;
       this._pixiObject.position.y =
-        this._object.y + this._pixiObject.height / 2;
+        this._object.y + this._pixiObject.height * (0.5 - alignmentY);
+      this._pixiObject.anchor.y = 0.5;
     }
 
     updateAngle(): void {

Extensions/BBText/bbtextruntimeobject.ts

@@ -19,6 +19,7 @@ namespace gdjs {
       wordWrap: boolean;
       /** Alignment of the text: "left", "center" or "right" */
       align: 'left' | 'center' | 'right';
+      verticalTextAlignment: 'top' | 'center' | 'bottom';
     };
   };
   export type BBTextObjectData = ObjectData & BBTextObjectDataType;
@@ -32,6 +33,7 @@ namespace gdjs {
     wwrap: boolean;
     wwidth: float;
     align: string;
+    vta: string;
     hidden: boolean;
   };
 
@@ -43,7 +45,8 @@ namespace gdjs {
    */
   export class BBTextRuntimeObject
     extends gdjs.RuntimeObject
-    implements gdjs.OpacityHandler {
+    implements gdjs.OpacityHandler
+  {
     _opacity: float;
 
     _text: string;
@@ -51,13 +54,14 @@ namespace gdjs {
     /** color in format [r, g, b], where each component is in the range [0, 255] */
     _color: integer[];
     _fontFamily: string;
-    _fontSize: number;
+    _fontSize: float;
 
-    _wordWrap: boolean;
+    _wrapping: boolean = false;
     _wrappingWidth: float = 250;
 
-    // This value is the default wrapping width of the runtime object.
-    _align: string;
+    _textAlign: string;
+    _verticalTextAlignment: string;
+
     _renderer: gdjs.BBTextRuntimeObjectRenderer;
 
     // While this should rather be exposed as a property for all objects, honor the "visible"
@@ -80,24 +84,26 @@ namespace gdjs {
       this._fontFamily = objectData.content.fontFamily;
       // @ts-ignore - parseFloat should not be required, but GDevelop 5.0 beta 92 and below were storing it as a string.
       this._fontSize = parseFloat(objectData.content.fontSize);
-      this._wordWrap = objectData.content.wordWrap;
-      this._align = objectData.content.align;
+      this._textAlign = objectData.content.align;
+      this._verticalTextAlignment =
+        objectData.content.verticalTextAlignment || 'top';
+      this.hidden = !objectData.content.visible;
+
       this._renderer = new gdjs.BBTextRuntimeObjectRenderer(
         this,
         instanceContainer
       );
-      this.hidden = !objectData.content.visible;
 
       // *ALWAYS* call `this.onCreated()` at the very end of your object constructor.
       this.onCreated();
     }
 
-    getRendererObject() {
+    override getRendererObject() {
       return this._renderer.getRendererObject();
     }
 
     // @ts-ignore
-    updateFromObjectData(
+    override updateFromObjectData(
       oldObjectData: BBTextObjectDataType,
       newObjectData: BBTextObjectDataType
     ): boolean {
@@ -123,15 +129,23 @@ namespace gdjs {
         this.setFontSize(newObjectData.content.fontSize);
       }
       if (oldObjectData.content.wordWrap !== newObjectData.content.wordWrap) {
-        this.setWordWrap(newObjectData.content.wordWrap);
+        this.setWrapping(newObjectData.content.wordWrap);
       }
       if (oldObjectData.content.align !== newObjectData.content.align) {
-        this.setAlignment(newObjectData.content.align);
+        this.setTextAlignment(newObjectData.content.align);
+      }
+      if (
+        oldObjectData.content.verticalTextAlignment !==
+        newObjectData.content.verticalTextAlignment
+      ) {
+        this.setVerticalTextAlignment(
+          newObjectData.content.verticalTextAlignment
+        );
       }
       return true;
     }
 
-    getNetworkSyncData(): BBTextObjectNetworkSyncData {
+    override getNetworkSyncData(): BBTextObjectNetworkSyncData {
       return {
         ...super.getNetworkSyncData(),
         text: this._text,
@@ -139,14 +153,15 @@ namespace gdjs {
         c: this._color,
         ff: this._fontFamily,
         fs: this._fontSize,
-        wwrap: this._wordWrap,
+        wwrap: this._wrapping,
         wwidth: this._wrappingWidth,
-        align: this._align,
+        align: this._textAlign,
+        vta: this._verticalTextAlignment,
         hidden: this.hidden,
       };
     }
 
-    updateFromNetworkSyncData(
+    override updateFromNetworkSyncData(
       networkSyncData: BBTextObjectNetworkSyncData
     ): void {
       super.updateFromNetworkSyncData(networkSyncData);
@@ -166,26 +181,29 @@ namespace gdjs {
       if (this._fontSize !== undefined) {
         this.setFontSize(networkSyncData.fs);
       }
-      if (this._wordWrap !== undefined) {
-        this.setWordWrap(networkSyncData.wwrap);
+      if (this._wrapping !== undefined) {
+        this.setWrapping(networkSyncData.wwrap);
       }
       if (this._wrappingWidth !== undefined) {
         this.setWrappingWidth(networkSyncData.wwidth);
       }
-      if (this._align !== undefined) {
-        this.setAlignment(networkSyncData.align);
+      if (this._textAlign !== undefined) {
+        this.setTextAlignment(networkSyncData.align);
+      }
+      if (this._verticalTextAlignment !== undefined) {
+        this.setVerticalTextAlignment(networkSyncData.vta);
       }
       if (this.hidden !== undefined) {
         this.hide(networkSyncData.hidden);
       }
     }
 
-    /**
-     * Initialize the extra parameters that could be set for an instance.
-     */
-    extraInitializationFromInitialInstance(initialInstanceData: InstanceData) {
+    override extraInitializationFromInitialInstance(
+      initialInstanceData: InstanceData
+    ) {
       if (initialInstanceData.customSize) {
         this.setWrappingWidth(initialInstanceData.width);
+        this.setWrapping(true);
       } else {
         this.setWrappingWidth(
           // This value is the default wrapping width of the runtime object.
@@ -197,7 +215,7 @@ namespace gdjs {
       }
     }
 
-    onDestroyed(): void {
+    override onDestroyed(): void {
       super.onDestroyed();
       this._renderer.destroy();
     }
@@ -205,7 +223,7 @@ namespace gdjs {
     /**
      * Set the markup text to display.
      */
-    setBBText(text): void {
+    setBBText(text: string): void {
       this._text = text;
       this._renderer.updateText();
       this.invalidateHitboxes();
@@ -218,7 +236,7 @@ namespace gdjs {
       return this._text;
     }
 
-    setColor(rgbColorString): void {
+    setColor(rgbColorString: string): void {
       this._color = gdjs.rgbOrHexToRGBColor(rgbColorString);
       this._renderer.updateColor();
     }
@@ -231,7 +249,7 @@ namespace gdjs {
       return this._color[0] + ';' + this._color[1] + ';' + this._color[2];
     }
 
-    setFontSize(fontSize): void {
+    setFontSize(fontSize: float): void {
       this._fontSize = fontSize;
       this._renderer.updateFontSize();
     }
@@ -240,47 +258,66 @@ namespace gdjs {
       return this._fontSize;
     }
 
-    setFontFamily(fontFamily): void {
+    setFontFamily(fontFamily: string): void {
       this._fontFamily = fontFamily;
       this._renderer.updateFontFamily();
     }
 
-    getFontFamily() {
+    getFontFamily(): string {
       return this._fontFamily;
     }
 
-    setAlignment(align): void {
-      this._align = align;
+    /**
+     * @deprecated Use `setTextAlignment` instead
+     */
+    setAlignment(align: string): void {
+      this.setTextAlignment(align);
+    }
+
+    setTextAlignment(align: string): void {
+      this._textAlign = align;
       this._renderer.updateAlignment();
     }
 
-    getAlignment() {
-      return this._align;
+    /**
+     * @deprecated Use `getTextAlignment` instead
+     */
+    getAlignment(): string {
+      return this.getTextAlignment();
+    }
+
+    getTextAlignment(): string {
+      return this._textAlign;
     }
 
     /**
-     * Set object position on X axis.
-     * @param x The new position X of the object.
+     * Set the text alignment on Y axis for multiline text objects.
+     * @param alignment The text alignment.
      */
-    setX(x: float): void {
+    setVerticalTextAlignment(alignment: string): void {
+      this._verticalTextAlignment = alignment;
+      this._renderer.updatePosition();
+    }
+
+    /**
+     * Get the text alignment on Y axis of text object.
+     * @return The text alignment.
+     */
+    getVerticalTextAlignment(): string {
+      return this._verticalTextAlignment;
+    }
+
+    override setX(x: float): void {
       super.setX(x);
       this._renderer.updatePosition();
     }
 
-    /**
-     * Set object position on Y axis.
-     * @param y The new position Y of the object.
-     */
-    setY(y: float): void {
+    override setY(y: float): void {
       super.setY(y);
       this._renderer.updatePosition();
     }
 
-    /**
-     * Set the angle of the object.
-     * @param angle The new angle of the object.
-     */
-    setAngle(angle: float): void {
+    override setAngle(angle: float): void {
       super.setAngle(angle);
       this._renderer.updateAngle();
     }
@@ -326,31 +363,36 @@ namespace gdjs {
       return this._wrappingWidth;
     }
 
-    setWordWrap(wordWrap: boolean): void {
-      if (this._wordWrap === wordWrap) return;
+    setWrapping(wordWrap: boolean): void {
+      if (this._wrapping === wordWrap) return;
 
-      this._wordWrap = wordWrap;
+      this._wrapping = wordWrap;
       this._renderer.updateWordWrap();
       this.invalidateHitboxes();
     }
 
-    getWordWrap() {
-      return this._wordWrap;
+    isWrapping() {
+      return this._wrapping;
     }
 
-    /**
-     * Get the width of the object.
-     */
-    getWidth(): float {
-      return this._renderer.getWidth();
+    override getWidth(): float {
+      return this._wrapping ? this._wrappingWidth : this._renderer.getWidth();
     }
 
-    /**
-     * Get the height of the object.
-     */
-    getHeight(): float {
+    override getHeight(): float {
       return this._renderer.getHeight();
     }
+
+    override getDrawableY(): float {
+      return (
+        this.getY() -
+        (this._verticalTextAlignment === 'center'
+          ? this.getHeight() / 2
+          : this._verticalTextAlignment === 'bottom'
+            ? this.getHeight()
+            : 0)
+      );
+    }
   }
   // @ts-ignore
   gdjs.registerObject('BBText::BBText', gdjs.BBTextRuntimeObject);

Extensions/BitmapText/JsExtension.js

@@ -54,7 +54,7 @@ module.exports = {
       objectProperties
         .getOrCreate('text')
         .setValue(objectContent.text)
-        .setType('textarea')
+        .setType('multilinestring')
         .setLabel(_('Text'));
 
       objectProperties
@@ -67,6 +67,19 @@ module.exports = {
         .setLabel(_('Alignment'))
         .setGroup(_('Appearance'));
 
+      if (!objectContent.verticalTextAlignment) {
+        objectContent.verticalTextAlignment = 'top';
+      }
+      objectProperties
+        .getOrCreate('verticalTextAlignment')
+        .setValue(objectContent.verticalTextAlignment)
+        .setType('choice')
+        .addExtraInfo('top')
+        .addExtraInfo('center')
+        .addExtraInfo('bottom')
+        .setLabel(_('Vertical alignment'))
+        .setGroup(_('Appearance'));
+
       objectProperties
         .getOrCreate('bitmapFontResourceName')
         .setValue(objectContent.bitmapFontResourceName)
@@ -97,18 +110,10 @@ module.exports = {
         .setLabel(_('Font tint'))
         .setGroup(_('Font'));
 
-      objectProperties
-        .getOrCreate('wordWrap')
-        .setValue(objectContent.wordWrap ? 'true' : 'false')
-        .setType('boolean')
-        .setLabel(_('Word wrapping'))
-        .setGroup(_('Appearance'));
-
       return objectProperties;
     };
     bitmapTextObject.content = {
-      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,
@@ -116,7 +121,7 @@ module.exports = {
       bitmapFontResourceName: '',
       textureAtlasResourceName: '',
       align: 'left',
-      wordWrap: true,
+      verticalTextAlignment: 'top',
     };
 
     bitmapTextObject.updateInitialInstanceProperty = function (
@@ -342,7 +347,7 @@ module.exports = {
           _('Alignment ("left", "right" or "center")')
         )
       )
-      .setFunctionName('getAlignment');
+      .setFunctionName('getTextAlignment');
 
     object
       .addAction(
@@ -362,36 +367,36 @@ module.exports = {
         false
       )
       .getCodeExtraInformation()
-      .setFunctionName('setAlignment');
+      .setFunctionName('setTextAlignment');
 
     object
       .addCondition(
         'WordWrap',
-        _('Word wrap'),
-        _('Check if word wrap is enabled.'),
-        _('_PARAM0_ word wrap is enabled'),
+        _('Word wrapping'),
+        _('Check if word wrapping is enabled.'),
+        _('_PARAM0_ word wrapping is enabled'),
         '',
         'res/conditions/wordWrap24_black.png',
         'res/conditions/wordWrap_black.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
       .getCodeExtraInformation()
-      .setFunctionName('getWordWrap');
+      .setFunctionName('isWrapping');
 
     object
       .addAction(
         'SetWordWrap',
-        _('Word wrap'),
+        _('Word wrapping'),
         _('De/activate word wrapping.'),
-        _('Activate word wrap of _PARAM0_: _PARAM1_'),
+        _('Activate word wrapping of _PARAM0_: _PARAM1_'),
         '',
         'res/actions/wordWrap24_black.png',
         'res/actions/wordWrap_black.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .addParameter('yesorno', _('Activate word wrap'), '', false)
+      .addParameter('yesorno', _('Activate word wrapping'), '', false)
       .getCodeExtraInformation()
-      .setFunctionName('setWordWrap');
+      .setFunctionName('setWrapping');
 
     object
       .addExpressionAndConditionAndAction(
@@ -625,14 +630,16 @@ module.exports = {
         instance,
         associatedObjectConfiguration,
         pixiContainer,
-        pixiResourcesLoader
+        pixiResourcesLoader,
+        propertyOverridings
       ) {
         super(
           project,
           instance,
           associatedObjectConfiguration,
           pixiContainer,
-          pixiResourcesLoader
+          pixiResourcesLoader,
+          propertyOverridings
         );
 
         // We'll track changes of the font to trigger the loading of the new font.
@@ -658,16 +665,16 @@ module.exports = {
 
         // Update the rendered text properties (note: Pixi is only
         // applying changes if there were changed).
-        const rawText = object.content.text;
-        this._pixiObject.text = rawText;
+        this._pixiObject.text = this._propertyOverridings.has('Text')
+          ? this._propertyOverridings.get('Text')
+          : object.content.text;
 
         const align = object.content.align;
         this._pixiObject.align = align;
 
         const color = object.content.tint;
-        this._pixiObject.tint = objectsRenderingService.rgbOrHexToHexNumber(
-          color
-        );
+        this._pixiObject.tint =
+          objectsRenderingService.rgbOrHexToHexNumber(color);
 
         const scale = object.content.scale;
         this._pixiObject.scale.set(scale);
@@ -706,20 +713,45 @@ module.exports = {
         }
 
         // Set up the wrapping width if enabled.
-        const wordWrap = object.content.wordWrap;
-        if (wordWrap && this._instance.hasCustomSize()) {
-          this._pixiObject.maxWidth =
-            this.getCustomWidth() / this._pixiObject.scale.x;
-          this._pixiObject.dirty = true;
-        } else {
-          this._pixiObject.maxWidth = 0;
+        const oldMaxWidth = this._pixiObject.maxWidth;
+        this._pixiObject.maxWidth = this._instance.hasCustomSize()
+          ? this.getCustomWidth() / this._pixiObject.scale.x
+          : 0;
+        if (oldMaxWidth !== this._pixiObject.maxWidth) {
           this._pixiObject.dirty = true;
         }
 
-        this._pixiObject.position.x =
-          this._instance.getX() + (this._pixiObject.textWidth * scale) / 2;
+        if (this._instance.hasCustomSize() && this.getDefaultWidth() !== 0) {
+          const alignmentX =
+            object.content.align === 'right'
+              ? 1
+              : object.content.align === 'center'
+                ? 0.5
+                : 0;
+
+          const width = this.getCustomWidth();
+          const renderedWidth = this.getDefaultWidth();
+
+          // A vector from the custom size center to the renderer center.
+          const centerToCenterX = (width - renderedWidth) * (alignmentX - 0.5);
+
+          this._pixiObject.position.x = this._instance.getX() + width / 2;
+          this._pixiObject.anchor.x = 0.5 - centerToCenterX / renderedWidth;
+        } else {
+          this._pixiObject.position.x =
+            this._instance.getX() + this.getDefaultWidth() / 2;
+          this._pixiObject.anchor.x = 0.5;
+        }
+        const alignmentY =
+          object.content.verticalTextAlignment === 'bottom'
+            ? 1
+            : object.content.verticalTextAlignment === 'center'
+              ? 0.5
+              : 0;
         this._pixiObject.position.y =
-          this._instance.getY() + (this._pixiObject.textHeight * scale) / 2;
+          this._instance.getY() + this.getDefaultHeight() * (0.5 - alignmentY);
+        this._pixiObject.anchor.y = 0.5;
+
         this._pixiObject.rotation = RenderedInstance.toRad(
           this._instance.getAngle()
         );
@@ -740,18 +772,25 @@ module.exports = {
         releaseBitmapFont(fontName);
       }
 
-      /**
-       * Return the width of the instance, when it's not resized.
-       */
       getDefaultWidth() {
-        return this._pixiObject.width;
+        return this._pixiObject.textWidth * this._pixiObject.scale.x;
       }
 
-      /**
-       * Return the height of the instance, when it's not resized.
-       */
       getDefaultHeight() {
-        return this._pixiObject.height;
+        return this._pixiObject.textHeight * this._pixiObject.scale.y;
+      }
+
+      getOriginY() {
+        const object = gd.castObject(
+          this._associatedObjectConfiguration,
+          gd.ObjectJsImplementation
+        );
+        const height = this.getHeight();
+        return object.content.verticalTextAlignment === 'bottom'
+          ? height
+          : object.content.verticalTextAlignment === 'center'
+            ? height / 2
+            : 0;
       }
     }
 

Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.ts

@@ -35,13 +35,6 @@ namespace gdjs {
         .getRenderer()
         .addRendererObject(this._pixiObject, runtimeObject.getZOrder());
 
-      // Set the anchor in the center, so that the object rotates around
-      // its center.
-      // @ts-ignore
-      this._pixiObject.anchor.x = 0.5;
-      // @ts-ignore
-      this._pixiObject.anchor.y = 0.5;
-
       this.updateAlignment();
       this.updateTextContent();
       this.updateAngle();
@@ -130,7 +123,7 @@ namespace gdjs {
     }
 
     updateWrappingWidth(): void {
-      if (this._object._wordWrap) {
+      if (this._object._wrapping) {
         this._pixiObject.maxWidth =
           this._object._wrappingWidth / this._object._scaleX;
         this._pixiObject.dirty = true;
@@ -148,13 +141,41 @@ namespace gdjs {
 
     updateAlignment(): void {
       // @ts-ignore - assume align is always a valid value.
-      this._pixiObject.align = this._object._align;
+      this._pixiObject.align = this._object._textAlign;
       this.updatePosition();
     }
 
     updatePosition(): void {
-      this._pixiObject.position.x = this._object.x + this.getWidth() / 2;
-      this._pixiObject.position.y = this._object.y + this.getHeight() / 2;
+      if (this._object.isWrapping() && this.getWidth() !== 0) {
+        const alignmentX =
+          this._object._textAlign === 'right'
+            ? 1
+            : this._object._textAlign === 'center'
+              ? 0.5
+              : 0;
+
+        const width = this._object.getWrappingWidth();
+        const renderedWidth = this.getWidth();
+
+        // A vector from the custom size center to the renderer center.
+        const centerToCenterX = (width - renderedWidth) * (alignmentX - 0.5);
+
+        this._pixiObject.position.x = this._object.x + width / 2;
+        this._pixiObject.anchor.x = 0.5 - centerToCenterX / renderedWidth;
+      } else {
+        this._pixiObject.position.x = this._object.x + this.getWidth() / 2;
+        this._pixiObject.anchor.x = 0.5;
+      }
+
+      const alignmentY =
+        this._object._verticalTextAlignment === 'bottom'
+          ? 1
+          : this._object._verticalTextAlignment === 'center'
+            ? 0.5
+            : 0;
+      this._pixiObject.position.y =
+        this._object.y + this.getHeight() * (0.5 - alignmentY);
+      this._pixiObject.anchor.y = 0.5;
     }
 
     updateAngle(): void {
@@ -173,5 +194,6 @@ namespace gdjs {
       return this._pixiObject.textHeight * this.getScale();
     }
   }
-  export const BitmapTextRuntimeObjectRenderer = BitmapTextRuntimeObjectPixiRenderer;
+  export const BitmapTextRuntimeObjectRenderer =
+    BitmapTextRuntimeObjectPixiRenderer;
 }

Extensions/BitmapText/bitmaptextruntimeobject.ts

@@ -15,12 +15,11 @@ namespace gdjs {
       textureAtlasResourceName: string;
       /** The scale of the text. */
       scale: float;
-      /** Activate word wrap if set to true. */
-      wordWrap: boolean;
       /** Wrapping with from custom size properties. */
       wrappingWidth: float;
       /** Alignment of the text. */
       align: 'left' | 'center' | 'right';
+      verticalTextAlignment: 'top' | 'center' | 'bottom';
     };
   };
   export type BitmapTextObjectData = ObjectData & BitmapTextObjectDataType;
@@ -35,6 +34,7 @@ namespace gdjs {
     wwrap: boolean;
     wwidth: float;
     align: string;
+    vta: string;
   };
 
   export type BitmapTextObjectNetworkSyncData = ObjectNetworkSyncData &
@@ -52,7 +52,8 @@ namespace gdjs {
    */
   export class BitmapTextRuntimeObject
     extends gdjs.RuntimeObject
-    implements gdjs.TextContainer, gdjs.OpacityHandler, gdjs.Scalable {
+    implements gdjs.TextContainer, gdjs.OpacityHandler, gdjs.Scalable
+  {
     _opacity: float;
     _text: string;
     /** color in format [r, g, b], where each component is in the range [0, 255] */
@@ -61,9 +62,10 @@ namespace gdjs {
     _textureAtlasResourceName: string;
     _scaleX: number;
     _scaleY: number;
-    _wordWrap: boolean;
+    _wrapping: boolean = false;
     _wrappingWidth: float;
-    _align: string;
+    _textAlign: string;
+    _verticalTextAlignment: string;
 
     _renderer: gdjs.BitmapTextRuntimeObjectPixiRenderer;
 
@@ -86,9 +88,10 @@ namespace gdjs {
         objectData.content.textureAtlasResourceName; // texture file used with fnt/xml (bitmap font file)
       this._scaleX = objectData.content.scale;
       this._scaleY = objectData.content.scale;
-      this._wordWrap = objectData.content.wordWrap;
       this._wrappingWidth = 0;
-      this._align = objectData.content.align;
+      this._textAlign = objectData.content.align;
+      this._verticalTextAlignment =
+        objectData.content.verticalTextAlignment || 'top';
 
       this._renderer = new gdjs.BitmapTextRuntimeObjectRenderer(
         this,
@@ -99,12 +102,12 @@ namespace gdjs {
       this.onCreated();
     }
 
-    getRendererObject() {
+    override getRendererObject() {
       return this._renderer.getRendererObject();
     }
 
     // @ts-ignore
-    updateFromObjectData(
+    override updateFromObjectData(
       oldObjectData: BitmapTextObjectDataType,
       newObjectData: BitmapTextObjectDataType
     ): boolean {
@@ -137,17 +140,22 @@ namespace gdjs {
       if (oldObjectData.content.scale !== newObjectData.content.scale) {
         this.setScale(newObjectData.content.scale);
       }
-      if (oldObjectData.content.wordWrap !== newObjectData.content.wordWrap) {
-        this.setWordWrap(newObjectData.content.wordWrap);
-      }
       if (oldObjectData.content.align !== newObjectData.content.align) {
-        this.setAlignment(newObjectData.content.align);
+        this.setTextAlignment(newObjectData.content.align);
+      }
+      if (
+        oldObjectData.content.verticalTextAlignment !==
+        newObjectData.content.verticalTextAlignment
+      ) {
+        this.setVerticalTextAlignment(
+          newObjectData.content.verticalTextAlignment
+        );
       }
 
       return true;
     }
 
-    getNetworkSyncData(): BitmapTextObjectNetworkSyncData {
+    override getNetworkSyncData(): BitmapTextObjectNetworkSyncData {
       return {
         ...super.getNetworkSyncData(),
         text: this._text,
@@ -156,13 +164,14 @@ namespace gdjs {
         bfrn: this._bitmapFontResourceName,
         tarn: this._textureAtlasResourceName,
         scale: this.getScale(),
-        wwrap: this._wordWrap,
+        wwrap: this._wrapping,
         wwidth: this._wrappingWidth,
-        align: this._align,
+        align: this._textAlign,
+        vta: this._verticalTextAlignment,
       };
     }
 
-    updateFromNetworkSyncData(
+    override updateFromNetworkSyncData(
       networkSyncData: BitmapTextObjectNetworkSyncData
     ): void {
       super.updateFromNetworkSyncData(networkSyncData);
@@ -185,30 +194,36 @@ namespace gdjs {
       if (this._scaleX !== undefined) {
         this.setScale(networkSyncData.scale);
       }
-      if (this._wordWrap !== undefined) {
-        this.setWordWrap(networkSyncData.wwrap);
+      if (this._wrapping !== undefined) {
+        this.setWrapping(networkSyncData.wwrap);
       }
       if (this._wrappingWidth !== undefined) {
         this.setWrappingWidth(networkSyncData.wwidth);
       }
-      if (this._align !== undefined) {
-        this.setAlignment(networkSyncData.align);
+      if (this._textAlign !== undefined) {
+        this.setTextAlignment(networkSyncData.align);
+      }
+      if (this._verticalTextAlignment !== undefined) {
+        this.setVerticalTextAlignment(networkSyncData.vta);
       }
     }
 
     /**
      * Initialize the extra parameters that could be set for an instance.
      */
-    extraInitializationFromInitialInstance(initialInstanceData: InstanceData) {
+    override extraInitializationFromInitialInstance(
+      initialInstanceData: InstanceData
+    ) {
       if (initialInstanceData.customSize) {
         this.setWrappingWidth(initialInstanceData.width);
+        this.setWrapping(true);
       }
       if (initialInstanceData.opacity !== undefined) {
         this.setOpacity(initialInstanceData.opacity);
       }
     }
 
-    onDestroyed(): void {
+    override onDestroyed(): void {
       super.onDestroyed();
       this._renderer.onDestroy();
     }
@@ -313,38 +328,43 @@ namespace gdjs {
       return this._textureAtlasResourceName;
     }
 
-    setAlignment(align: string): void {
-      this._align = align;
+    setTextAlignment(align: string): void {
+      this._textAlign = align;
       this._renderer.updateAlignment();
     }
 
-    getAlignment(): string {
-      return this._align;
+    getTextAlignment(): string {
+      return this._textAlign;
     }
 
     /**
-     * Set object position on X axis.
-     * @param x The new position X of the object.
+     * Set the text alignment on Y axis for multiline text objects.
+     * @param alignment The text alignment.
      */
-    setX(x: float): void {
+    setVerticalTextAlignment(alignment: string): void {
+      this._verticalTextAlignment = alignment;
+      this._renderer.updatePosition();
+    }
+
+    /**
+     * Get the text alignment on Y axis of text object.
+     * @return The text alignment.
+     */
+    getVerticalTextAlignment(): string {
+      return this._verticalTextAlignment;
+    }
+
+    override setX(x: float): void {
       super.setX(x);
       this._renderer.updatePosition();
     }
 
-    /**
-     * Set object position on Y axis.
-     * @param y The new position Y of the object.
-     */
-    setY(y: float): void {
+    override setY(y: float): void {
       super.setY(y);
       this._renderer.updatePosition();
     }
 
-    /**
-     * Set the angle of the object.
-     * @param angle The new angle of the object.
-     */
-    setAngle(angle: float): void {
+    override setAngle(angle: float): void {
       super.setAngle(angle);
       this._renderer.updateAngle();
     }
@@ -388,29 +408,34 @@ namespace gdjs {
       return this._wrappingWidth;
     }
 
-    setWordWrap(wordWrap: boolean): void {
-      this._wordWrap = wordWrap;
+    setWrapping(wordWrap: boolean): void {
+      this._wrapping = wordWrap;
       this._renderer.updateWrappingWidth();
       this.invalidateHitboxes();
     }
 
-    getWordWrap(): boolean {
-      return this._wordWrap;
+    isWrapping(): boolean {
+      return this._wrapping;
     }
 
-    /**
-     * Get the width of the object.
-     */
-    getWidth(): float {
-      return this._renderer.getWidth();
+    override getWidth(): float {
+      return this._wrapping ? this._wrappingWidth : this._renderer.getWidth();
     }
 
-    /**
-     * Get the height of the object.
-     */
-    getHeight(): float {
+    override getHeight(): float {
       return this._renderer.getHeight();
     }
+
+    override getDrawableY(): float {
+      return (
+        this.getY() -
+        (this._verticalTextAlignment === 'center'
+          ? this.getHeight() / 2
+          : this._verticalTextAlignment === 'bottom'
+            ? this.getHeight()
+            : 0)
+      );
+    }
   }
   gdjs.registerObject(
     'BitmapText::BitmapTextObject',

Extensions/DestroyOutsideBehavior/DestroyOutsideBehavior.cpp

@@ -12,7 +12,7 @@ This project is released under the MIT License.
 #include "GDCore/Tools/Localization.h"
 
 void DestroyOutsideBehavior::InitializeContent(gd::SerializerElement& content) {
-  content.SetAttribute("extraBorder", 0);
+  content.SetAttribute("extraBorder", 300);
 }
 
 #if defined(GD_IDE_ONLY)

Extensions/DestroyOutsideBehavior/Extension.cpp

@@ -12,35 +12,42 @@ This project is released under the MIT License.
 
 void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("DestroyOutsideBehavior",
-                               _("Destroy Outside Screen Behavior"),
-                               _("This behavior can be used to destroy "
-                                 "objects when they go outside of "
-                                 "the bounds of the camera. Useful for bullets "
-                                 "or other short-lived objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "DestroyOutsideBehavior",
+          _("Destroy Outside Screen Behavior"),
+          _("This behavior can be used to destroy objects when they go "
+            "outside of the bounds of the 2D camera. Useful for 2D bullets or "
+            "other short-lived objects. Don't use it for 3D objects in a "
+            "FPS/TPS game or any game with a camera not being a top view "
+            "(for 3D objects, prefer comparing "
+            "the position, for example Z position to see if an object goes "
+            "outside of the bound of the map). Be careful when using this "
+            "behavior because if the object appears outside of the screen, it "
+            "will be immediately removed."),
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetCategory("Game mechanic")
       .SetTags("screen")
       .SetExtensionHelpPath("/behaviors/destroyoutside");
 
   gd::BehaviorMetadata& aut =
-      extension.AddBehavior("DestroyOutside",
-                            _("Destroy when outside of the screen"),
-                            _("DestroyOutside"),
-                            _("Destroy objects automatically when they go "
-                              "outside of the screen's borders."),
-                            "",
-                            "CppPlatform/Extensions/destroyoutsideicon.png",
-                            "DestroyOutsideBehavior",
-                            std::make_shared<DestroyOutsideBehavior>(),
-                            std::shared_ptr<gd::BehaviorsSharedData>())
-                            .SetQuickCustomizationVisibility(gd::QuickCustomization::Hidden);
+      extension
+          .AddBehavior("DestroyOutside",
+                       _("Destroy when outside of the screen"),
+                       _("DestroyOutside"),
+                       _("Destroy objects automatically when they go "
+                         "outside of the 2D camera borders."),
+                       "",
+                       "CppPlatform/Extensions/destroyoutsideicon.png",
+                       "DestroyOutsideBehavior",
+                       std::make_shared<DestroyOutsideBehavior>(),
+                       std::shared_ptr<gd::BehaviorsSharedData>())
+          .SetQuickCustomizationVisibility(gd::QuickCustomization::Hidden);
 
   aut.AddCondition("ExtraBorder",
-                   _("Additional border"),
-                   _("Compare the additional border that the object must cross "
-                     "before being deleted."),
+                   _("Additional border (extra distance before deletion)"),
+                   _("Compare the extra distance (in pixels) the object must "
+                     "travel beyond the screen before it gets deleted."),
                    _("the additional border"),
                    _("Destroy outside configuration"),
                    "CppPlatform/Extensions/destroyoutsideicon24.png",
@@ -53,9 +60,9 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
       .SetFunctionName("GetExtraBorder");
 
   aut.AddAction("ExtraBorder",
-                _("Additional border"),
-                _("Change the additional border that the object must cross "
-                  "before being deleted."),
+                _("Additional border (extra distance before deletion)"),
+                _("Change the extra distance (in pixels) the object must "
+                  "travel beyond the screen before it gets deleted."),
                 _("the additional border"),
                 _("Destroy outside configuration"),
                 "CppPlatform/Extensions/destroyoutsideicon24.png",

Extensions/DestroyOutsideBehavior/destroyoutsideruntimebehavior.ts

@@ -46,7 +46,7 @@ namespace gdjs {
           layer.getCameraY() + layer.getCameraHeight() / 2
       ) {
         //We are outside the camera area.
-        this.owner.deleteFromScene(instanceContainer);
+        this.owner.deleteFromScene();
       }
     }
 

Extensions/DialogueTree/dialoguetools.ts

@@ -249,13 +249,16 @@ namespace gdjs {
           (clipTextEnd === 0 || clipTextEnd !== dialogueText.length)
         ) {
           pauseScrolling = true;
-          setTimeout(function () {
-            pauseScrolling = false;
-            commandCalls.splice(index, 1);
-            if (gdjs.dialogueTree.getVariable('debug')) {
-              logger.info('CMD:', call);
-            }
-          }, parseInt(call.params[1], 10));
+          setTimeout(
+            function () {
+              pauseScrolling = false;
+              commandCalls.splice(index, 1);
+              if (gdjs.dialogueTree.getVariable('debug')) {
+                logger.info('CMD:', call);
+              }
+            },
+            parseInt(call.params[1], 10)
+          );
         }
         if (call.cmd === command) {
           commandParameters = call.params;

Extensions/DraggableBehavior/draggableruntimebehavior.ts

@@ -157,9 +157,8 @@ namespace gdjs {
       if (!instanceContainer.touchDraggableManagers[touchId]) {
         //Create the shared manager if necessary.
         // @ts-ignore
-        instanceContainer.touchDraggableManagers[
-          touchId
-        ] = new DraggableManager(instanceContainer, touchId);
+        instanceContainer.touchDraggableManagers[touchId] =
+          new DraggableManager(instanceContainer, touchId);
       }
       // @ts-ignore
       return instanceContainer.touchDraggableManagers[touchId];

Extensions/Effects/adjustment-pixi-filter.ts

@@ -22,7 +22,8 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
+        const adjustmentFilter =
+          filter as unknown as PIXI.filters.AdjustmentFilter;
         if (parameterName === 'gamma') {
           adjustmentFilter.gamma = value;
         } else if (parameterName === 'saturation') {
@@ -42,7 +43,8 @@ namespace gdjs {
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
+        const adjustmentFilter =
+          filter as unknown as PIXI.filters.AdjustmentFilter;
         if (parameterName === 'gamma') {
           return adjustmentFilter.gamma;
         }
@@ -88,7 +90,8 @@ namespace gdjs {
         value: boolean
       ) {}
       getNetworkSyncData(filter: PIXI.Filter): AdjustmentFilterNetworkSyncData {
-        const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
+        const adjustmentFilter =
+          filter as unknown as PIXI.filters.AdjustmentFilter;
         return {
           ga: adjustmentFilter.gamma,
           sa: adjustmentFilter.saturation,
@@ -104,7 +107,8 @@ namespace gdjs {
         filter: PIXI.Filter,
         data: AdjustmentFilterNetworkSyncData
       ): void {
-        const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
+        const adjustmentFilter =
+          filter as unknown as PIXI.filters.AdjustmentFilter;
         adjustmentFilter.gamma = data.ga;
         adjustmentFilter.saturation = data.sa;
         adjustmentFilter.contrast = data.co;

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

@@ -20,7 +20,8 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
+        const advancedBloomFilter =
+          filter as unknown as PIXI.filters.AdvancedBloomFilter;
         if (parameterName === 'threshold') {
           advancedBloomFilter.threshold = value;
         } else if (parameterName === 'bloomScale') {
@@ -36,7 +37,8 @@ namespace gdjs {
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
+        const advancedBloomFilter =
+          filter as unknown as PIXI.filters.AdvancedBloomFilter;
         if (parameterName === 'threshold') {
           return advancedBloomFilter.threshold;
         }
@@ -78,7 +80,8 @@ namespace gdjs {
       getNetworkSyncData(
         filter: PIXI.Filter
       ): AdvancedBloomFilterNetworkSyncData {
-        const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
+        const advancedBloomFilter =
+          filter as unknown as PIXI.filters.AdvancedBloomFilter;
         return {
           th: advancedBloomFilter.threshold,
           bs: advancedBloomFilter.bloomScale,
@@ -92,7 +95,8 @@ namespace gdjs {
         filter: PIXI.Filter,
         syncData: AdvancedBloomFilterNetworkSyncData
       ) {
-        const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
+        const advancedBloomFilter =
+          filter as unknown as PIXI.filters.AdvancedBloomFilter;
         advancedBloomFilter.threshold = syncData.th;
         advancedBloomFilter.bloomScale = syncData.bs;
         advancedBloomFilter.brightness = syncData.bn;

Extensions/Effects/ascii-pixi-filter.ts

@@ -15,13 +15,13 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
+        const asciiFilter = filter as unknown as PIXI.filters.AsciiFilter;
         if (parameterName === 'size') {
           asciiFilter.size = value;
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
+        const asciiFilter = filter as unknown as PIXI.filters.AsciiFilter;
         if (parameterName === 'size') {
           return asciiFilter.size;
         }
@@ -46,14 +46,14 @@ namespace gdjs {
         value: boolean
       ) {}
       getNetworkSyncData(filter: PIXI.Filter): AsciiFilterNetworkSyncData {
-        const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
+        const asciiFilter = filter as unknown as PIXI.filters.AsciiFilter;
         return { size: asciiFilter.size };
       }
       updateFromNetworkSyncData(
         filter: PIXI.Filter,
         data: AsciiFilterNetworkSyncData
       ) {
-        const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
+        const asciiFilter = filter as unknown as PIXI.filters.AsciiFilter;
         asciiFilter.size = data.size;
       }
     })()

Extensions/Effects/bevel-pixi-filter.ts

@@ -25,7 +25,7 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter &
           BevelFilterExtra;
         if (parameterName === 'rotation') {
           bevelFilter.rotation = value;
@@ -40,7 +40,7 @@ namespace gdjs {
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter &
           BevelFilterExtra;
         if (parameterName === 'rotation') {
           return bevelFilter.rotation;
@@ -64,7 +64,7 @@ namespace gdjs {
         parameterName: string,
         value: string
       ) {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter &
           BevelFilterExtra;
         if (parameterName === 'lightColor') {
           bevelFilter.lightColor = gdjs.rgbOrHexStringToNumber(value);
@@ -78,7 +78,7 @@ namespace gdjs {
         parameterName: string,
         value: number
       ): void {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter &
           BevelFilterExtra;
         if (parameterName === 'lightColor') {
           bevelFilter.lightColor = value;
@@ -88,7 +88,7 @@ namespace gdjs {
         }
       }
       getColorParameter(filter: PIXI.Filter, parameterName: string): number {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter;
         if (parameterName === 'lightColor') {
           return bevelFilter.lightColor;
         }
@@ -103,7 +103,7 @@ namespace gdjs {
         value: boolean
       ) {}
       getNetworkSyncData(filter: PIXI.Filter): BevelFilterNetworkSyncData {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter &
           BevelFilterExtra;
         return {
           r: bevelFilter.rotation,
@@ -119,7 +119,7 @@ namespace gdjs {
         filter: PIXI.Filter,
         data: BevelFilterNetworkSyncData
       ) {
-        const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter &
+        const bevelFilter = filter as unknown as PIXI.filters.BevelFilter &
           BevelFilterExtra;
         bevelFilter.rotation = data.r;
         bevelFilter.thickness = data.t;

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

@@ -16,14 +16,14 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const colorMatrix = (filter as unknown) as PIXI.ColorMatrixFilter;
+        const colorMatrix = filter as unknown as PIXI.ColorMatrixFilter;
         if (parameterName !== 'opacity') {
           return;
         }
         colorMatrix.alpha = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const colorMatrix = (filter as unknown) as PIXI.ColorMatrixFilter;
+        const colorMatrix = filter as unknown as PIXI.ColorMatrixFilter;
         if (parameterName === 'opacity') {
           return colorMatrix.alpha;
         }
@@ -50,14 +50,14 @@ namespace gdjs {
       getNetworkSyncData(
         filter: PIXI.Filter
       ): BlackAndWhiteFilterNetworkSyncData {
-        const colorMatrix = (filter as unknown) as PIXI.ColorMatrixFilter;
+        const colorMatrix = filter as unknown as PIXI.ColorMatrixFilter;
         return { a: colorMatrix.alpha };
       }
       updateFromNetworkSyncData(
         filter: PIXI.Filter,
         data: BlackAndWhiteFilterNetworkSyncData
       ) {
-        const colorMatrix = (filter as unknown) as PIXI.ColorMatrixFilter;
+        const colorMatrix = filter as unknown as PIXI.ColorMatrixFilter;
         colorMatrix.alpha = data.a;
       }
     })()

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

@@ -16,7 +16,7 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const blendingModeFilter = (filter as unknown) as PIXI.AlphaFilter;
+        const blendingModeFilter = filter as unknown as PIXI.AlphaFilter;
         if (parameterName === 'alpha') {
           blendingModeFilter.alpha = value;
         } else if (parameterName === 'blendmode') {
@@ -24,7 +24,7 @@ namespace gdjs {
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const blendingModeFilter = (filter as unknown) as PIXI.AlphaFilter;
+        const blendingModeFilter = filter as unknown as PIXI.AlphaFilter;
         if (parameterName === 'alpha') {
           return blendingModeFilter.alpha;
         }
@@ -54,7 +54,7 @@ namespace gdjs {
       getNetworkSyncData(
         filter: PIXI.Filter
       ): BlendingModeFilterNetworkSyncData {
-        const blendingModeFilter = (filter as unknown) as PIXI.AlphaFilter;
+        const blendingModeFilter = filter as unknown as PIXI.AlphaFilter;
         return {
           a: blendingModeFilter.alpha,
           bm: blendingModeFilter.blendMode,
@@ -64,7 +64,7 @@ namespace gdjs {
         filter: PIXI.Filter,
         data: BlendingModeFilterNetworkSyncData
       ) {
-        const blendingModeFilter = (filter as unknown) as PIXI.AlphaFilter;
+        const blendingModeFilter = filter as unknown as PIXI.AlphaFilter;
         blendingModeFilter.alpha = data.a;
         blendingModeFilter.blendMode = data.bm;
       }

Extensions/Effects/brightness-pixi-filter.ts

@@ -20,7 +20,7 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const brightnessFilter = (filter as unknown) as PIXI.ColorMatrixFilter &
+        const brightnessFilter = filter as unknown as PIXI.ColorMatrixFilter &
           BrightnessFilterExtra;
         if (parameterName !== 'brightness') {
           return;
@@ -30,7 +30,7 @@ namespace gdjs {
         brightnessFilter.brightness(brightness, false);
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const brightnessFilter = (filter as unknown) as PIXI.ColorMatrixFilter &
+        const brightnessFilter = filter as unknown as PIXI.ColorMatrixFilter &
           BrightnessFilterExtra;
         if (parameterName === 'brightness') {
           return brightnessFilter.__brightness;
@@ -56,7 +56,7 @@ namespace gdjs {
         value: boolean
       ) {}
       getNetworkSyncData(filter: PIXI.Filter): BrightnessFilterNetworkSyncData {
-        const brightnessFilter = (filter as unknown) as PIXI.ColorMatrixFilter &
+        const brightnessFilter = filter as unknown as PIXI.ColorMatrixFilter &
           BrightnessFilterExtra;
         return { b: brightnessFilter.__brightness };
       }
@@ -64,7 +64,7 @@ namespace gdjs {
         filter: PIXI.Filter,
         data: BrightnessFilterNetworkSyncData
       ) {
-        const brightnessFilter = (filter as unknown) as PIXI.ColorMatrixFilter &
+        const brightnessFilter = filter as unknown as PIXI.ColorMatrixFilter &
           BrightnessFilterExtra;
         brightnessFilter.__brightness = data.b;
         brightnessFilter.brightness(data.b, false);

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

@@ -18,7 +18,8 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const bulgePinchFilter = (filter as unknown) as PIXI.filters.BulgePinchFilter;
+        const bulgePinchFilter =
+          filter as unknown as PIXI.filters.BulgePinchFilter;
         if (parameterName === 'centerX') {
           bulgePinchFilter.center[0] = value;
         } else if (parameterName === 'centerY') {
@@ -34,7 +35,8 @@ namespace gdjs {
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const bulgePinchFilter = (filter as unknown) as PIXI.filters.BulgePinchFilter;
+        const bulgePinchFilter =
+          filter as unknown as PIXI.filters.BulgePinchFilter;
         if (parameterName === 'centerX') {
           return bulgePinchFilter.center[0];
         }
@@ -68,7 +70,8 @@ namespace gdjs {
         value: boolean
       ) {}
       getNetworkSyncData(filter: PIXI.Filter): BulgePinchFilterNetworkSyncData {
-        const bulgePinchFilter = (filter as unknown) as PIXI.filters.BulgePinchFilter;
+        const bulgePinchFilter =
+          filter as unknown as PIXI.filters.BulgePinchFilter;
         return {
           cx: bulgePinchFilter.center[0],
           cy: bulgePinchFilter.center[1],
@@ -80,7 +83,8 @@ namespace gdjs {
         filter: PIXI.Filter,
         data: BulgePinchFilterNetworkSyncData
       ) {
-        const bulgePinchFilter = (filter as unknown) as PIXI.filters.BulgePinchFilter;
+        const bulgePinchFilter =
+          filter as unknown as PIXI.filters.BulgePinchFilter;
         bulgePinchFilter.center[0] = data.cx;
         bulgePinchFilter.center[1] = data.cy;
         bulgePinchFilter.radius = data.r;

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

@@ -29,7 +29,7 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
+        const colorMapFilter = filter as unknown as PIXI.filters.ColorMapFilter;
         if (parameterName === 'mix') {
           colorMapFilter.mix = gdjs.PixiFiltersTools.clampValue(
             value / 100,
@@ -39,7 +39,7 @@ namespace gdjs {
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
+        const colorMapFilter = filter as unknown as PIXI.filters.ColorMapFilter;
         if (parameterName === 'mix') {
           return colorMapFilter.mix;
         }
@@ -63,20 +63,20 @@ namespace gdjs {
         parameterName: string,
         value: boolean
       ) {
-        const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
+        const colorMapFilter = filter as unknown as PIXI.filters.ColorMapFilter;
         if (parameterName === 'nearest') {
           colorMapFilter.nearest = value;
         }
       }
       getNetworkSyncData(filter: PIXI.Filter): ColorMapFilterNetworkSyncData {
-        const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
+        const colorMapFilter = filter as unknown as PIXI.filters.ColorMapFilter;
         return { mix: colorMapFilter.mix, near: colorMapFilter.nearest };
       }
       updateFromNetworkSyncData(
         filter: PIXI.Filter,
         data: ColorMapFilterNetworkSyncData
       ) {
-        const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
+        const colorMapFilter = filter as unknown as PIXI.filters.ColorMapFilter;
         colorMapFilter.mix = data.mix;
         colorMapFilter.nearest = data.near;
       }

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

@@ -23,15 +23,17 @@ namespace gdjs {
         parameterName: string,
         value: number
       ) {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         if (parameterName === 'epsilon') {
           colorReplaceFilter.epsilon = value;
         }
       }
       getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         if (parameterName === 'epsilon') {
           return colorReplaceFilter.epsilon;
         }
@@ -42,8 +44,9 @@ namespace gdjs {
         parameterName: string,
         value: string
       ) {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         if (parameterName === 'originalColor') {
           colorReplaceFilter.originalColor = gdjs.rgbOrHexStringToNumber(value);
         } else if (parameterName === 'newColor') {
@@ -55,8 +58,9 @@ namespace gdjs {
         parameterName: string,
         value: number
       ): void {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         if (parameterName === 'originalColor') {
           colorReplaceFilter.originalColor = value;
         } else if (parameterName === 'newColor') {
@@ -64,8 +68,9 @@ namespace gdjs {
         }
       }
       getColorParameter(filter: PIXI.Filter, parameterName: string): number {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         if (parameterName === 'originalColor') {
           return colorReplaceFilter.originalColor;
         } else if (parameterName === 'newColor') {
@@ -81,8 +86,9 @@ namespace gdjs {
       getNetworkSyncData(
         filter: PIXI.Filter
       ): ColorReplaceFilterNetworkSyncData {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         return {
           e: colorReplaceFilter.epsilon,
           oc: colorReplaceFilter.originalColor,
@@ -93,8 +99,9 @@ namespace gdjs {
         filter: PIXI.Filter,
         data: ColorReplaceFilterNetworkSyncData
       ) {
-        const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter &
-          ColorReplaceFilterExtra;
+        const colorReplaceFilter =
+          filter as unknown as PIXI.filters.ColorReplaceFilter &
+            ColorReplaceFilterExtra;
         colorReplaceFilter.epsilon = data.e;
         colorReplaceFilter.originalColor = data.oc;
         colorReplaceFilter.newColor = data.nc;