Add missing keys in keyboard condition/action (#7421)

- Added Left and Right bracket and the Menu keys

.circleci/config.yml

@@ -13,18 +13,17 @@ 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 (including the GDevelop.js library).
+  # Build the **entire** app for macOS.
   build-macos:
     macos:
-      xcode: 16.4.0
-    resource_class: m4pro.medium
+      xcode: 14.2.0
+    resource_class: macos.m1.large.gen1
     steps:
       - checkout
       # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
       - macos/install-rosetta
-      # - run: sudo sysctl net.inet.tcp.tso=0
+      - run: sudo sysctl net.inet.tcp.tso=0
 
       # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
       # Node.js v20.14.0 comes with npm v10.7.0.
@@ -47,9 +46,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" }}-{{ checksum "GDJS/package-lock.json" }}
+            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.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
@@ -70,8 +69,7 @@ jobs:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-            - 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" }}
+          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.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).
@@ -88,37 +86,15 @@ jobs:
       - store_artifacts:
           path: newIDE/electron-app/dist
 
-
       # Upload artifacts (AWS)
       - run:
           name: Deploy to S3 (specific commit)
-          command: |
-            export PATH=~/.local/bin:$PATH
-            for i in 1 2 3 4 5 6 7; do
-              aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/ && break
-              echo "Retry $i failed... retrying in 10 seconds"
-              sleep 10
-            done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
-
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
       - run:
           name: Deploy to S3 (latest)
-          command: |
-            export PATH=~/.local/bin:$PATH
-            for i in 1 2 3 4 5 6 7; do
-              aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/ && break
-              echo "Retry $i failed... retrying in 10 seconds"
-              sleep 10
-            done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
+          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 app for Linux (using a pre-built GDevelop.js library).
+  # Build the **entire** app for Linux.
   build-linux:
     # CircleCI docker workers are failing if they don't have enough memory (no swap)
     resource_class: xlarge
@@ -131,33 +107,51 @@ jobs:
       - checkout
       - aws-cli/setup
 
-      # System dependencies (for Electron Builder)
+      # System dependencies (for Electron Builder and Emscripten)
       - run:
-          name: Update system dependencies
-          command: sudo apt-get update
+          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 ..
 
       - 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" }}-{{ checksum "GDJS/package-lock.json" }}
+            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - gd-linux-nodejs-dependencies-
+            - gd-linux-nodejs-dependencies---
 
-      # GDevelop IDE dependencies (using an exact version of GDevelop.js, built previously)
+      - 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)
       - run:
           name: Install GDevelop IDE dependencies
-          command: export REQUIRES_EXACT_LIBGD_JS_VERSION=true && cd newIDE/app && npm install && cd ../electron-app && npm install
+          command: 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
-            - 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" }}
+          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
 
       # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
       - run:
@@ -301,203 +295,14 @@ 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 always run them.
+          # Extra checks are resource intensive so don't all run them.
           filters:
             branches:
               only:
@@ -505,36 +310,13 @@ 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

@@ -1,47 +0,0 @@
-# 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.

.gitignore

@@ -33,4 +33,3 @@
 .Spotlight-V100
 .Trashes
 Thumbs.db
-.claude

.vscode/tasks.json

@@ -38,7 +38,8 @@
       "presentation": {
         "reveal": "silent"
       },
-      "isBackground": true
+      "isBackground": true,
+      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
     },
     {
       "type": "npm",

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -61,12 +61,10 @@ void GroupEvent::UnserializeFrom(gd::Project& project,
       project, events, element.GetChild("events"));
 
   parameters.clear();
-  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());
-  }
+  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,21 +163,6 @@ 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,10 +109,6 @@ 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,20 +286,6 @@ 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>
@@ -318,7 +304,6 @@ 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,8 +221,6 @@ 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());
   }
@@ -238,8 +236,6 @@ 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,8 +141,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "res/function32.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced()
-      .SetHidden();
+      .MarkAsAdvanced();
 
   extension
       .AddExpression(
@@ -178,8 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
           "number", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -193,8 +191,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
           "string", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -37,8 +37,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetIcon("res/actions/position24_black.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Angle"))
       .SetIcon("res/actions/direction24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
+      .SetIcon("res/actions/scale24_black.png");
 
   gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
@@ -235,8 +235,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction("SetAngle",
                 _("Angle"),
-                _("Change the angle of rotation of an object (in degrees). For "
-                  "3D objects, this is the rotation around the Z axis."),
+                _("Change the angle of rotation of an object (in degrees)."),
                 _("the angle"),
                 _("Angle"),
                 "res/actions/direction24_black.png",
@@ -251,8 +250,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   obj.AddAction("Rotate",
                 _("Rotate"),
                 _("Rotate an object, clockwise if the speed is positive, "
-                  "counterclockwise otherwise. For 3D objects, this is the "
-                  "rotation around the Z axis."),
+                  "counterclockwise otherwise."),
                 _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
                 _("Angle"),
                 "res/actions/rotate24_black.png",
@@ -417,7 +415,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("SetNumberObjectVariable",
-                _("Change object variable value"),
+                _("Change variable value"),
                 _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
@@ -432,7 +430,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("SetStringObjectVariable",
-                _("Change object variable value"),
+                _("Change text variable"),
                 _("Modify the text of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
@@ -447,7 +445,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("SetBooleanObjectVariable",
-                _("Change object variable value"),
+                _("Change boolean variable"),
                 _("Modify the boolean value of an object variable."),
                 _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
                 _("Variables"),
@@ -463,7 +461,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("NumberObjectVariable",
-                   _("Object variable value"),
+                   _("Variable value"),
                    _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
@@ -478,7 +476,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("StringObjectVariable",
-                   _("Object variable value"),
+                   _("Text variable"),
                    _("Compare the text of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
@@ -493,7 +491,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("BooleanObjectVariable",
-                   _("Object variable value"),
+                   _("Boolean variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
                    _("Variables"),
@@ -636,8 +634,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("Angle",
                    _("Angle"),
-                   _("Compare the angle, in degrees, of the specified object. "
-                     "For 3D objects, this is the angle around the Z axis."),
+                   _("Compare the angle of the specified object."),
                    _("the angle (in degrees)"),
                    _("Angle"),
                    "res/conditions/direction24_black.png",
@@ -811,7 +808,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "PushStringToObjectVariable",
-         _("Add value to object array variable"),
+         _("Add text 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"),
@@ -825,7 +822,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("PushNumberToObjectVariable",
-                _("Add value to object array variable"),
+                _("Add variable array value"),
                 _("Adds a number to the end of an object array variable."),
                 _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
                 _("Variables ❯ Arrays and structures"),
@@ -838,13 +835,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
-  obj.AddAction("PushBooleanToObjectVariable",
-                _("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"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
+  obj.AddAction(
+         "PushBooleanToObjectVariable",
+         _("Add boolean 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"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
@@ -1270,8 +1268,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddExpression("Angle",
                     _("Angle"),
-                    _("Current angle, in degrees, of the object. For 3D "
-                      "objects, this is the angle around the Z axis."),
+                    _("Current angle, in degrees, of the object"),
                     _("Angle"),
                     "res/actions/direction_black.png")
       .AddParameter("object", _("Object"));
@@ -1574,9 +1571,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   extension
       .AddAction("Create",
                  _("Create an object"),
-                 _("Create an instance of the object at the specified position."
-                   "The created object instance will be available for the next "
-                   "actions and sub-events."),
+                 _("Create an object at specified position"),
                  _("Create object _PARAM1_ at position _PARAM2_;_PARAM3_ "
                    "(layer: _PARAM4_)"),
                  "",

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

@@ -18,21 +18,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("AnimatableCapability",
-                               _("Objects with animations"),
-                               _("Actions and conditions for objects having animations (sprite, 3D models...)."),
+                               _("Animatable capability"),
+                               _("Animate objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with animations"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
       .SetIcon("res/actions/animation24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
       .SetIcon("res/actions/animation24.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "AnimatableBehavior",
-      _("Objects with animations"),
+      _("Animatable capability"),
       "Animation",
-      _("Actions and conditions for objects having animations (sprite, 3D models...).."),
+      _("Animate objects."),
       "",
       "res/actions/animation24.png",
       "AnimatableBehavior",

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

@@ -18,8 +18,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("EffectCapability",
-                               _("Objects with effects"),
-                               _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
+                               _("Effect capability"),
+                               _("Apply visual effects to objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
@@ -28,9 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "EffectBehavior",
-      _("Objects with effects"),
+      _("Effect capability"),
       "Effect",
-      _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
+      _("Apply visual effects to objects."),
       "",
       "res/actions/effect_black.svg",
       "EffectBehavior",

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

@@ -18,8 +18,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("FlippableCapability",
-                               _("Flippable objects"),
-                               _("Actions/conditions for objects which can be flipped horizontally or vertically."),
+                               _("Flippable capability"),
+                               _("Flip objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
@@ -28,9 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "FlippableBehavior",
-      _("Flippable objects"),
+      _("Flippable capability"),
       "Flippable",
-      _("Actions/conditions for objects which can be flipped horizontally or vertically."),
+      _("Flip objects."),
       "",
       "res/actions/flipX24.png",
       "FlippableBehavior",

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

@@ -18,30 +18,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("OpacityCapability",
-                               _("Objects with opacity"),
-                               _("Action/condition/expression to change or "
-                                 "check the opacity of an object (0-255)."),
+                               _("Opacity capability"),
+                               _("Change the object opacity."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with opacity"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
       .SetIcon("res/actions/opacity24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
       .SetIcon("res/actions/opacity24.png");
 
-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("OpacityBehavior",
-                       _("Objects with opacity"),
-                       "Opacity",
-                       _("Action/condition/expression to change or check the "
-                         "opacity of an object (0-255)."),
-                       "",
-                       "res/actions/opacity24.png",
-                       "OpacityBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "OpacityBehavior",
+      _("Opacity capability"),
+      "Opacity",
+      _("Change the object opacity."),
+      "",
+      "res/actions/opacity24.png",
+      "OpacityBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -55,9 +52,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "OpacityBehavior")
       .UseStandardParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity (0-255)")))
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Opacity (0-255)")))
       .SetFunctionName("setOpacity")
       .SetGetter("getOpacity");
   aut.GetAllExpressions()["Value"].SetGroup("");

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

@@ -16,13 +16,11 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
     gd::PlatformExtension &extension) {
   extension
-      .SetExtensionInformation(
-          "ResizableCapability",
-          _("Resizable objects"),
-          _("Change or compare the size (width/height) of an object which can "
-            "be resized (i.e: most objects)."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("ResizableCapability",
+                               _("Resizable capability"),
+                               _("Change the object dimensions."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
       "res/actions/scale24_black.png");
@@ -30,10 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
   gd::BehaviorMetadata &aut =
       extension
           .AddBehavior("ResizableBehavior",
-                       _("Resizable objects"),
+                       _("Resizable capability"),
                        "Resizable",
-                       _("Change or compare the size (width/height) of an "
-                         "object which can be resized (i.e: most objects)."),
+                       _("Change the object dimensions."),
                        "",
                        "res/actions/scale24_black.png",
                        "ResizableBehavior",

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

@@ -18,30 +18,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("ScalableCapability",
-                               _("Scalable objects"),
-                               _("Actions/conditions/expression to change or "
-                                 "check the scale of an object (default: 1)."),
+                               _("Scalable capability"),
+                               _("Change the object scale."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable objects"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
+      .SetIcon("res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
       .SetIcon("res/actions/scale24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
 
-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("ScalableBehavior",
-                       _("Scalable objects"),
-                       "Scale",
-                       _("Actions/conditions/expression to change or check the "
-                         "scale of an object (default: 1)."),
-                       "",
-                       "res/actions/scale24_black.png",
-                       "ResizableBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "ScalableBehavior",
+      _("Scalable capability"),
+      "Scale",
+      _("Change the object scale."),
+      "",
+      "res/actions/scale24_black.png",
+      "ResizableBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
 
   aut.AddExpressionAndConditionAndAction(
          "number",

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

@@ -18,19 +18,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("TextContainerCapability",
-                               _("Objects containing a text"),
-                               _("Allows an object to contain a text, usually shown on screen, that can be modified."),
+                               _("Text capability"),
+                               _("Animate objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects containing a text"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
       .SetIcon("res/conditions/text24_black.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "TextContainerBehavior",
-      _("Objects containing a text"),
+      _("Text capability"),
       "Text",
-      _("Allows an object to contain a text, usually shown on screen, that can be modified."),
+      _("Access objects text."),
       "",
       "res/conditions/text24_black.png",
       "TextContainerBehavior",

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -16,9 +16,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .SetExtensionInformation(
           "BuiltinCommonConversions",
           _("Conversion"),
-          "Expressions to convert numbers to string, strings to numbers, "
-          "angles (degrees from/to radians) and a GDevelop variable to/from a "
-          "JSON string.",
+          "Expressions to convert number, texts and quantities.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
@@ -43,7 +41,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
 
   extension
       .AddStrExpression("LargeNumberToString",
-                        _("Number > Text (without scientific notation)"),
+                        _("Number > Text ( without scientific notation )"),
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
                         "",
@@ -74,8 +72,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert a variable to JSON"),
                         _("JSON"),
                         "res/conditions/toujours24_black.png")
-      .AddParameter("variable",
-                    _("The variable to be stringified"),
+      .AddParameter("variable", _("The variable to be stringified"),
                     "AllowUndeclaredVariable");
 
   // Deprecated

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -59,44 +59,36 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   // end of compatibility code
 
   extension
-      .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(
-          "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/and24_black.png",
-          "res/conditions/and_black.png")
-      .SetCanHaveSubInstructions()
-      .MarkAsAdvanced();
-
-  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:"),
+      .AddCondition("Or",
+                    _("Or"),
+                    _("Check if one of the sub conditions is true"),
+                    _("If one of these conditions is true:"),
                     "",
-                    "res/conditions/not24_black.png",
-                    "res/conditions/not_black.png")
+                    "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")
+      .SetCanHaveSubInstructions()
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition(
+          "Not",
+          _("Not"),
+          _("Return the contrary of the result of the sub conditions"),
+          _("Invert the logical result of these conditions:"),
+          "",
+          "res/conditions/not24_black.png",
+          "res/conditions/not_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -15,11 +15,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
       .SetExtensionInformation(
           "BuiltinKeyboard",
           _("Keyboard"),
-          _("Conditions to check keys pressed on a keyboard. Note that this "
+          _("Allows your game to respond to keyboard input. Note that this "
             "does not work with on-screen keyboard on touch devices: use "
-            "instead mouse/touch conditions when making a game for "
-            "mobile/touchscreen devices or when making a new game from "
-            "scratch."),
+            "instead conditions related to touch when making a game for "
+            "mobile/touchscreen devices."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/keyboard")
@@ -52,25 +51,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
       .SetHidden();
 
   extension
-      .AddCondition(
-          "KeyFromTextPressed",
-          _("Key pressed"),
-          _("Check if a key is pressed. This stays true as long as "
-            "the key is held down. To check if a key was pressed during "
-            "the frame, use \"Key just pressed\" instead."),
-          _("_PARAM1_ key is pressed"),
-          "",
-          "res/conditions/keyboard24.png",
-          "res/conditions/keyboard.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
-
-  extension
-      .AddCondition("KeyFromTextJustPressed",
-                    _("Key just pressed"),
-                    _("Check if a key was just pressed."),
-                    _("_PARAM1_ key was just pressed"),
+      .AddCondition("KeyFromTextPressed",
+                    _("Key pressed"),
+                    _("Check if a key is pressed"),
+                    _("_PARAM1_ key is pressed"),
                     "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
@@ -81,7 +65,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyFromTextReleased",
                     _("Key released"),
-                    _("Check if a key was just released."),
+                    _("Check if a key was just released"),
                     _("_PARAM1_ key is released"),
                     "",
                     "res/conditions/keyboard24.png",
@@ -100,7 +84,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
+ extension
       .AddCondition("AnyKeyReleased",
                     _("Any key released"),
                     _("Check if any key is released"),

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -72,8 +72,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
 
   extension
       .AddExpression("normalize",
-                     _("Normalize a value between `min` and `max` to a value "
-                       "between 0 and 1."),
+                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
                      _("Remap a value between 0 and 1."),
                      "",
                      "res/mathfunction.png")
@@ -125,8 +124,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("mod",
                      _("Modulo"),
-                     _("Compute \"x mod y\". GDevelop does NOT support the \% "
-                       "operator. Use this mod(x, y) function instead."),
+                     _("x mod y"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("x (as in x mod y)"))
@@ -153,8 +151,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("abs",
                      _("Absolute value"),
-                     _("Return the non-negative value by removing the sign. "
-                       "The absolute value of -8 is 8."),
+                     _("Absolute value"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -186,8 +183,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "asinh", _("Arcsine"), _("Arcsine"), "", "res/mathfunction.png")
+      .AddExpression("asinh",
+                     _("Arcsine"),
+                     _("Arcsine"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -217,8 +217,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "cbrt", _("Cube root"), _("Cube root"), "", "res/mathfunction.png")
+      .AddExpression("cbrt",
+                     _("Cube root"),
+                     _("Cube root"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -256,13 +259,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"), "", true);
 
   extension
-      .AddExpression(
-          "cos",
-          _("Cosine"),
-          _("Cosine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("cos",
+                     _("Cosine"),
+                     _("Cosine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -290,20 +292,29 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "int", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("int",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "rint", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("rint",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "round", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("round",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -312,8 +323,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                      _("Round a number to the Nth decimal place"),
                      "",
                      "res/mathfunction.png")
-      .AddParameter("expression", _("Number to Round"))
-      .AddParameter("expression", _("Decimal Places"), "", true);
+      .AddParameter("expression", _("Expression"))
+      .AddParameter("expression", _("Expression"), "", true);
 
   extension
       .AddExpression("exp",
@@ -324,13 +335,19 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "log", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("log",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "ln", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("ln",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     "",
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
@@ -369,8 +386,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("The exponent (n in x^n)"));
 
   extension
-      .AddExpression(
-          "sec", _("Secant"), _("Secant"), "", "res/mathfunction.png")
+      .AddExpression("sec",
+                     _("Secant"),
+                     _("Secant"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -382,13 +402,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "sin",
-          _("Sine"),
-          _("Sine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("sin",
+                     _("Sine"),
+                     _("Sine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -408,13 +427,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "tan",
-          _("Tangent"),
-          _("Tangent of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("tan",
+                     _("Tangent"),
+                     _("Tangent of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -444,28 +462,26 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("x (in a+(b-a)*x)"));
 
   extension
-      .AddExpression(
-          "XFromAngleAndDistance",
-          _("X position from angle and distance"),
-          _("Compute the X position when given an angle and distance "
-            "relative to the origin (0;0). This is also known as "
-            "getting the cartesian coordinates of a 2D vector, using "
-            "its polar coordinates."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("XFromAngleAndDistance",
+                     _("X position from angle and distance"),
+                     _("Compute the X position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
   extension
-      .AddExpression(
-          "YFromAngleAndDistance",
-          _("Y position from angle and distance"),
-          _("Compute the Y position when given an angle and distance "
-            "relative to the origin (0;0). This is also known as "
-            "getting the cartesian coordinates of a 2D vector, using "
-            "its polar coordinates."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("YFromAngleAndDistance",
+                     _("Y position from angle and distance"),
+                     _("Compute the Y position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
@@ -480,8 +496,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("lerpAngle",
                      _("Lerp (Linear interpolation) between two angles"),
-                     _("Linearly interpolates between two angles (in degrees) "
-                       "by taking the shortest direction around the circle."),
+                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Starting angle, in degrees"))

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -16,11 +16,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetExtensionInformation(
           "BuiltinMouse",
           _("Mouse and touch"),
-          "Conditions, actions and expressions to handle either the mouse or "
-          "touches on a touchscreen. Notably: cursor position, mouse wheel, "
-          "mouse buttons, touch positions, started/end touches, etc...\n"
-          "\n"
-          "By default, conditions related to the mouse will also "
+          "Conditions and actions to handle either the mouse or touches on "
+          "touchscreen. By default, conditions related to the mouse will also "
           "handle the touches - so that it's easier to handle both in your "
           "game. You can disable this behavior if you want to handle them "
           "separately in different events.",
@@ -276,26 +273,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetHidden();
 
   extension
-      .AddCondition("MouseButtonFromTextPressed",
-                    _("Mouse button pressed or touch held"),
-                    _("Check if the specified mouse button is pressed or "
-                      "if a touch is in contact with the screen."),
-                    _("Touch or _PARAM1_ mouse button is down"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddCondition(
+          "MouseButtonFromTextPressed",
+          _("Mouse button pressed or touch held"),
+          _("Check if the specified mouse button is pressed or "
+              "if a touch is in contact with the screen."),
+          _("Touch or _PARAM1_ mouse button is down"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouseButton", _("Button to check"))
       .MarkAsSimple();
 
   extension
-      .AddCondition("MouseButtonFromTextReleased",
-                    _("Mouse button released"),
-                    _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddCondition(
+          "MouseButtonFromTextReleased",
+          _("Mouse button released"),
+          _("Check if the specified mouse button was released."),
+          _("Touch or _PARAM1_ mouse button is released"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouseButton", _("Button to check"))
       .MarkAsSimple();

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -15,9 +15,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .SetExtensionInformation(
           "BuiltinNetwork",
           _("Network"),
-          _("Actions to send web requests, communicate with external \"APIs\" "
-            "and other network related tasks. Also contains an action to open "
-            "a URL on the device browser."),
+          _("Features to send web requests, communicate with external \"APIs\" "
+            "and other network related tasks."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/network")

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -16,11 +16,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .SetExtensionInformation(
           "BuiltinScene",
           _("Scene"),
-          _("Actions/conditions to change the current scene (or pause it and "
-            "launch another one, or go back to the previous one), check if a "
-            "scene or the game has just started/resumed, preload assets of a "
-            "scene, get the current scene name or loading progress, quit the "
-            "game, set background color, or disable input when focus is lost."),
+          _("Actions and conditions to manipulate the scenes during the game."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -170,28 +166,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
-      .AddAction(
-          "PrioritizeLoadingOfScene",
-          _("Preload scene"),
-          _("Preload a scene resources as soon as possible in background."),
-          _("Preload scene _PARAM1_ in background"),
-          "",
-          "res/actions/hourglass_black.svg",
-          "res/actions/hourglass_black.svg")
+      .AddAction("PrioritizeLoadingOfScene",
+                 _("Preload scene"),
+                 _("Preload a scene resources as soon as possible in background."),
+                 _("Preload scene _PARAM1_ in background"),
+                 "",
+                 "res/actions/hourglass_black.svg",
+                 "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("sceneName", _("Name of the new scene"))
       .MarkAsAdvanced();
 
-  extension
-      .AddExpressionAndCondition("number",
-                                 "SceneLoadingProgress",
-                                 _("Scene loading progress"),
-                                 _("The progress of resources loading in "
-                                   "background for a scene (between 0 and 1)."),
-                                 _("_PARAM1_ loading progress"),
-                                 _(""),
-                                 "res/actions/hourglass_black.svg")
+  extension.AddExpressionAndCondition("number",
+                                "SceneLoadingProgress",
+                                _("Scene loading progress"),
+                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
+                                _("_PARAM0_ loading progress"),
+                                _(""),
+                                "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("sceneName", _("Scene name"))
@@ -199,14 +192,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition(
-          "AreSceneAssetsLoaded",
-          _("Scene preloaded"),
-          _("Check if scene resources have finished to load in background."),
-          _("Scene _PARAM1_ was preloaded in background"),
-          "",
-          "res/actions/hourglass_black.svg",
-          "res/actions/hourglass_black.svg")
+      .AddCondition("AreSceneAssetsLoaded",
+                    _("Scene preloaded"),
+                    _("Check if scene resources have finished to load in background."),
+                    _("Scene _PARAM1_ was preloaded in background"),
+                    "",
+                    "res/actions/hourglass_black.svg",
+                    "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("sceneName", _("Scene name"))

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

@@ -15,13 +15,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "Sprite",
-          _("Sprite"),
-          _("Sprite are animated objects which can be used "
-            "for most elements of a 2D game."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("Sprite",
+                               _("Sprite"),
+                               _("Sprite are animated object which can be used "
+                                 "for most elements of a game."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/sprite");
   extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
       .SetIcon("CppPlatform/Extensions/spriteicon.png");
@@ -31,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .AddObject<SpriteObject>("Sprite",
                                    _("Sprite"),
                                    _("Animated object which can be used for "
-                                     "most elements of a 2D game."),
+                                     "most elements of a game."),
                                    "CppPlatform/Extensions/spriteicon.png")
           .SetCategoryFullName(_("General"))
           .SetOpenFullEditorLabel(_("Edit animations"))
@@ -646,12 +645,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");
 
-  obj.AddExpression(
-         "AnimationFrameCount",
-         _("Number of frames"),
-         _("Number of frames in the current animation of the object"),
-         _("Animations and images"),
-         "res/actions/sprite.png")
+  obj.AddExpression("AnimationFrameCount",
+                    _("Number of frames"),
+                    _("Number of frames in the current animation of the object"),
+                    _("Animations and images"),
+                    "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   // Deprecated

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -16,8 +16,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .SetExtensionInformation(
           "BuiltinStringInstructions",
           _("Text manipulation"),
-          "Provides expressions to manipulate strings (also called texts): new "
-          "line, upper/lowercase, substring, find, replace, etc...",
+          "Provides expressions to manipulate strings (also called texts).",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -192,8 +191,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         "res/conditions/toujours24_black.png")
       .AddParameter("string", _("Text in which the replacement must be done"))
       .AddParameter("string", _("Text to find inside the first text"))
-      .AddParameter("string",
-                    _("Replacement to put instead of the text to find"));
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
 
   extension
       .AddStrExpression("StrReplaceAll",
@@ -201,11 +199,10 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Replace all occurrences of a text by another."),
                         "",
                         "res/conditions/toujours24_black.png")
-      .AddParameter("string",
-                    _("Text in which the replacement(s) must be done"))
+      .AddParameter("string", _("Text in which the replacement(s) must be done"))
       .AddParameter("string", _("Text to find inside the first text"))
-      .AddParameter("string",
-                    _("Replacement to put instead of the text to find"));
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -15,12 +15,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .SetExtensionInformation(
           "BuiltinTime",
           _("Timers and time"),
-          "Actions and conditions to start, pause or reset scene timers, "
-          "modify the time scale (speed at which the game "
-          "is running - useful for slow motion effects). Also contains an "
-          "action that wait for a delay before running the next actions and "
-          "sub-events and expressions to read the time scale, time delta of "
-          "the last frame or timer elapsed time.",
+          "Actions and conditions to run timers, get the current time or "
+          "modify the time scale (speed at which the game is running - useful "
+          "for slow motion effects).",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/timers-and-time");
@@ -46,9 +43,7 @@ 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 and will always be "
-                      "false if the timer was not started previously (whatever "
-                      "the comparison being made)."),
+                      "condition doesn't start the timer."),
                     _("The timer _PARAM1_ _PARAM2_ _PARAM3_ seconds"),
 
                     "",
@@ -195,28 +190,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddExpression("TimerElapsedTime",
                      _("Scene timer value"),
-                     _("Value of a scene timer (in seconds)"),
+                     _("Value of a scene timer"),
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("identifier", _("Timer's name"), "sceneTimer");
 
   extension
-      .AddExpression(
-          "TimeFromStart",
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          "",
-          "res/actions/time.png")
+      .AddExpression("TimeFromStart",
+                     _("Time elapsed since the beginning of the scene"),
+                     _("Time elapsed since the beginning of the scene"),
+                     "",
+                     "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
-      .AddExpression(
-          "TempsDebut",
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          "",
-          "res/actions/time.png")
+      .AddExpression("TempsDebut",
+                     _("Time elapsed since the beginning of the scene"),
+                     _("Time elapsed since the beginning of the scene"),
+                     "",
+                     "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -231,21 +224,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddExpression("Time",
                      _("Current time"),
-                     _("Gives the current time"),
+                     _("Current time"),
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter(
           "stringWithSelector",
-          _("- Hour of the day: \"hour\"\n"
-            "- Minutes: \"min\"\n"
-            "- Seconds: \"sec\"\n"
-            "- Day of month: \"mday\"\n"
-            "- Months since January: \"mon\"\n"
-            "- Year since 1900: \"year\"\n"
-            "- Days since Sunday: \"wday\"\n"
-            "- Days since Jan 1st: \"yday\"\n"
-            "- Timestamp (ms): \"timestamp\""),
+          _("Hour: hour - Minutes: min - Seconds: sec - Day of month: "
+            "mday - Months since January: mon - Year since 1900: year - Days "
+            "since Sunday: wday - Days since Jan 1st: yday - Timestamp (ms): "
+            "timestamp\""),
           "[\"hour\", \"min\", \"sec\", \"mon\", \"year\", \"wday\", \"mday\", "
           "\"yday\", \"timestamp\"]");
 }

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -79,7 +79,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("SetStringVariable",
-                 _("Change variable value"),
+                 _("Change text variable"),
                  _("Modify the text (string) of a variable."),
                  _("the variable _PARAM0_"),
                  "",
@@ -92,7 +92,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction(
           "SetBooleanVariable",
-          _("Change variable value"),
+          _("Change boolean variable"),
           _("Modify the boolean value of a variable."),
           _("Change the variable _PARAM0_: _PARAM1_"),
           "",
@@ -180,7 +180,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction(
           "PushString",
-          _("Add value to array variable"),
+          _("Add text variable"),
           _("Adds a text (string) at the end of a array variable."),
           _("Add the value _PARAM1_ to array variable _PARAM0_"),
           _("Arrays and structures"),
@@ -193,7 +193,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("PushNumber",
-                 _("Add value to array variable"),
+                 _("Add variable array value"),
                  _("Adds a number at the end of an array variable."),
                  _("Add the value _PARAM1_ to array variable _PARAM0_"),
                  _("Arrays and structures"),
@@ -206,7 +206,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("PushBoolean",
-                 _("Add value to array variable"),
+                 _("Add boolean variable"),
                  _("Adds a boolean at the end of an array variable."),
                  _("Add the value _PARAM1_ to array variable _PARAM0_"),
                  _("Arrays and structures"),
@@ -289,8 +289,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VarSceneTxt",
@@ -303,8 +302,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -318,8 +316,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VariableChildExists",
@@ -334,7 +331,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("string", _("Name of the child"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -350,7 +346,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("string", _("Name of the child"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -377,7 +372,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -392,7 +386,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -407,8 +400,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VarGlobalDef",
@@ -434,8 +426,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ModVarSceneTxt",
@@ -448,8 +439,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -462,8 +452,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
@@ -476,8 +465,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ModVarGlobal",
@@ -491,7 +479,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -506,7 +493,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -520,8 +506,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
@@ -534,8 +519,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -550,8 +534,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("string", _("Child's name"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -566,8 +549,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("string", _("Child's name"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("VariableClearChildren",
@@ -581,7 +563,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("scenevar", _("Structure or array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -596,7 +577,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("globalvar", _("Structure or array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -615,7 +595,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "end of the array."))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -631,7 +610,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("string", _("Text to add"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -646,7 +624,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("expression", _("Number to add"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -661,7 +638,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("trueorfalse", _("Boolean to add"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -678,7 +654,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("expression", _("Index to remove"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -695,7 +670,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "number", ParameterOptions::MakeNewOptions())
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -708,8 +682,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -721,8 +694,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -734,8 +706,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -747,8 +718,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -766,7 +736,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "end of the array."))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -783,7 +752,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("expression", _("Index to remove"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -799,7 +767,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("string", _("Text to add"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -814,7 +781,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("expression", _("Number to add"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -829,7 +795,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("trueorfalse", _("Boolean to add"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -846,7 +811,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "number", ParameterOptions::MakeNewOptions())
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -858,8 +822,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariableFirstNumber",
@@ -870,8 +833,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -883,8 +845,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -895,8 +856,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("External variables ❯ Global variables ❯ Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariableChildCount",
@@ -907,8 +867,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Array or structure variable"))
       .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("VariableChildCount",
@@ -927,8 +886,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("External variables ❯ Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression("VariableString",
@@ -937,8 +895,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         _("External variables ❯ Scene variables"),
                         "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariable",
@@ -947,8 +904,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("External variables ❯ Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression("GlobalVariableString",
@@ -957,8 +913,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         _("External variables ❯ Global variables"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -15,17 +15,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
       .SetExtensionInformation(
           "BuiltinWindow",
           _("Game window and resolution"),
-          "Actions and conditions to manipulate the game window or change how "
-          "the game is resized according to the screen size. "
+          "Provides actions and conditions to manipulate the game window. "
           "Depending on the platform on which the game is running, not all of "
-          "these features can be applied.\n"
-          "Also contains expressions to read the screen size.",
+          "these features can be applied.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("User interface")
       .SetExtensionHelpPath("/all-features/window");
   extension
-      .AddInstructionOrExpressionGroupMetadata(_("Game window and resolution"))
+      .AddInstructionOrExpressionGroupMetadata(
+          _("Game window and resolution"))
       .SetIcon("res/actions/window24.png");
 
   extension

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -298,19 +298,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
     return *this;
   }
 
-  /**
-   * Check if the behavior can be used on objects from event-based objects.
-   */
-  bool IsRelevantForChildObjects() const { return isRelevantForChildObjects; }
-
-  /**
-   * Set that behavior can't be used on objects from event-based objects.
-   */
-  BehaviorMetadata &MarkAsIrrelevantForChildObjects() {
-    isRelevantForChildObjects = false;
-    return *this;
-  }
-
   QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
     return quickCustomizationVisibility;
   }
@@ -406,7 +393,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   mutable std::vector<gd::String> requiredBehaviors;
   bool isPrivate = false;
   bool isHidden = false;
-  bool isRelevantForChildObjects = true;
   gd::String openFullEditorLabel;
   QuickCustomization::Visibility quickCustomizationVisibility = QuickCustomization::Visibility::Default;
 

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -277,10 +277,6 @@ class GD_CORE_API MetadataProvider {
     return &metadata == &badObjectInfo;
   }
 
-  static bool IsBadEffectMetadata(const gd::EffectMetadata& metadata) {
-    return &metadata == &badEffectMetadata;
-  }
-
   virtual ~MetadataProvider();
 
  private:

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -101,7 +101,7 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
   } else if (propertyType == "KeyboardKey") {
     return keyboardKeyValueType;
   }
-  // For "String", "Resource", "MultilineString" or default
+  // For "String", "Resource" 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/BehaviorsSharedData.h"
 #include "GDCore/Project/ObjectConfiguration.h"
+#include "GDCore/Project/BehaviorsSharedData.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,10 +244,12 @@ 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];
 }
 
@@ -351,7 +353,8 @@ 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();
 }
 
@@ -383,7 +386,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;
   }
@@ -403,7 +406,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;
   }
@@ -420,7 +423,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;
   }
@@ -437,7 +440,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;
   }
@@ -465,8 +468,7 @@ PlatformExtension::GetAllStrExpressions() {
   return strExpressionsInfos;
 }
 
-const std::vector<gd::DependencyMetadata>&
-PlatformExtension::GetAllDependencies() const {
+const std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() const {
   return extensionDependenciesMetadata;
 }
 
@@ -474,8 +476,7 @@ 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;
 }
 
@@ -614,6 +615,37 @@ 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();
@@ -759,62 +791,41 @@ 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::GetExtensionFromFullBehaviorType(
-    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::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();
+    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();
+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::GetExtensionFromFullObjectType(const gd::String& type) {
   const auto separatorIndex =
       type.find(PlatformExtension::GetNamespaceSeparator());
   if (separatorIndex == std::string::npos) {
@@ -823,8 +834,7 @@ gd::String PlatformExtension::GetExtensionFromFullObjectType(
   return type.substr(0, separatorIndex);
 }
 
-gd::String PlatformExtension::GetObjectNameFromFullObjectType(
-    const gd::String& type) {
+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,6 +440,12 @@ 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
@@ -634,6 +640,12 @@ 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.
@@ -651,10 +663,6 @@ 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,7 +73,6 @@ 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/EventsBasedObjectVariantHelper.cpp

@@ -1,154 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "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
-      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 &behaviorName : object.GetAllBehaviorNames()) {
-        if (!defaultObject->HasBehaviorNamed(behaviorName)) {
-          object.RemoveBehavior(behaviorName);
-        }
-      }
-
-      // 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

@@ -1,26 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-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/GroupVariableHelper.cpp

@@ -3,11 +3,9 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#include "ObjectVariableHelper.h"
+#include "GroupVariableHelper.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"
@@ -18,7 +16,7 @@
 
 namespace gd {
 
-void ObjectVariableHelper::FillAnyVariableBetweenObjects(
+void GroupVariableHelper::FillAnyVariableBetweenObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
     const gd::ObjectGroup &objectGroup) {
@@ -67,7 +65,7 @@ void ObjectVariableHelper::FillAnyVariableBetweenObjects(
   }
 }
 
-gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
+gd::VariablesContainer GroupVariableHelper::MergeVariableContainers(
     const gd::ObjectsContainersList &objectsContainersList,
     const gd::ObjectGroup &objectGroup) {
   gd::VariablesContainer mergedVariablesContainer;
@@ -115,7 +113,7 @@ gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
   return mergedVariablesContainer;
 }
 
-void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
+void GroupVariableHelper::FillMissingGroupVariablesToObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::ObjectGroup &objectGroup,
     const gd::SerializerElement &originalSerializedVariables) {
@@ -147,7 +145,7 @@ void ObjectVariableHelper::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 ObjectVariableHelper::ApplyChangesToObjects(
+void GroupVariableHelper::ApplyChangesToObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
     const gd::VariablesContainer &groupVariablesContainer,
@@ -174,7 +172,6 @@ void ObjectVariableHelper::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;
@@ -196,109 +193,4 @@ void ObjectVariableHelper::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/GroupVariableHelper.h

@@ -8,8 +8,6 @@
 #include "GDCore/Project/VariablesContainer.h"
 
 namespace gd {
-class EventsBasedObject;
-class InitialInstancesContainer;
 class ObjectsContainersList;
 class ObjectsContainer;
 class ObjectGroup;
@@ -24,7 +22,7 @@ namespace gd {
  *
  * This is used by the object group variable editor.
  */
-class GD_CORE_API ObjectVariableHelper {
+class GD_CORE_API GroupVariableHelper {
 public:
   /**
    * Copy every variable from every object of the group to the other objects
@@ -54,7 +52,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::ObjectVariableHelper::MergeVariableContainers
+   * \see gd::GroupVariableHelper::MergeVariableContainers
    */
   static void FillMissingGroupVariablesToObjects(
       gd::ObjectsContainer &globalObjectsContainer,
@@ -72,22 +70,6 @@ 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/ObjectAssetSerializer.cpp

@@ -17,8 +17,6 @@
 #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"
@@ -62,6 +60,9 @@ 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");
@@ -74,28 +75,6 @@ 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");
@@ -129,59 +108,4 @@ 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,7 +6,6 @@
 #pragma once
 #include <map>
 #include <vector>
-#include <unordered_set>
 
 #include "GDCore/String.h"
 
@@ -21,7 +20,6 @@ class InitialInstance;
 class SerializerElement;
 class EffectsContainer;
 class AbstractFileSystem;
-class EventsBasedObjectVariant;
 } // namespace gd
 
 namespace gd {
@@ -54,13 +52,6 @@ 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/ProjectBrowserHelper.cpp

@@ -314,12 +314,6 @@ 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/PropertyFunctionGenerator.cpp

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

Core/GDCore/IDE/PropertyFunctionGenerator.h

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

Core/GDCore/IDE/ResourceExposer.cpp

@@ -75,17 +75,6 @@ void ResourceExposer::ExposeProjectResources(
   // Expose global objects configuration resources
   auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
   objectWorker.Launch(project.GetObjects());
-
-  // Exposed extension event resources
-  // Note that using resources in extensions is very unlikely and probably not
-  // worth the effort of something smart.
-  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-        project, eventsFunctionsExtension, eventWorker);
-  }
 }
 
 void ResourceExposer::ExposeLayoutResources(
@@ -114,6 +103,16 @@ void ResourceExposer::ExposeLayoutResources(
   auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
   gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
       project, layout, eventWorker);
+
+  // Exposed extension event resources
+  // Note that using resources in extensions is very unlikely and probably not
+  // worth the effort of something smart.
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
+        project, eventsFunctionsExtension, eventWorker);
+  }
 }
 
 void ResourceExposer::ExposeEffectResources(

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/ObjectVariableHelper.h"
+#include "GDCore/IDE/GroupVariableHelper.h"
 #include "GDCore/IDE/EventBasedBehaviorBrowser.h"
 #include "GDCore/IDE/EventBasedObjectBrowser.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
@@ -314,16 +314,9 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
   variablesContainer.SerializeTo(editedSerializedVariables);
   variablesContainer.UnserializeFrom(originalSerializedVariables);
 
-  // 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;
+  // Rename and remove variables
   gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(), changeset, removedVariableNames,
+      project.GetCurrentPlatform(), changeset, changeset.removedVariableNames,
       variablesContainer);
   gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                 eventsVariableReplacer);
@@ -340,25 +333,9 @@ 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,
@@ -378,15 +355,11 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
     }
     auto &object = hasObject ? objectsContainer.GetObject(objectName)
                              : globalObjectsContainer.GetObject(objectName);
-    auto &objectVariablesContainer = object.GetVariables();
-
-    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-      objectVariablesContainer, initialInstancesContainer, objectName,
-      changeset);
+    auto &variablesContainer = object.GetVariables();
 
     gd::EventsVariableReplacer eventsVariableReplacer(
         project.GetCurrentPlatform(), changeset,
-        removedVariableNames, objectVariablesContainer);
+        removedVariableNames, variablesContainer);
     gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                   eventsVariableReplacer);
   }
@@ -399,12 +372,12 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
                                                 eventsVariableReplacer);
 
   // Apply changes to objects.
-  gd::ObjectVariableHelper::FillMissingGroupVariablesToObjects(
+  gd::GroupVariableHelper::FillMissingGroupVariablesToObjects(
       globalObjectsContainer,
       objectsContainer,
       objectGroup,
       originalSerializedVariables);
-  gd::ObjectVariableHelper::ApplyChangesToObjects(
+  gd::GroupVariableHelper::ApplyChangesToObjects(
       globalObjectsContainer, objectsContainer, groupVariablesContainer,
       objectGroup, changeset);
 
@@ -1781,14 +1754,6 @@ 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) {
@@ -2137,26 +2102,6 @@ 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,7 +32,6 @@ class UnfilledRequiredBehaviorPropertyProblem;
 class ProjectBrowser;
 class SerializerElement;
 class ProjectScopedContainers;
-class InitialInstancesContainer;
 struct VariablesRenamingChangesetNode;
 }  // namespace gd
 
@@ -81,23 +80,13 @@ class GD_CORE_API WholeProjectRefactorer {
 
   /**
    * \brief Refactor the project according to the changes (renaming or deletion)
-   * made to global or scene variables.
+   * made to 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.
@@ -105,7 +94,6 @@ 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,
@@ -704,16 +692,6 @@ 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,7 +19,6 @@ using namespace gd;
 
 void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
   project = objectConfiguration.project;
-  variantName = objectConfiguration.variantName;
   objectContent = objectConfiguration.objectContent;
   animations = objectConfiguration.animations;
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
@@ -166,7 +165,6 @@ void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const
     animations.SerializeTo(animatableElement);
   }
 
-  element.SetAttribute("variant", variantName);
   if (IsOverridingEventsBasedObjectChildrenConfiguration()) {
     auto &childrenContentElement = element.AddChild("childrenContent");
     for (auto &pair : childObjectConfigurations) {
@@ -186,7 +184,6 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
     animations.UnserializeFrom(animatableElement);
   }
 
-  variantName = element.GetStringAttribute("variant");
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
       element.HasChild("childrenContent");
   if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
@@ -250,29 +247,9 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
   }
   const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
 
-  if (IsForcedToOverrideEventsBasedObjectChildrenConfiguration()) {
-    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
-      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-      configuration.ExposeResources(worker);
-    }
-  }
-  else if (eventsBasedObject.GetVariants().HasVariantNamed(variantName)) {
-    for (auto &childObject : eventsBasedObject.GetVariants()
-                                 .GetVariant(variantName)
-                                 .GetObjects()
-                                 .GetObjects()) {
-      childObject->GetConfiguration().ExposeResources(worker);
-    }
-  } else if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
-    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
-      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-      configuration.ExposeResources(worker);
-    }
-  } else {
-    for (auto &childObject :
-         eventsBasedObject.GetDefaultVariant().GetObjects().GetObjects()) {
-      childObject->GetConfiguration().ExposeResources(worker);
-    }
+  for (auto& childObject : eventsBasedObject.GetObjects().GetObjects()) {
+    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
+    configuration.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_) {
+ public:
+  CustomObjectConfiguration(const Project& project_, const String& type_)
+      : project(&project_), isMarkedAsOverridingEventsBasedObjectChildrenConfiguration(false) {
     SetType(type_);
   }
   std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
@@ -66,27 +66,6 @@ public:
 
   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_;
-  }
-
-  /**
-   * Legacy events-based objects don't have any instance in their default
-   * variant since there wasn't a graphical editor at the time. In this case,
-   * the editor doesn't allow to choose a variant, but a variant may have stayed
-   * after a user rolled back the extension. This variant must be ignored.
-   *
-   * @return true when its events-based object doesn't have any initial
-   * instance.
-   */
   bool IsForcedToOverrideEventsBasedObjectChildrenConfiguration() const;
 
   bool IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() const {
@@ -166,7 +145,6 @@ 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/Effect.cpp

@@ -8,8 +8,6 @@
 #include "GDCore/Serialization/SerializerElement.h"
 
 namespace gd {
-  
-gd::String Effect::badStringParameterValue;
 
 void Effect::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());

Core/GDCore/Project/Effect.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EFFECT_H
+#define GDCORE_EFFECT_H
 #include <map>
 namespace gd {
 class SerializerElement;
@@ -34,43 +35,28 @@ class GD_CORE_API Effect {
   void SetFolded(bool fold = true) { folded = fold; }
   bool IsFolded() const { return folded; }
 
-  void SetDoubleParameter(const gd::String &name, double value) {
+  void SetDoubleParameter(const gd::String& name, double value) {
     doubleParameters[name] = value;
   }
 
-  double GetDoubleParameter(const gd::String &name) const {
-    auto itr = doubleParameters.find(name);
-    return itr == doubleParameters.end() ? 0 : itr->second;
+  double GetDoubleParameter(const gd::String& name) {
+    return doubleParameters[name];
   }
 
-  bool HasDoubleParameter(const gd::String &name) const {
-    return doubleParameters.find(name) != doubleParameters.end();
-  }
-
-  void SetStringParameter(const gd::String &name, const gd::String &value) {
+  void SetStringParameter(const gd::String& name, const gd::String& value) {
     stringParameters[name] = value;
   }
 
-  const gd::String &GetStringParameter(const gd::String &name) const {
-    auto itr = stringParameters.find(name);
-    return itr == stringParameters.end() ? badStringParameterValue : itr->second;
+  const gd::String& GetStringParameter(const gd::String& name) {
+    return stringParameters[name];
   }
 
-  bool HasStringParameter(const gd::String &name) const {
-    return stringParameters.find(name) != stringParameters.end();
-  }
-
-  void SetBooleanParameter(const gd::String &name, bool value) {
+  void SetBooleanParameter(const gd::String& name, bool value) {
     booleanParameters[name] = value;
   }
 
-  bool GetBooleanParameter(const gd::String &name) const {
-    auto itr = booleanParameters.find(name);
-    return itr == booleanParameters.end() ? false : itr->second;
-  }
-
-  bool HasBooleanParameter(const gd::String &name) const {
-    return booleanParameters.find(name) != booleanParameters.end();
+  bool GetBooleanParameter(const gd::String& name) {
+    return booleanParameters[name];
   }
 
   const std::map<gd::String, double>& GetAllDoubleParameters() const {
@@ -108,9 +94,7 @@ class GD_CORE_API Effect {
   std::map<gd::String, double> doubleParameters; ///< Values of parameters being doubles, keyed by names.
   std::map<gd::String, gd::String> stringParameters; ///< Values of parameters being strings, keyed by names.
   std::map<gd::String, bool> booleanParameters; ///< Values of parameters being booleans, keyed by names.
-
-  static gd::String badStringParameterValue;  ///< Empty string returned by
-                                              ///< GeStringParameter
 };
 
 }  // namespace gd
+#endif

Core/GDCore/Project/EventsBasedObject.cpp

@@ -17,13 +17,19 @@ EventsBasedObject::EventsBasedObject()
     isAnimatable(false),
     isTextContainer(false),
     isInnerAreaFollowingParentSize(false),
-    isUsingLegacyInstancesRenderer(false) {
+    isUsingLegacyInstancesRenderer(false),
+    areaMinX(0),
+    areaMinY(0),
+    areaMinZ(0),
+    areaMaxX(64),
+    areaMaxY(64),
+    areaMaxZ(64),
+    objectsContainer(gd::ObjectsContainer::SourceType::Object) {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
 
-
-void EventsBasedObject::SerializeToExternal(SerializerElement& element) const {
+void EventsBasedObject::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("defaultName", defaultName);
   if (isRenderedIn3D) {
     element.SetBoolAttribute("is3D", true);
@@ -38,16 +44,20 @@ void EventsBasedObject::SerializeToExternal(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"));
 
-void EventsBasedObject::SerializeTo(SerializerElement& element) const {
-  SerializeToExternal(element);
-  variants.SerializeVariantsTo(element.AddChild("variants"));
+  layers.SerializeLayersTo(element.AddChild("layers"));
+  initialInstances.SerializeTo(element.AddChild("instances"));
 }
 
 void EventsBasedObject::UnserializeFrom(gd::Project& project,
@@ -58,22 +68,36 @@ 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("variants")) {
-    variants.UnserializeVariantsFrom(project, element.GetChild("variants"));
+  if (element.HasChild("layers")) {
+    layers.UnserializeLayersFrom(element.GetChild("layers"));
+  } else {
+    layers.Reset();
   }
 
+  initialInstances.UnserializeFrom(element.GetChild("instances"));
   if (element.HasChild("isUsingLegacyInstancesRenderer")) {
     isUsingLegacyInstancesRenderer =
         element.GetBoolAttribute("isUsingLegacyInstancesRenderer", false);
   }
   else {
     // Compatibility with GD <= 5.4.212
-    isUsingLegacyInstancesRenderer = GetInitialInstances().GetInstancesCount() == 0;
+    isUsingLegacyInstancesRenderer = initialInstances.GetInstancesCount() == 0;
     // end of compatibility code
   }
 }

Core/GDCore/Project/EventsBasedObject.h

@@ -7,8 +7,6 @@
 
 #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"
@@ -164,38 +162,18 @@ 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 defaultVariant.GetLayers(); }
+  const gd::LayersContainer& GetLayers() const { return layers; }
 
   /**
    * \brief Get the layers of the custom object.
    */
-  gd::LayersContainer& GetLayers() { return defaultVariant.GetLayers(); }
+  gd::LayersContainer& GetLayers() { return layers; }
   ///@}
 
   /** \name Child objects
@@ -205,14 +183,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \brief Get the objects of the custom object.
    */
   gd::ObjectsContainer& GetObjects() {
-    return defaultVariant.GetObjects();
+    return objectsContainer;
   }
 
   /**
    * \brief Get the objects of the custom object.
    */
   const gd::ObjectsContainer& GetObjects() const {
-    return defaultVariant.GetObjects();
+    return objectsContainer;
   }
   ///@}
 
@@ -223,14 +201,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \brief Get the instances of the custom object.
    */
   gd::InitialInstancesContainer& GetInitialInstances() {
-    return defaultVariant.GetInitialInstances();
+    return initialInstances;
   }
 
   /**
    * \brief Get the instances of the custom object.
    */
   const gd::InitialInstancesContainer& GetInitialInstances() const {
-    return defaultVariant.GetInitialInstances();
+    return initialInstances;
   }
 
   /**
@@ -241,14 +219,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinX() const {
-    return defaultVariant.GetAreaMinX();
+    return areaMinX;
   }
 
   /**
    * \brief Set the left bound of the custom object.
    */
-  void SetAreaMinX(int areaMinX) {
-    defaultVariant.SetAreaMinX(areaMinX);
+  void SetAreaMinX(int areaMinX_) {
+    areaMinX = areaMinX_;
   }
 
   /**
@@ -259,14 +237,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinY() const {
-    return defaultVariant.GetAreaMinY();
+    return areaMinY;
   }
 
   /**
    * \brief Set the top bound of the custom object.
    */
-  void SetAreaMinY(int areaMinY) {
-    defaultVariant.SetAreaMinY(areaMinY);
+  void SetAreaMinY(int areaMinY_) {
+    areaMinY = areaMinY_;
   }
 
   /**
@@ -277,14 +255,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinZ() const {
-    return defaultVariant.GetAreaMinZ();
+    return areaMinZ;
   }
 
   /**
    * \brief Set the min Z bound of the custom object.
    */
-  void SetAreaMinZ(int areaMinZ) {
-    defaultVariant.SetAreaMinZ(areaMinZ);
+  void SetAreaMinZ(int areaMinZ_) {
+    areaMinZ = areaMinZ_;
   }
 
   /**
@@ -295,14 +273,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxX() const {
-    return defaultVariant.GetAreaMaxX();
+    return areaMaxX;
   }
 
   /**
    * \brief Set the right bound of the custom object.
    */
-  void SetAreaMaxX(int areaMaxX) {
-    defaultVariant.SetAreaMaxX(areaMaxX);
+  void SetAreaMaxX(int areaMaxX_) {
+    areaMaxX = areaMaxX_;
   }
 
   /**
@@ -313,14 +291,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxY() const {
-    return defaultVariant.GetAreaMaxY();
+    return areaMaxY;
   }
 
   /**
    * \brief Set the bottom bound of the custom object.
    */
-  void SetAreaMaxY(int areaMaxY) {
-    defaultVariant.SetAreaMaxY(areaMaxY);
+  void SetAreaMaxY(int areaMaxY_) {
+    areaMaxY = areaMaxY_;
   }
 
   /**
@@ -331,22 +309,16 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxZ() const {
-    return defaultVariant.GetAreaMaxZ();
+    return areaMaxZ;
   }
 
   /**
    * \brief Set the bottom bound of the custom object.
    */
-  void SetAreaMaxZ(int areaMaxZ) {
-    defaultVariant.SetAreaMaxZ(areaMaxZ);
+  void SetAreaMaxZ(int areaMaxZ_) {
+    areaMaxZ = 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;
 
@@ -360,8 +332,15 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   bool isTextContainer;
   bool isInnerAreaFollowingParentSize;
   bool isUsingLegacyInstancesRenderer;
-  gd::EventsBasedObjectVariant defaultVariant;
-  gd::EventsBasedObjectVariantsContainer variants;
+  gd::InitialInstancesContainer initialInstances;
+  gd::LayersContainer layers;
+  gd::ObjectsContainer objectsContainer;
+  double areaMinX;
+  double areaMinY;
+  double areaMinZ;
+  double areaMaxX;
+  double areaMaxY;
+  double areaMaxZ;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObjectVariant.cpp

@@ -1,71 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "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

@@ -1,229 +0,0 @@
-/*
- * 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

@@ -1,160 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <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,7 +47,6 @@ 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;
@@ -55,7 +54,7 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
   sceneVariables = other.GetSceneVariables();
 }
 
-void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isExternal) const {
+void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("version", version);
   element.SetAttribute("extensionNamespace", extensionNamespace);
   element.SetAttribute("shortDescription", shortDescription);
@@ -82,10 +81,6 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isEx
   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)
@@ -105,18 +100,8 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isEx
       element.AddChild("eventsFunctions"));
   eventsBasedBehaviors.SerializeElementsTo(
       "eventsBasedBehavior", element.AddChild("eventsBasedBehaviors"));
-  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"));
-  }
+  eventsBasedObjects.SerializeElementsTo(
+      "eventsBasedObject", element.AddChild("eventsBasedObjects"));
 }
 
 void EventsFunctionsExtension::UnserializeFrom(
@@ -141,10 +126,6 @@ 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,11 +12,9 @@
 #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;
@@ -136,19 +134,6 @@ 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.
    */
@@ -288,14 +273,7 @@ class GD_CORE_API EventsFunctionsExtension {
   /**
    * \brief Serialize the EventsFunctionsExtension to the specified element
    */
-  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);
-  }
+  void SerializeTo(gd::SerializerElement& element) const;
 
   /**
    * \brief Load the EventsFunctionsExtension from the specified element.
@@ -407,8 +385,6 @@ 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

@@ -1,105 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <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/InitialInstance.h

@@ -365,8 +365,6 @@ class GD_CORE_API InitialInstance {
    * the same initial instance between serialization.
    */
   InitialInstance& ResetPersistentUuid();
-
-  const gd::String& GetPersistentUuid() const { return persistentUuid; }
   ///@}
 
  private:

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -41,16 +41,6 @@ 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,13 +87,6 @@ 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/Layout.cpp

@@ -36,7 +36,7 @@ namespace gd {
 
 gd::BehaviorsSharedData Layout::badBehaviorSharedData("", "");
 
-Layout::Layout(const Layout& other)
+Layout::Layout(const Layout &other)
     : objectsContainer(gd::ObjectsContainer::SourceType::Scene) {
   Init(other);
 }
@@ -54,8 +54,6 @@ Layout::Layout()
       backgroundColorG(209),
       backgroundColorB(209),
       stopSoundsOnStartup(true),
-      resourcesPreloading("inherit"),
-      resourcesUnloading("inherit"),
       standardSortMethod(true),
       disableInputWhenNotFocused(true),
       variables(gd::VariablesContainer::SourceType::Scene),
@@ -246,10 +244,6 @@ void Layout::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("title", GetWindowDefaultTitle());
   element.SetAttribute("standardSortMethod", standardSortMethod);
   element.SetAttribute("stopSoundsOnStartup", stopSoundsOnStartup);
-  if (resourcesPreloading != "inherit")
-    element.SetAttribute("resourcesPreloading", resourcesPreloading);
-  if (resourcesUnloading != "inherit")
-    element.SetAttribute("resourcesUnloading", resourcesUnloading);
   element.SetAttribute("disableInputWhenNotFocused",
                        disableInputWhenNotFocused);
 
@@ -310,10 +304,6 @@ void Layout::UnserializeFrom(gd::Project& project,
       element.GetStringAttribute("title", "(No title)", "titre"));
   standardSortMethod = element.GetBoolAttribute("standardSortMethod");
   stopSoundsOnStartup = element.GetBoolAttribute("stopSoundsOnStartup");
-  resourcesPreloading =
-      element.GetStringAttribute("resourcesPreloading", "inherit");
-  resourcesUnloading =
-      element.GetStringAttribute("resourcesUnloading", "inherit");
   disableInputWhenNotFocused =
       element.GetBoolAttribute("disableInputWhenNotFocused");
 
@@ -401,8 +391,6 @@ void Layout::Init(const Layout& other) {
   standardSortMethod = other.standardSortMethod;
   title = other.title;
   stopSoundsOnStartup = other.stopSoundsOnStartup;
-  resourcesPreloading = other.resourcesPreloading;
-  resourcesUnloading = other.resourcesUnloading;
   disableInputWhenNotFocused = other.disableInputWhenNotFocused;
   initialInstances = other.initialInstances;
   layers = other.layers;

Core/GDCore/Project/Layout.h

@@ -349,36 +349,6 @@ class GD_CORE_API Layout {
    * launched
    */
   bool StopSoundsOnStartup() const { return stopSoundsOnStartup; }
-
-  /**
-   * Set when the scene must preload its resources: `at-startup`, `never` or
-   * `inherit` (default).
-   */
-  void SetResourcesPreloading(gd::String resourcesPreloading_) {
-    resourcesPreloading = resourcesPreloading_;
-  }
-
-  /**
-   * Get when the scene must preload its resources: `at-startup`, `never` or
-   * `inherit` (default).
-   */
-  const gd::String& GetResourcesPreloading() const {
-    return resourcesPreloading;
-  }
-
-  /**
-   * Set when the scene must unload its resources: `at-scene-exit`, `never` or
-   * `inherit` (default).
-   */
-  void SetResourcesUnloading(gd::String resourcesUnloading_) {
-    resourcesUnloading = resourcesUnloading_;
-  }
-
-  /**
-   * Get when the scene must unload its resources: `at-scene-exit`, `never` or
-   * `inherit` (default).
-   */
-  const gd::String& GetResourcesUnloading() const { return resourcesUnloading; }
   ///@}
 
   /** \name Saving and loading
@@ -411,10 +381,6 @@ class GD_CORE_API Layout {
       behaviorsSharedData;   ///< Initial shared datas of behaviors
   bool stopSoundsOnStartup = true;  ///< True to make the scene stop all sounds at
                                     ///< startup.
-  gd::String
-      resourcesPreloading;  ///< `at-startup`, `never` or `inherit` (default).
-  gd::String
-      resourcesUnloading;  ///< `at-scene-exit`, `never` or `inherit` (default).
   bool standardSortMethod = true;   ///< True to sort objects using standard sort.
   bool disableInputWhenNotFocused = true;  /// If set to true, the input must be
                                            /// disabled when the window do not have the

Core/GDCore/Project/Object.cpp

@@ -41,11 +41,6 @@ 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;
@@ -56,6 +51,8 @@ void Object::CopyWithoutConfiguration(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,8 +82,6 @@ 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/ObjectsContainersList.h

@@ -81,11 +81,6 @@ 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

@@ -74,9 +74,7 @@ Project::Project()
       gdMinorVersion(gd::VersionWrapper::Minor()),
       gdBuildVersion(gd::VersionWrapper::Build()),
       variables(gd::VariablesContainer::SourceType::Global),
-      objectsContainer(gd::ObjectsContainer::SourceType::Global),
-      sceneResourcesPreloading("at-startup"),
-      sceneResourcesUnloading("never") {}
+      objectsContainer(gd::ObjectsContainer::SourceType::Global) {}
 
 Project::~Project() {}
 
@@ -922,7 +920,6 @@ 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,
@@ -941,16 +938,6 @@ 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);
   }
@@ -979,15 +966,6 @@ 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);
-    }
   }
 }
 
@@ -1168,13 +1146,6 @@ void Project::SerializeTo(SerializerElement& element) const {
   else
     std::cout << "ERROR: The project current platform is NULL.";
 
-  if (sceneResourcesPreloading != "at-startup") {
-    propElement.SetAttribute("sceneResourcesPreloading", sceneResourcesPreloading);
-  }
-  if (sceneResourcesUnloading != "never") {
-    propElement.SetAttribute("sceneResourcesUnloading", sceneResourcesUnloading);
-  }
-
   resourcesManager.SerializeTo(element.AddChild("resources"));
   objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
   objectsContainer.SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
@@ -1316,9 +1287,6 @@ void Project::Init(const gd::Project& game) {
   variables = game.GetVariables();
 
   projectFile = game.GetProjectFile();
-
-  sceneResourcesPreloading = game.sceneResourcesPreloading;
-  sceneResourcesUnloading = game.sceneResourcesUnloading;
 }
 
 }  // namespace gd

Core/GDCore/Project/Project.h

@@ -964,37 +964,6 @@ class GD_CORE_API Project {
    */
   ResourcesManager& GetResourcesManager() { return resourcesManager; }
 
-  /**
-   * Set when the scenes must preload their resources: `at-startup`, `never`
-   * (default).
-   */
-  void SetSceneResourcesPreloading(gd::String sceneResourcesPreloading_) {
-    sceneResourcesPreloading = sceneResourcesPreloading_;
-  }
-
-  /**
-   * Get when the scenes must preload their resources: `at-startup`, `never`
-   * (default).
-   */
-  const gd::String& GetSceneResourcesPreloading() const {
-    return sceneResourcesPreloading;
-  }
-
-  /**
-   * Set when the scenes must unload their resources: `at-scene-exit`, `never`
-   * (default).
-   */
-  void SetSceneResourcesUnloading(gd::String sceneResourcesUnloading_) {
-    sceneResourcesUnloading = sceneResourcesUnloading_;
-  }
-
-  /**
-   * Get when the scenes must unload their resources: `at-scene-exit`, `never`
-   * (default).
-   */
-  const gd::String& GetSceneResourcesUnloading() const {
-    return sceneResourcesUnloading;
-  }
   ///@}
 
   /** \name Variable management
@@ -1152,10 +1121,6 @@ class GD_CORE_API Project {
   ExtensionProperties
       extensionProperties;  ///< The properties of the extensions.
   gd::WholeProjectDiagnosticReport wholeProjectDiagnosticReport;
-  gd::String sceneResourcesPreloading;  ///< `at-startup` or `never`
-                                        ///< (default: `at-startup`).
-  gd::String sceneResourcesUnloading;   ///< `at-scene-exit` or `never`
-                                        ///< (default: `never`).
   mutable unsigned int gdMajorVersion =
       0;  ///< The GD major version used the last
           ///< time the project was saved.

Core/GDCore/Project/PropertyDescriptor.cpp

@@ -21,19 +21,14 @@ void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
     element.AddChild("unit").SetStringValue(measurementUnit.GetName());
   }
   element.AddChild("label").SetStringValue(label);
-  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);
-    }
+  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 (hidden) {
     element.AddChild("hidden").SetBoolValue(hidden);
   }
@@ -64,21 +59,16 @@ void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
             : gd::MeasurementUnit::GetUndefined();
   }
   label = element.GetChild("label").GetStringValue();
-  description = element.HasChild("description")
-                    ? element.GetChild("description").GetStringValue()
-                    : "";
-  group = element.HasChild("group") ? element.GetChild("group").GetStringValue()
-                                    : "";
+  description = element.GetChild("description").GetStringValue();
+  group = element.GetChild("group").GetStringValue();
 
   extraInformation.clear();
-  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());
-  }
+  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/Project/PropertyDescriptor.h

@@ -7,9 +7,9 @@
 #define GDCORE_PROPERTYDESCRIPTOR
 #include <vector>
 
+#include "GDCore/String.h"
 #include "GDCore/Project/MeasurementUnit.h"
 #include "GDCore/Project/QuickCustomization.h"
-#include "GDCore/String.h"
 
 namespace gd {
 class SerializerElement;
@@ -17,19 +17,6 @@ class SerializerElement;
 
 namespace gd {
 
-class GD_CORE_API PropertyDescriptorChoice {
- public:
-  PropertyDescriptorChoice(const gd::String& value, const gd::String& label)
-      : value(value), label(label) {}
-
-  const gd::String& GetValue() const { return value; }
-  const gd::String& GetLabel() const { return label; }
-
- private:
-  gd::String value;
-  gd::String label;
-};
-
 /**
  * \brief Used to describe a property shown in a property grid.
  * \see gd::Object
@@ -44,12 +31,8 @@ class GD_CORE_API PropertyDescriptor {
    * \param propertyValue The value of the property.
    */
   PropertyDescriptor(gd::String propertyValue)
-      : currentValue(propertyValue),
-        type("string"),
-        label(""),
-        hidden(false),
-        deprecated(false),
-        advanced(false),
+      : currentValue(propertyValue), type("string"), label(""), hidden(false),
+        deprecated(false), advanced(false),
         hasImpactOnOtherProperties(false),
         measurementUnit(gd::MeasurementUnit::GetUndefined()),
         quickCustomizationVisibility(QuickCustomization::Visibility::Default) {}
@@ -58,13 +41,10 @@ class GD_CORE_API PropertyDescriptor {
    * \brief Empty constructor creating an empty property to be displayed.
    */
   PropertyDescriptor()
-      : hidden(false),
-        deprecated(false),
-        advanced(false),
+      : hidden(false), deprecated(false), advanced(false),
         hasImpactOnOtherProperties(false),
         measurementUnit(gd::MeasurementUnit::GetUndefined()),
-        quickCustomizationVisibility(QuickCustomization::Visibility::Default) {
-        };
+        quickCustomizationVisibility(QuickCustomization::Visibility::Default){};
 
   /**
    * \brief Destructor
@@ -108,20 +88,13 @@ class GD_CORE_API PropertyDescriptor {
   }
 
   /**
-   * \brief Change the group where this property is displayed to the user, if
-   * any.
+   * \brief Change the group where this property is displayed to the user, if any.
    */
   PropertyDescriptor& SetGroup(gd::String group_) {
     group = group_;
     return *this;
   }
 
-  PropertyDescriptor& AddChoice(const gd::String& value,
-                                const gd::String& label) {
-    choices.push_back(PropertyDescriptorChoice(value, label));
-    return *this;
-  }
-
   /**
    * \brief Set and replace the additional information for the property.
    */
@@ -145,8 +118,7 @@ class GD_CORE_API PropertyDescriptor {
   /**
    * \brief Change the unit of measurement of the property value.
    */
-  PropertyDescriptor& SetMeasurementUnit(
-      const gd::MeasurementUnit& measurementUnit_) {
+  PropertyDescriptor& SetMeasurementUnit(const gd::MeasurementUnit &measurementUnit_) {
     measurementUnit = measurementUnit_;
     return *this;
   }
@@ -156,18 +128,14 @@ class GD_CORE_API PropertyDescriptor {
   const gd::String& GetLabel() const { return label; }
   const gd::String& GetDescription() const { return description; }
   const gd::String& GetGroup() const { return group; }
-  const gd::MeasurementUnit& GetMeasurementUnit() const {
-    return measurementUnit;
-  }
+  const gd::MeasurementUnit& GetMeasurementUnit() const { return measurementUnit; }
 
   const std::vector<gd::String>& GetExtraInfo() const {
     return extraInformation;
   }
 
-  std::vector<gd::String>& GetExtraInfo() { return extraInformation; }
-
-  const std::vector<PropertyDescriptorChoice>& GetChoices() const {
-    return choices;
+  std::vector<gd::String>& GetExtraInfo() {
+    return extraInformation;
   }
 
   /**
@@ -210,26 +178,23 @@ class GD_CORE_API PropertyDescriptor {
   bool IsAdvanced() const { return advanced; }
 
   /**
-   * \brief Check if the property has impact on other properties - which means a
-   * change must re-render other properties.
+   * \brief Check if the property has impact on other properties - which means a change
+   * must re-render other properties.
    */
   bool HasImpactOnOtherProperties() const { return hasImpactOnOtherProperties; }
 
   /**
-   * \brief Set if the property has impact on other properties - which means a
-   * change must re-render other properties.
+   * \brief Set if the property has impact on other properties - which means a change
+   * must re-render other properties.
    */
   PropertyDescriptor& SetHasImpactOnOtherProperties(bool enable) {
     hasImpactOnOtherProperties = enable;
     return *this;
   }
 
-  QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
-    return quickCustomizationVisibility;
-  }
+  QuickCustomization::Visibility GetQuickCustomizationVisibility() const { return quickCustomizationVisibility; }
 
-  PropertyDescriptor& SetQuickCustomizationVisibility(
-      QuickCustomization::Visibility visibility) {
+  PropertyDescriptor& SetQuickCustomizationVisibility(QuickCustomization::Visibility visibility) {
     quickCustomizationVisibility = visibility;
     return *this;
   }
@@ -266,17 +231,15 @@ class GD_CORE_API PropertyDescriptor {
   gd::String label;        //< The user-friendly property name
   gd::String description;  //< The user-friendly property description
   gd::String group;        //< The user-friendly property group
-  std::vector<PropertyDescriptorChoice>
-      choices;  //< The optional choices for the property.
   std::vector<gd::String>
-      extraInformation;  ///< Can be used to store an additional information
-                         ///< like an object type.
+      extraInformation;  ///< Can be used to store for example the available
+                         ///< choices, if a property is a displayed as a combo
+                         ///< box.
   bool hidden;
   bool deprecated;
   bool advanced;
   bool hasImpactOnOtherProperties;
-  gd::MeasurementUnit
-      measurementUnit;  //< The unit of measurement of the property vale.
+  gd::MeasurementUnit measurementUnit; //< The unit of measurement of the property vale.
   QuickCustomization::Visibility quickCustomizationVisibility;
 };
 

Core/GDCore/Tools/Localization.cpp

@@ -6,7 +6,6 @@
 
 #if defined(EMSCRIPTEN)
 #include <emscripten.h>
-
 #include "GDCore/String.h"
 
 namespace gd {
@@ -32,10 +31,5 @@ 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,10 +26,8 @@
 #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/ArbitraryResourceWorker.cpp

@@ -764,6 +764,129 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
       REQUIRE(worker.audios[0] == "res4");
     }
 
+    SECTION("Can find resource usages in event-based functions") {
+      gd::Project project;
+      gd::Platform platform;
+      SetupProjectWithDummyPlatform(project, platform);
+
+      project.GetResourcesManager().AddResource(
+          "res1", "path/to/file1.png", "image");
+      project.GetResourcesManager().AddResource(
+          "res2", "path/to/file2.png", "image");
+      project.GetResourcesManager().AddResource(
+          "res3", "path/to/file3.png", "image");
+      ArbitraryResourceWorkerTest worker(project.GetResourcesManager());
+
+      auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtension", 0);
+      auto &function = extension.GetEventsFunctions().InsertNewEventsFunction(
+          "MyFreeFunction", 0);
+
+      gd::StandardEvent standardEvent;
+      gd::Instruction instruction;
+      instruction.SetType("MyExtension::DoSomethingWithResources");
+      instruction.SetParametersCount(3);
+      instruction.SetParameter(0, "res3");
+      instruction.SetParameter(1, "res1");
+      instruction.SetParameter(2, "res4");
+      standardEvent.GetActions().Insert(instruction);
+      function.GetEvents().InsertEvent(standardEvent);
+
+      auto& layout = project.InsertNewLayout("MyScene", 0);
+
+      // MyEventExtension::MyFreeFunction doesn't need to be actually used in
+      // events because the implementation is naive.
+
+      gd::ResourceExposer::ExposeLayoutResources(project, layout, worker);
+      REQUIRE(worker.bitmapFonts.size() == 1);
+      REQUIRE(worker.bitmapFonts[0] == "res3");
+      REQUIRE(worker.images.size() == 1);
+      REQUIRE(worker.images[0] == "res1");
+      REQUIRE(worker.audios.size() == 1);
+      REQUIRE(worker.audios[0] == "res4");
+    }
+
+    SECTION("Can find resource usages in event-based behavior functions") {
+      gd::Project project;
+      gd::Platform platform;
+      SetupProjectWithDummyPlatform(project, platform);
+
+      project.GetResourcesManager().AddResource(
+          "res1", "path/to/file1.png", "image");
+      project.GetResourcesManager().AddResource(
+          "res2", "path/to/file2.png", "image");
+      project.GetResourcesManager().AddResource(
+          "res3", "path/to/file3.png", "image");
+      ArbitraryResourceWorkerTest worker(project.GetResourcesManager());
+
+      auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtension", 0);
+      auto& behavior = extension.GetEventsBasedBehaviors().InsertNew("MyBehavior", 0);
+      auto& function = behavior.GetEventsFunctions().InsertNewEventsFunction("MyFunction", 0);
+      
+      gd::StandardEvent standardEvent;
+      gd::Instruction instruction;
+      instruction.SetType("MyExtension::DoSomethingWithResources");
+      instruction.SetParametersCount(3);
+      instruction.SetParameter(0, "res3");
+      instruction.SetParameter(1, "res1");
+      instruction.SetParameter(2, "res4");
+      standardEvent.GetActions().Insert(instruction);
+      function.GetEvents().InsertEvent(standardEvent);
+
+      auto& layout = project.InsertNewLayout("MyScene", 0);
+
+      // MyEventExtension::MyBehavior::MyFunction doesn't need to be actually used in
+      // events because the implementation is naive.
+
+      gd::ResourceExposer::ExposeLayoutResources(project, layout, worker);
+      REQUIRE(worker.bitmapFonts.size() == 1);
+      REQUIRE(worker.bitmapFonts[0] == "res3");
+      REQUIRE(worker.images.size() == 1);
+      REQUIRE(worker.images[0] == "res1");
+      REQUIRE(worker.audios.size() == 1);
+      REQUIRE(worker.audios[0] == "res4");
+    }
+
+    SECTION("Can find resource usages in event-based object functions") {
+      gd::Project project;
+      gd::Platform platform;
+      SetupProjectWithDummyPlatform(project, platform);
+
+      project.GetResourcesManager().AddResource(
+          "res1", "path/to/file1.png", "image");
+      project.GetResourcesManager().AddResource(
+          "res2", "path/to/file2.png", "image");
+      project.GetResourcesManager().AddResource(
+          "res3", "path/to/file3.png", "image");
+      ArbitraryResourceWorkerTest worker(project.GetResourcesManager());
+
+      auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtension", 0);
+      auto& object = extension.GetEventsBasedObjects().InsertNew("MyObject", 0);
+      auto& function = object.GetEventsFunctions().InsertNewEventsFunction("MyFunction", 0);
+      
+      gd::StandardEvent standardEvent;
+      gd::Instruction instruction;
+      instruction.SetType("MyExtension::DoSomethingWithResources");
+      instruction.SetParametersCount(3);
+      instruction.SetParameter(0, "res3");
+      instruction.SetParameter(1, "res1");
+      instruction.SetParameter(2, "res4");
+      standardEvent.GetActions().Insert(instruction);
+      function.GetEvents().InsertEvent(standardEvent);
+
+      auto& layout = project.InsertNewLayout("MyScene", 0);
+
+      // MyEventExtension::MyObject::MyFunction doesn't need to be actually used in
+      // events because the implementation is naive.
+
+      gd::ResourceExposer::ExposeLayoutResources(project, layout, worker);
+      REQUIRE(worker.bitmapFonts.size() == 1);
+      REQUIRE(worker.bitmapFonts[0] == "res3");
+      REQUIRE(worker.images.size() == 1);
+      REQUIRE(worker.images[0] == "res1");
+      REQUIRE(worker.audios.size() == 1);
+      REQUIRE(worker.audios[0] == "res4");
+    }
+
     SECTION("Can find resource usages in layer effects") {
       gd::Project project;
       gd::Platform platform;

Core/tests/EventsBasedObjectVariantHelper.cpp

@@ -1,522 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-/**
- * @file Tests covering 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,132 +33,7 @@ using namespace gd;
 
 TEST_CASE("ObjectAssetSerializer", "[common]") {
 
-  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") {
+  SECTION("Can serialize custom objects as assets") {
     gd::Platform platform;
     gd::Project project;
     SetupProjectWithDummyPlatform(project, platform);
@@ -184,8 +59,6 @@ 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, "MyExtension::FakeObjectWithDefaultBehavior", "MyObject2", 0);
+        project, "FakeObjectWithDefaultBehavior", "MyObject2", 0);
 
     auto &group = layout.GetObjects().GetObjectGroups().InsertNew("MyGroup", 0);
     group.AddObject(object1.GetName());

Core/tests/PropertyFunctionGenerator.cpp

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

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/ObjectVariableHelper.h"
+#include "GDCore/IDE/GroupVariableHelper.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() == 40);
+      REQUIRE(event.GetActions().GetCount() == 19);
 
       // clang-format off
-      // 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)");
+      // 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)");
 
-      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");
+      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");
       // clang-format on
     }
 
@@ -1021,233 +1021,6 @@ 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;
@@ -1289,9 +1062,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-        project, object.GetVariables(), scene.GetInitialInstances(),
-        object.GetName(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+        project, object.GetVariables(), changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
             "MyVariable.MyRenamedChild");
@@ -1340,9 +1112,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-        project, object.GetVariables(), scene.GetInitialInstances(),
-        object.GetName(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+        project, object.GetVariables(), changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
             "MyVariable.MyRenamedChild");
@@ -1390,9 +1161,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
 
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-        project, object.GetVariables(), scene.GetInitialInstances(),
-        object.GetName(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+        project, object.GetVariables(), changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(3).GetPlainString() ==
             "MyVariable.MyChild.MyRenamedGrandChild");
@@ -2126,9 +1896,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.typeChangedVariableNames.find("MyObjectVariable") !=
             changeset.typeChangedVariableNames.end());
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-        project, object.GetVariables(), scene.GetInitialInstances(),
-        object.GetName(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+        project, object.GetVariables(), changeset, originalSerializedVariables);
 
     // Check the the action has changed to follow the variable type.
     REQUIRE(event.GetActions()[0].GetType() == "SetStringObjectVariable");
@@ -2178,9 +1947,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.typeChangedVariableNames.find("MyObjectVariable") !=
             changeset.typeChangedVariableNames.end());
 
-    gd::WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-        project, object.GetVariables(), scene.GetInitialInstances(),
-        object.GetName(), changeset, originalSerializedVariables);
+    gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
+        project, object.GetVariables(), changeset, originalSerializedVariables);
 
     // Check the the action has changed to follow the variable type.
     REQUIRE(event.GetActions()[0].GetType() == "SetStringObjectVariable");
@@ -2209,7 +1977,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 1);
@@ -2241,7 +2009,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 1);
@@ -2261,7 +2029,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 0);
@@ -2282,7 +2050,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Count() == 0);
@@ -2307,7 +2075,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2326,9 +2094,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 456);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2354,7 +2121,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2373,9 +2140,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 456);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2401,7 +2167,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2422,9 +2188,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 111);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2450,7 +2215,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
     
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2471,9 +2236,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 0);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2499,7 +2263,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2518,9 +2282,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 0);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 111);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2555,7 +2318,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Count() == 1);
@@ -2573,9 +2336,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
             originalSerializedVariables, groupVariables);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(newObject.GetVariables().Count() == 2);
     REQUIRE(newObject.GetVariables().Get("MyGroupVariable").GetValue() == 123);
@@ -2607,7 +2369,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2628,9 +2390,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2667,7 +2428,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2687,9 +2448,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2726,7 +2486,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2746,9 +2506,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2799,7 +2558,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2820,9 +2579,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.valueChangedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables()
                 .Get("MyGroupVariable")
@@ -2855,14 +2613,11 @@ 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::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -2880,13 +2635,11 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.removedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), 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") {
@@ -2906,7 +2659,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Count() == 0);
@@ -2924,9 +2677,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.addedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Get("MyGroupVariable").GetValue() == 456);
     REQUIRE(otherObject.GetVariables().Get("MyGroupVariable").GetValue() ==
@@ -2952,7 +2704,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Count() == 0);
@@ -2970,9 +2722,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.addedVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     // The variable kept its original value.
     REQUIRE(object.GetVariables().Count() == 1);
@@ -2998,9 +2749,6 @@ 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(
@@ -3039,7 +2787,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -3058,9 +2806,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.oldToNewVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(object.GetVariables().Count() == 1);
     REQUIRE(object.GetVariables().Get("MyRenamedGroupVariable").GetValue() == 123);
@@ -3083,7 +2830,6 @@ 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") {
@@ -3141,7 +2887,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -3160,9 +2906,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.oldToNewVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
         
     // The variable kept its original value.
     REQUIRE(object.GetVariables().Count() == 1);
@@ -3247,7 +2992,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -3271,9 +3016,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.modifiedVariables.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
             "MyGroupVariable.MyRenamedChild");
@@ -3323,7 +3067,7 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForProjectAndLayout(project, scene);
     gd::VariablesContainer groupVariables =
-        gd::ObjectVariableHelper::MergeVariableContainers(
+        gd::GroupVariableHelper::MergeVariableContainers(
             projectScopedContainers.GetObjectsContainersList(), group);
 
     REQUIRE(groupVariables.Has("MyGroupVariable"));
@@ -3342,9 +3086,8 @@ TEST_CASE("WholeProjectRefactorer::ApplyRefactoringForVariablesContainer",
     REQUIRE(changeset.oldToNewVariableNames.size() == 1);
 
     gd::WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
-        project, project.GetObjects(), scene.GetObjects(),
-        scene.GetInitialInstances(), groupVariables, group, changeset,
-        originalSerializedVariables);
+        project, project.GetObjects(), scene.GetObjects(), groupVariables,
+        group, changeset, originalSerializedVariables);
 
     REQUIRE(event.GetActions()[0].GetParameter(1).GetPlainString() ==
             "MyGroupVariable");

Core/tests/WholeProjectRefactorer.cpp

@@ -1754,9 +1754,6 @@ 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);
@@ -1768,10 +1765,6 @@ 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);
@@ -1779,17 +1772,6 @@ 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") {
@@ -1814,9 +1796,6 @@ 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);
@@ -1828,16 +1807,10 @@ 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

@@ -5,6 +5,8 @@ namespace gdjs {
   type Object3DNetworkSyncDataType = {
     // z is position on the Z axis, different from zo, which is Z order
     z: number;
+    w: number;
+    h: number;
     d: number;
     rx: number;
     ry: number;
@@ -114,6 +116,8 @@ namespace gdjs {
       return {
         ...super.getNetworkSyncData(),
         z: this.getZ(),
+        w: this.getWidth(),
+        h: this.getHeight(),
         d: this.getDepth(),
         rx: this.getRotationX(),
         ry: this.getRotationY(),
@@ -126,6 +130,8 @@ namespace gdjs {
     updateFromNetworkSyncData(networkSyncData: Object3DNetworkSyncData) {
       super.updateFromNetworkSyncData(networkSyncData);
       if (networkSyncData.z !== undefined) this.setZ(networkSyncData.z);
+      if (networkSyncData.w !== undefined) this.setWidth(networkSyncData.w);
+      if (networkSyncData.h !== undefined) this.setHeight(networkSyncData.h);
       if (networkSyncData.d !== undefined) this.setDepth(networkSyncData.d);
       if (networkSyncData.rx !== undefined)
         this.setRotationX(networkSyncData.rx);

Extensions/3D/Cube3DRuntimeObject.ts

@@ -25,8 +25,6 @@ namespace gdjs {
       topFaceVisible: boolean;
       bottomFaceVisible: boolean;
       tint: string | undefined;
-      isCastingShadow: boolean;
-      isReceivingShadow: boolean;
       materialType: 'Basic' | 'StandardWithoutMetalness';
     };
   }
@@ -73,10 +71,8 @@ namespace gdjs {
       string,
     ];
     _materialType: gdjs.Cube3DRuntimeObject.MaterialType =
-      gdjs.Cube3DRuntimeObject.MaterialType.StandardWithoutMetalness;
+      gdjs.Cube3DRuntimeObject.MaterialType.Basic;
     _tint: string;
-    _isCastingShadow: boolean = true;
-    _isReceivingShadow: boolean = true;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -125,8 +121,6 @@ namespace gdjs {
       ];
 
       this._tint = objectData.content.tint || '255;255;255';
-      this._isCastingShadow = objectData.content.isCastingShadow || false;
-      this._isReceivingShadow = objectData.content.isReceivingShadow || false;
 
       this._materialType = this._convertMaterialType(
         objectData.content.materialType
@@ -436,18 +430,6 @@ namespace gdjs {
       ) {
         this.setMaterialType(newObjectData.content.materialType);
       }
-      if (
-        oldObjectData.content.isCastingShadow !==
-        newObjectData.content.isCastingShadow
-      ) {
-        this.updateShadowCasting(newObjectData.content.isCastingShadow);
-      }
-      if (
-        oldObjectData.content.isReceivingShadow !==
-        newObjectData.content.isReceivingShadow
-      ) {
-        this.updateShadowReceiving(newObjectData.content.isReceivingShadow);
-      }
 
       return true;
     }
@@ -549,14 +531,6 @@ namespace gdjs {
       this._materialType = newMaterialType;
       this._renderer._updateMaterials();
     }
-    updateShadowCasting(value: boolean) {
-      this._isCastingShadow = value;
-      this._renderer.updateShadowCasting();
-    }
-    updateShadowReceiving(value: boolean) {
-      this._isReceivingShadow = value;
-      this._renderer.updateShadowReceiving();
-    }
   }
 
   export namespace Cube3DRuntimeObject {

Extensions/3D/Cube3DRuntimeObjectPixiRenderer.ts

@@ -62,7 +62,6 @@ namespace gdjs {
         forceBasicMaterial:
           runtimeObject._materialType ===
           gdjs.Cube3DRuntimeObject.MaterialType.Basic,
-        vertexColors: true,
       });
   };
 
@@ -81,14 +80,13 @@ namespace gdjs {
         .map((_, index) =>
           getFaceMaterial(runtimeObject, materialIndexToFaceIndex[index])
         );
+
       const boxMesh = new THREE.Mesh(geometry, materials);
 
       super(runtimeObject, instanceContainer, boxMesh);
       this._boxMesh = boxMesh;
       this._cube3DRuntimeObject = runtimeObject;
 
-      boxMesh.receiveShadow = this._cube3DRuntimeObject._isReceivingShadow;
-      boxMesh.castShadow = this._cube3DRuntimeObject._isCastingShadow;
       this.updateSize();
       this.updatePosition();
       this.updateRotation();
@@ -115,13 +113,6 @@ namespace gdjs {
         new THREE.BufferAttribute(new Float32Array(tints), 3)
       );
     }
-    updateShadowCasting() {
-      this._boxMesh.castShadow = this._cube3DRuntimeObject._isCastingShadow;
-    }
-    updateShadowReceiving() {
-      this._boxMesh.receiveShadow =
-        this._cube3DRuntimeObject._isReceivingShadow;
-    }
 
     updateFace(faceIndex: integer) {
       const materialIndex = faceIndexToMaterialIndex[faceIndex];

Extensions/3D/CustomRuntimeObject3D.ts

@@ -1,12 +1,4 @@
 namespace gdjs {
-  type CustomObject3DNetworkSyncDataType = CustomObjectNetworkSyncDataType & {
-    z: float;
-    d: float;
-    rx: float;
-    ry: float;
-    ifz: boolean;
-  };
-
   /**
    * Base class for 3D custom objects.
    */
@@ -42,6 +34,7 @@ namespace gdjs {
       objectData: gdjs.Object3DData & gdjs.CustomObjectConfiguration
     ) {
       super(parent, objectData);
+      this._renderer.reinitialize(this, parent);
     }
 
     protected override _createRender() {
@@ -85,30 +78,6 @@ namespace gdjs {
       }
     }
 
-    getNetworkSyncData(): CustomObject3DNetworkSyncDataType {
-      return {
-        ...super.getNetworkSyncData(),
-        z: this.getZ(),
-        d: this.getDepth(),
-        rx: this.getRotationX(),
-        ry: this.getRotationY(),
-        ifz: this.isFlippedZ(),
-      };
-    }
-
-    updateFromNetworkSyncData(
-      networkSyncData: CustomObject3DNetworkSyncDataType
-    ): void {
-      super.updateFromNetworkSyncData(networkSyncData);
-      if (networkSyncData.z !== undefined) this.setZ(networkSyncData.z);
-      if (networkSyncData.d !== undefined) this.setDepth(networkSyncData.d);
-      if (networkSyncData.rx !== undefined)
-        this.setRotationX(networkSyncData.rx);
-      if (networkSyncData.ry !== undefined)
-        this.setRotationY(networkSyncData.ry);
-      if (networkSyncData.ifz !== undefined) this.flipZ(networkSyncData.ifz);
-    }
-
     /**
      * Set the object position on the Z axis.
      */

Extensions/3D/CustomRuntimeObject3DRenderer.ts

@@ -44,7 +44,10 @@ namespace gdjs {
     ) {
       this._object = object;
       this._isContainerDirty = true;
-      this._threeGroup.clear();
+      const layer = parent.getLayer('');
+      if (layer) {
+        layer.getRenderer().add3DRendererObject(this._threeGroup);
+      }
     }
 
     _updateThreeGroup() {
@@ -157,7 +160,6 @@ namespace gdjs {
       return this._imageManager.getThreeMaterial(imageName, {
         useTransparentTexture: true,
         forceBasicMaterial: true,
-        vertexColors: false,
       });
     }
 

Extensions/3D/DirectionalLight.ts

@@ -6,7 +6,6 @@ namespace gdjs {
     r: number;
     t: string;
   }
-  const shadowHelper = false;
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Scene3D::DirectionalLight',
     new (class implements gdjs.PixiFiltersTools.FilterCreator {
@@ -18,63 +17,19 @@ namespace gdjs {
           return new gdjs.PixiFiltersTools.EmptyFilter();
         }
         return new (class implements gdjs.PixiFiltersTools.Filter {
-          private _top: string = 'Z+';
-          private _elevation: float = 45;
-          private _rotation: float = 0;
-          private _shadowMapSize: float = 1024;
-          private _minimumShadowBias: float = 0;
-          private _distanceFromCamera: float = 1500;
-          private _frustumSize: float = 4000;
-
-          private _isEnabled: boolean = false;
-          private _light: THREE.DirectionalLight;
-          private _shadowMapDirty = true;
-          private _shadowCameraDirty = true;
-          private _shadowCameraHelper: THREE.CameraHelper | null;
+          light: THREE.DirectionalLight;
+          rotationObject: THREE.Group;
+          _isEnabled: boolean = false;
+          top: string = 'Y-';
+          elevation: float = 45;
+          rotation: float = 0;
 
           constructor() {
-            this._light = new THREE.DirectionalLight();
-
-            if (shadowHelper) {
-              this._shadowCameraHelper = new THREE.CameraHelper(
-                this._light.shadow.camera
-              );
-            } else {
-              this._shadowCameraHelper = null;
-            }
-
-            this._light.shadow.camera.updateProjectionMatrix();
-          }
-
-          private _updateShadowCamera(): void {
-            if (!this._shadowCameraDirty) {
-              return;
-            }
-            this._shadowCameraDirty = false;
-
-            this._light.shadow.camera.near = 1;
-            this._light.shadow.camera.far = this._distanceFromCamera + 10000;
-            this._light.shadow.camera.right = this._frustumSize / 2;
-            this._light.shadow.camera.left = -this._frustumSize / 2;
-            this._light.shadow.camera.top = this._frustumSize / 2;
-            this._light.shadow.camera.bottom = -this._frustumSize / 2;
-          }
-
-          private _updateShadowMapSize(): void {
-            if (!this._shadowMapDirty) {
-              return;
-            }
-            this._shadowMapDirty = false;
-
-            this._light.shadow.mapSize.set(
-              this._shadowMapSize,
-              this._shadowMapSize
-            );
-
-            // Force the recreation of the shadow map texture:
-            this._light.shadow.map?.dispose();
-            this._light.shadow.map = null;
-            this._light.shadow.needsUpdate = true;
+            this.light = new THREE.DirectionalLight();
+            this.light.position.set(1, 0, 0);
+            this.rotationObject = new THREE.Group();
+            this.rotationObject.add(this.light);
+            this.updateRotation();
           }
 
           isEnabled(target: EffectsTarget): boolean {
@@ -98,12 +53,7 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.add(this._light);
-            scene.add(this._light.target);
-            if (this._shadowCameraHelper) {
-              scene.add(this._shadowCameraHelper);
-            }
-
+            scene.add(this.rotationObject);
             this._isEnabled = true;
             return true;
           }
@@ -115,164 +65,82 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.remove(this._light);
-            scene.remove(this._light.target);
-            if (this._shadowCameraHelper) {
-              scene.remove(this._shadowCameraHelper);
-            }
+            scene.remove(this.rotationObject);
             this._isEnabled = false;
             return true;
           }
-          updatePreRender(target: gdjs.EffectsTarget): any {
-            // Apply any update to the camera or shadow map size.
-            this._updateShadowCamera();
-            this._updateShadowMapSize();
-
-            // Avoid shadow acne due to depth buffer precision.
-            const biasMultiplier =
-              this._shadowMapSize < 1024
-                ? 2
-                : this._shadowMapSize < 2048
-                  ? 1.25
-                  : 1;
-            this._light.shadow.bias = -this._minimumShadowBias * biasMultiplier;
-
-            // Apply update to the light position and its target.
-            // By doing this, the shadows are "following" the GDevelop camera.
-            if (!target.getRuntimeLayer) {
-              return;
-            }
-            const layer = target.getRuntimeLayer();
-            const x = layer.getCameraX();
-            const y = layer.getCameraY();
-            const z = layer.getCameraZ(layer.getInitialCamera3DFieldOfView());
-
-            const roundedX = Math.floor(x / 100) * 100;
-            const roundedY = Math.floor(y / 100) * 100;
-            const roundedZ = Math.floor(z / 100) * 100;
-            if (this._top === 'Y-') {
-              const posLightX =
-                roundedX +
-                this._distanceFromCamera *
-                  Math.cos(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              const posLightY =
-                roundedY -
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(this._elevation));
-              const posLightZ =
-                roundedZ +
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              this._light.position.set(posLightX, posLightY, posLightZ);
-              this._light.target.position.set(roundedX, roundedY, roundedZ);
-            } else {
-              const posLightX =
-                roundedX +
-                this._distanceFromCamera *
-                  Math.cos(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              const posLightY =
-                roundedY +
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              const posLightZ =
-                roundedZ +
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(this._elevation));
-
-              this._light.position.set(posLightX, posLightY, posLightZ);
-              this._light.target.position.set(roundedX, roundedY, roundedZ);
-            }
-          }
+          updatePreRender(target: gdjs.EffectsTarget): any {}
           updateDoubleParameter(parameterName: string, value: number): void {
             if (parameterName === 'intensity') {
-              this._light.intensity = value;
+              this.light.intensity = value;
             } else if (parameterName === 'elevation') {
-              this._elevation = value;
+              this.elevation = value;
+              this.updateRotation();
             } else if (parameterName === 'rotation') {
-              this._rotation = value;
-            } else if (parameterName === 'distanceFromCamera') {
-              this._distanceFromCamera = value;
-            } else if (parameterName === 'frustumSize') {
-              this._frustumSize = value;
-            } else if (parameterName === 'minimumShadowBias') {
-              this._minimumShadowBias = value;
+              this.rotation = value;
+              this.updateRotation();
             }
           }
           getDoubleParameter(parameterName: string): number {
             if (parameterName === 'intensity') {
-              return this._light.intensity;
+              return this.light.intensity;
             } else if (parameterName === 'elevation') {
-              return this._elevation;
+              return this.elevation;
             } else if (parameterName === 'rotation') {
-              return this._rotation;
-            } else if (parameterName === 'distanceFromCamera') {
-              return this._distanceFromCamera;
-            } else if (parameterName === 'frustumSize') {
-              return this._frustumSize;
-            } else if (parameterName === 'minimumShadowBias') {
-              return this._minimumShadowBias;
+              return this.rotation;
             }
             return 0;
           }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'color') {
-              this._light.color = new THREE.Color(
+              this.light.color = new THREE.Color(
                 gdjs.rgbOrHexStringToNumber(value)
               );
             }
             if (parameterName === 'top') {
-              this._top = value;
-            }
-            if (parameterName === 'shadowQuality') {
-              if (value === 'low' && this._shadowMapSize !== 512) {
-                this._shadowMapSize = 512;
-                this._shadowMapDirty = true;
-              }
-              if (value === 'medium' && this._shadowMapSize !== 1024) {
-                this._shadowMapSize = 1024;
-                this._shadowMapDirty = true;
-              }
-              if (value === 'high' && this._shadowMapSize !== 2048) {
-                this._shadowMapSize = 2048;
-                this._shadowMapDirty = true;
-              }
+              this.top = value;
+              this.updateRotation();
             }
           }
           updateColorParameter(parameterName: string, value: number): void {
             if (parameterName === 'color') {
-              this._light.color.setHex(value);
+              this.light.color.setHex(value);
             }
           }
           getColorParameter(parameterName: string): number {
             if (parameterName === 'color') {
-              return this._light.color.getHex();
+              return this.light.color.getHex();
             }
             return 0;
           }
-          updateBooleanParameter(parameterName: string, value: boolean): void {
-            if (parameterName === 'isCastingShadow') {
-              this._light.castShadow = value;
+          updateBooleanParameter(parameterName: string, value: boolean): void {}
+          updateRotation() {
+            if (this.top === 'Z+') {
+              // 0° is a light from the right of the screen.
+              this.rotationObject.rotation.z = gdjs.toRad(this.rotation);
+              this.rotationObject.rotation.y = -gdjs.toRad(this.elevation);
+            } else {
+              // 0° becomes a light from Z+.
+              this.rotationObject.rotation.y = gdjs.toRad(this.rotation - 90);
+              this.rotationObject.rotation.z = -gdjs.toRad(this.elevation);
             }
           }
           getNetworkSyncData(): DirectionalLightFilterNetworkSyncData {
             return {
-              i: this._light.intensity,
-              c: this._light.color.getHex(),
-              e: this._elevation,
-              r: this._rotation,
-              t: this._top,
+              i: this.light.intensity,
+              c: this.light.color.getHex(),
+              e: this.elevation,
+              r: this.rotation,
+              t: this.top,
             };
           }
           updateFromNetworkSyncData(syncData: any): void {
-            this._light.intensity = syncData.i;
-            this._light.color.setHex(syncData.c);
-            this._elevation = syncData.e;
-            this._rotation = syncData.r;
-            this._top = syncData.t;
+            this.light.intensity = syncData.i;
+            this.light.color.setHex(syncData.c);
+            this.elevation = syncData.e;
+            this.rotation = syncData.r;
+            this.top = syncData.t;
+            this.updateRotation();
           }
         })();
       }

Extensions/3D/HemisphereLight.ts

@@ -18,15 +18,18 @@ namespace gdjs {
           return new gdjs.PixiFiltersTools.EmptyFilter();
         }
         return new (class implements gdjs.PixiFiltersTools.Filter {
-          _top: string = 'Z+';
-          _elevation: float = 90;
-          _rotation: float = 0;
-
+          light: THREE.HemisphereLight;
+          rotationObject: THREE.Group;
           _isEnabled: boolean = false;
-          _light: THREE.HemisphereLight;
+          top: string = 'Y-';
+          elevation: float = 45;
+          rotation: float = 0;
 
           constructor() {
-            this._light = new THREE.HemisphereLight();
+            this.light = new THREE.HemisphereLight();
+            this.light.position.set(1, 0, 0);
+            this.rotationObject = new THREE.Group();
+            this.rotationObject.add(this.light);
             this.updateRotation();
           }
 
@@ -51,7 +54,7 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.add(this._light);
+            scene.add(this.rotationObject);
             this._isEnabled = true;
             return true;
           }
@@ -63,106 +66,96 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.remove(this._light);
+            scene.remove(this.rotationObject);
             this._isEnabled = false;
             return true;
           }
           updatePreRender(target: gdjs.EffectsTarget): any {}
           updateDoubleParameter(parameterName: string, value: number): void {
             if (parameterName === 'intensity') {
-              this._light.intensity = value;
+              this.light.intensity = value;
             } else if (parameterName === 'elevation') {
-              this._elevation = value;
+              this.elevation = value;
               this.updateRotation();
             } else if (parameterName === 'rotation') {
-              this._rotation = value;
+              this.rotation = value;
               this.updateRotation();
             }
           }
           getDoubleParameter(parameterName: string): number {
             if (parameterName === 'intensity') {
-              return this._light.intensity;
+              return this.light.intensity;
             } else if (parameterName === 'elevation') {
-              return this._elevation;
+              return this.elevation;
             } else if (parameterName === 'rotation') {
-              return this._rotation;
+              return this.rotation;
             }
             return 0;
           }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'skyColor') {
-              this._light.color = new THREE.Color(
+              this.light.color = new THREE.Color(
                 gdjs.rgbOrHexStringToNumber(value)
               );
             }
             if (parameterName === 'groundColor') {
-              this._light.groundColor = new THREE.Color(
+              this.light.groundColor = new THREE.Color(
                 gdjs.rgbOrHexStringToNumber(value)
               );
             }
             if (parameterName === 'top') {
-              this._top = value;
+              this.top = value;
               this.updateRotation();
             }
           }
           updateColorParameter(parameterName: string, value: number): void {
             if (parameterName === 'skyColor') {
-              this._light.color.setHex(value);
+              this.light.color.setHex(value);
             }
             if (parameterName === 'groundColor') {
-              this._light.groundColor.setHex(value);
+              this.light.groundColor.setHex(value);
             }
           }
           getColorParameter(parameterName: string): number {
             if (parameterName === 'skyColor') {
-              return this._light.color.getHex();
+              return this.light.color.getHex();
             }
             if (parameterName === 'groundColor') {
-              return this._light.groundColor.getHex();
+              return this.light.groundColor.getHex();
             }
             return 0;
           }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
           updateRotation() {
-            if (this._top === 'Y-') {
-              // `rotation` at 0° becomes a light from Z+.
-              this._light.position.set(
-                Math.cos(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation)),
-                -Math.sin(gdjs.toRad(this._elevation)),
-                Math.sin(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation))
-              );
+            if (this.top === 'Z+') {
+              // 0° is a light from the right of the screen.
+              this.rotationObject.rotation.z = gdjs.toRad(this.rotation);
+              this.rotationObject.rotation.y = -gdjs.toRad(this.elevation);
             } else {
-              // `rotation` at 0° is a light from the right of the screen.
-              this._light.position.set(
-                Math.cos(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation)),
-                Math.sin(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation)),
-                Math.sin(gdjs.toRad(this._elevation))
-              );
+              // 0° becomes a light from Z+.
+              this.rotationObject.rotation.y = gdjs.toRad(this.rotation - 90);
+              this.rotationObject.rotation.z = -gdjs.toRad(this.elevation);
             }
           }
           getNetworkSyncData(): HemisphereLightFilterNetworkSyncData {
             return {
-              i: this._light.intensity,
-              sc: this._light.color.getHex(),
-              gc: this._light.groundColor.getHex(),
-              e: this._elevation,
-              r: this._rotation,
-              t: this._top,
+              i: this.light.intensity,
+              sc: this.light.color.getHex(),
+              gc: this.light.groundColor.getHex(),
+              e: this.elevation,
+              r: this.rotation,
+              t: this.top,
             };
           }
           updateFromNetworkSyncData(
             syncData: HemisphereLightFilterNetworkSyncData
           ): void {
-            this._light.intensity = syncData.i;
-            this._light.color.setHex(syncData.sc);
-            this._light.groundColor.setHex(syncData.gc);
-            this._elevation = syncData.e;
-            this._rotation = syncData.r;
-            this._top = syncData.t;
+            this.light.intensity = syncData.i;
+            this.light.color.setHex(syncData.sc);
+            this.light.groundColor.setHex(syncData.gc);
+            this.elevation = syncData.e;
+            this.rotation = syncData.r;
+            this.top = syncData.t;
             this.updateRotation();
           }
         })();

Extensions/3D/JsExtension.js

@@ -21,9 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'Scene3D',
         _('3D'),
-        _(
-          'Support for 3D in GDevelop: this provides 3D objects and the common features for all 3D objects.'
-        ),
+        _('Support for 3D in GDevelop.'),
         'Florian Rival',
         'MIT'
       )
@@ -38,9 +36,7 @@ module.exports = {
           'Base3DBehavior',
           _('3D capability'),
           'Object3D',
-          _(
-            '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).'
-          ),
+          _('Move the object in 3D space.'),
           '',
           'res/conditions/3d_box.svg',
           'Base3DBehavior',
@@ -162,12 +158,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationX')
         .setGetter('getRotationX');
 
@@ -183,12 +174,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationY')
         .setGetter('getRotationY');
 
@@ -206,7 +192,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundX');
 
@@ -224,7 +210,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundY');
 
@@ -242,7 +228,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundZ');
     }
@@ -252,7 +238,7 @@ module.exports = {
         .addObject(
           'Model3DObject',
           _('3D Model'),
-          _('An animated 3D model, useful for most elements of a 3D game.'),
+          _('An animated 3D model.'),
           'JsPlatform/Extensions/3d_model.svg',
           new gd.Model3DObjectConfiguration()
         )
@@ -604,12 +590,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setHidden()
         .setFunctionName('setRotationX')
         .setGetter('getRotationX');
@@ -626,12 +607,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setHidden()
         .setFunctionName('setRotationY')
         .setGetter('getRotationY');
@@ -650,7 +626,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setHidden()
         .setFunctionName('turnAroundX');
@@ -669,7 +645,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setHidden()
         .setFunctionName('turnAroundY');
@@ -688,7 +664,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setHidden()
         .setFunctionName('turnAroundZ');
@@ -879,9 +855,7 @@ module.exports = {
         propertyName === 'rightFaceResourceRepeat' ||
         propertyName === 'topFaceResourceRepeat' ||
         propertyName === 'bottomFaceResourceRepeat' ||
-        propertyName === 'enableTextureTransparency' ||
-        propertyName === 'isCastingShadow' ||
-        propertyName === 'isReceivingShadow'
+        propertyName === 'enableTextureTransparency'
       ) {
         objectContent[propertyName] = newValue === '1';
         return true;
@@ -909,8 +883,8 @@ module.exports = {
         .getOrCreate('facesOrientation')
         .setValue(objectContent.facesOrientation || 'Y')
         .setType('choice')
-        .addChoice('Y', 'Y')
-        .addChoice('Z', 'Z')
+        .addExtraInfo('Y')
+        .addExtraInfo('Z')
         .setLabel(_('Faces orientation'))
         .setDescription(
           _(
@@ -970,8 +944,8 @@ module.exports = {
         .getOrCreate('backFaceUpThroughWhichAxisRotation')
         .setValue(objectContent.backFaceUpThroughWhichAxisRotation || 'X')
         .setType('choice')
-        .addChoice('X', 'X')
-        .addChoice('Y', 'Y')
+        .addExtraInfo('X')
+        .addExtraInfo('Y')
         .setLabel(_('Back face orientation'))
         .setDescription(
           _(
@@ -1105,29 +1079,11 @@ module.exports = {
 
       objectProperties
         .getOrCreate('materialType')
-        .setValue(objectContent.materialType || 'StandardWithoutMetalness')
+        .setValue(objectContent.materialType || 'Basic')
         .setType('choice')
-        .addChoice('Basic', _('Basic (no lighting, no shadows)'))
-        .addChoice(
-          'StandardWithoutMetalness',
-          _('Standard (without metalness)')
-        )
-        .setLabel(_('Material type'))
-        .setGroup(_('Lighting'));
-
-      objectProperties
-        .getOrCreate('isCastingShadow')
-        .setValue(objectContent.isCastingShadow ? 'true' : 'false')
-        .setType('boolean')
-        .setLabel(_('Shadow casting'))
-        .setGroup(_('Lighting'));
-
-      objectProperties
-        .getOrCreate('isReceivingShadow')
-        .setValue(objectContent.isReceivingShadow ? 'true' : 'false')
-        .setType('boolean')
-        .setLabel(_('Shadow receiving'))
-        .setGroup(_('Lighting'));
+        .addExtraInfo('Basic')
+        .addExtraInfo('StandardWithoutMetalness')
+        .setLabel(_('Material type'));
 
       return objectProperties;
     };
@@ -1145,7 +1101,7 @@ module.exports = {
       topFaceResourceName: '',
       bottomFaceResourceName: '',
       frontFaceVisible: true,
-      backFaceVisible: true,
+      backFaceVisible: false,
       leftFaceVisible: true,
       rightFaceVisible: true,
       topFaceVisible: true,
@@ -1156,10 +1112,8 @@ module.exports = {
       rightFaceResourceRepeat: false,
       topFaceResourceRepeat: false,
       bottomFaceResourceRepeat: false,
-      materialType: 'StandardWithoutMetalness',
+      materialType: 'Basic',
       tint: '255;255;255',
-      isCastingShadow: true,
-      isReceivingShadow: true,
     };
 
     Cube3DObject.updateInitialInstanceProperty = function (
@@ -1513,12 +1467,7 @@ module.exports = {
         'res/conditions/3d_box.svg'
       )
       .addParameter('object', _('3D cube'), 'Cube3DObject', false)
-      .useStandardParameters(
-        'number',
-        gd.ParameterOptions.makeNewOptions().setDescription(
-          _('Angle (in degrees)')
-        )
-      )
+      .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setRotationX')
       .setHidden()
       .setGetter('getRotationX');
@@ -1535,12 +1484,7 @@ module.exports = {
         'res/conditions/3d_box.svg'
       )
       .addParameter('object', _('3D cube'), 'Cube3DObject', false)
-      .useStandardParameters(
-        'number',
-        gd.ParameterOptions.makeNewOptions().setDescription(
-          _('Angle (in degrees)')
-        )
-      )
+      .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setRotationY')
       .setHidden()
       .setGetter('getRotationY');
@@ -1908,9 +1852,7 @@ module.exports = {
         .addEffect('AmbientLight')
         .setFullName(_('Ambient light'))
         .setDescription(
-          _(
-            'A light that illuminates all objects from every direction. Often used along with a Directional light (though a Hemisphere light can be used instead of an Ambient light).'
-          )
+          _('A light that illuminates all objects from every direction.')
         )
         .markAsNotWorkingForObjects()
         .markAsOnlyWorkingFor3D()
@@ -1931,11 +1873,7 @@ module.exports = {
       const effect = extension
         .addEffect('DirectionalLight')
         .setFullName(_('Directional light'))
-        .setDescription(
-          _(
-            "A very far light source like the sun. This is the light to use for casting shadows for 3D objects (other lights won't emit shadows). Often used along with a Hemisphere light."
-          )
-        )
+        .setDescription(_('A very far light source like the sun.'))
         .markAsNotWorkingForObjects()
         .markAsOnlyWorkingFor3D()
         .addIncludeFile('Extensions/3D/DirectionalLight.js');
@@ -1952,11 +1890,11 @@ module.exports = {
         .setType('number');
       properties
         .getOrCreate('top')
-        .setValue('Z+')
+        .setValue('Y-')
         .setLabel(_('3D world top'))
         .setType('choice')
-        .addExtraInfo('Z+')
         .addExtraInfo('Y-')
+        .addExtraInfo('Z+')
         .setGroup(_('Orientation'));
       properties
         .getOrCreate('elevation')
@@ -1971,47 +1909,6 @@ module.exports = {
         .setLabel(_('Rotation (in degrees)'))
         .setType('number')
         .setGroup(_('Orientation'));
-      properties
-        .getOrCreate('isCastingShadow')
-        .setValue('false')
-        .setLabel(_('Shadow casting'))
-        .setType('boolean')
-        .setGroup(_('Shadows'));
-      properties
-        .getOrCreate('shadowQuality')
-        .setValue('medium')
-        .addChoice('low', _('Low quality'))
-        .addChoice('medium', _('Medium quality'))
-        .addChoice('high', _('High quality'))
-        .setLabel(_('Shadow quality'))
-        .setType('choice')
-        .setGroup(_('Shadows'));
-      properties
-        .getOrCreate('minimumShadowBias')
-        .setValue('0')
-        .setLabel(_('Shadow bias'))
-        .setDescription(
-          _(
-            'Use this to avoid "shadow acne" due to depth buffer precision. Choose a value small enough like 0.001 to avoid creating distance between shadows and objects but not too small to avoid shadow glitches on low/medium quality. This value is used for high quality, and multiplied by 1.25 for medium quality and 2 for low quality.'
-          )
-        )
-        .setType('number')
-        .setGroup(_('Shadows'))
-        .setAdvanced(true);
-      properties
-        .getOrCreate('frustumSize')
-        .setValue('4000')
-        .setLabel(_('Shadow frustum size'))
-        .setType('number')
-        .setGroup(_('Shadows'))
-        .setAdvanced(true);
-      properties
-        .getOrCreate('distanceFromCamera')
-        .setValue('1500')
-        .setLabel(_("Distance from layer's camera"))
-        .setType('number')
-        .setGroup(_('Shadows'))
-        .setAdvanced(true);
     }
     {
       const effect = extension
@@ -2019,7 +1916,7 @@ module.exports = {
         .setFullName(_('Hemisphere light'))
         .setDescription(
           _(
-            'A light that illuminates objects from every direction with a gradient. Often used along with a Directional light.'
+            'A light that illuminates objects from every direction with a gradient.'
           )
         )
         .markAsNotWorkingForObjects()
@@ -2043,11 +1940,11 @@ module.exports = {
         .setType('number');
       properties
         .getOrCreate('top')
-        .setValue('Z+')
+        .setValue('Y-')
         .setLabel(_('3D world top'))
         .setType('choice')
-        .addExtraInfo('Z+')
         .addExtraInfo('Y-')
+        .addExtraInfo('Z+')
         .setGroup(_('Orientation'));
       properties
         .getOrCreate('elevation')
@@ -3309,8 +3206,6 @@ module.exports = {
 
         this._threeObject = new THREE.Group();
         this._threeObject.rotation.order = 'ZYX';
-        this._threeObject.castShadow = true;
-        this._threeObject.receiveShadow = true;
         this._threeGroup.add(this._threeObject);
       }
 

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), crossfadeDuration(0.1f), isCastingShadow(true), isReceivingShadow(true) {}
+      keepAspectRatio(true), crossfadeDuration(0.1f) {}
 
 bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
                                                 const gd::String &newValue) {
@@ -75,16 +75,6 @@ bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
     crossfadeDuration = newValue.To<double>();
     return true;
   }
-  if(propertyName == "isCastingShadow")
-  {
-    isCastingShadow = newValue == "1";
-    return true;
-  }
-  if(propertyName == "isReceivingShadow")
-  {
-    isReceivingShadow = newValue == "1";
-    return true;
-  }
 
   return false;
 }
@@ -153,20 +143,19 @@ Model3DObjectConfiguration::GetProperties() const {
   objectProperties["materialType"]
       .SetValue(materialType.empty() ? "Basic" : materialType)
       .SetType("choice")
-      .AddChoice("Basic", _("Basic (no lighting, no shadows)"))
-      .AddChoice("StandardWithoutMetalness", _("Standard (without metalness)"))
-      .AddChoice("KeepOriginal", _("Keep original"))
-      .SetLabel(_("Material"))
-      .SetGroup(_("Lighting"));
+      .AddExtraInfo("Basic")
+      .AddExtraInfo("StandardWithoutMetalness")
+      .AddExtraInfo("KeepOriginal")
+      .SetLabel(_("Material"));
 
   objectProperties["originLocation"]
       .SetValue(originLocation.empty() ? "TopLeft" : originLocation)
       .SetType("choice")
-      .AddChoice("ModelOrigin", _("Model origin"))
-      .AddChoice("TopLeft", _("Top left"))
-      .AddChoice("ObjectCenter", _("Object center"))
-      .AddChoice("BottomCenterZ", _("Bottom center (Z)"))
-      .AddChoice("BottomCenterY", _("Bottom center (Y)"))
+      .AddExtraInfo("ModelOrigin")
+      .AddExtraInfo("TopLeft")
+      .AddExtraInfo("ObjectCenter")
+      .AddExtraInfo("BottomCenterZ")
+      .AddExtraInfo("BottomCenterY")
       .SetLabel(_("Origin point"))
       .SetGroup(_("Points"))
       .SetAdvanced(true);
@@ -174,10 +163,10 @@ Model3DObjectConfiguration::GetProperties() const {
   objectProperties["centerLocation"]
       .SetValue(centerLocation.empty() ? "ObjectCenter" : centerLocation)
       .SetType("choice")
-      .AddChoice("ModelOrigin", _("Model origin"))
-      .AddChoice("ObjectCenter", _("Object center"))
-      .AddChoice("BottomCenterZ", _("Bottom center (Z)"))
-      .AddChoice("BottomCenterY", _("Bottom center (Y)"))
+      .AddExtraInfo("ModelOrigin")
+      .AddExtraInfo("ObjectCenter")
+      .AddExtraInfo("BottomCenterZ")
+      .AddExtraInfo("BottomCenterY")
       .SetLabel(_("Center point"))
       .SetGroup(_("Points"))
       .SetAdvanced(true);
@@ -189,20 +178,6 @@ Model3DObjectConfiguration::GetProperties() const {
       .SetGroup(_("Animations"))
       .SetMeasurementUnit(gd::MeasurementUnit::GetSecond());
 
-  objectProperties["isCastingShadow"]
-      .SetValue(isCastingShadow ? "true" : "false")
-      .SetType("boolean")
-      .SetLabel(_("Shadow casting"))
-      .SetGroup(_("Lighting"));
-
-  objectProperties["isReceivingShadow"]
-      .SetValue(isReceivingShadow ? "true" : "false")
-      .SetType("boolean")
-      .SetLabel(_("Shadow receiving"))
-      .SetGroup(_("Lighting"));
-
-
-
   return objectProperties;
 }
 
@@ -235,8 +210,6 @@ void Model3DObjectConfiguration::DoUnserializeFrom(
   centerLocation = content.GetStringAttribute("centerLocation");
   keepAspectRatio = content.GetBoolAttribute("keepAspectRatio");
   crossfadeDuration = content.GetDoubleAttribute("crossfadeDuration");
-  isCastingShadow = content.GetBoolAttribute("isCastingShadow");
-  isReceivingShadow = content.GetBoolAttribute("isReceivingShadow");
 
   RemoveAllAnimations();
   auto &animationsElement = content.GetChild("animations");
@@ -266,8 +239,6 @@ void Model3DObjectConfiguration::DoSerializeTo(
   content.SetAttribute("centerLocation", centerLocation);
   content.SetAttribute("keepAspectRatio", keepAspectRatio);
   content.SetAttribute("crossfadeDuration", crossfadeDuration);
-  content.SetAttribute("isCastingShadow", isCastingShadow);
-  content.SetAttribute("isReceivingShadow", isReceivingShadow);
 
   auto &animationsElement = content.AddChild("animations");
   animationsElement.ConsiderAsArrayOf("animation");

Extensions/3D/Model3DObjectConfiguration.h

@@ -160,8 +160,6 @@ public:
   const gd::String& GetCenterLocation() const { return centerLocation; };
 
   bool shouldKeepAspectRatio() const { return keepAspectRatio; };
-  bool shouldCastShadow() const { return isCastingShadow; };
-  bool shouldReceiveShadow() const { return isReceivingShadow; };
   ///@}
 
 protected:
@@ -184,8 +182,6 @@ private:
   gd::String centerLocation;
 
   bool keepAspectRatio;
-  bool isCastingShadow;
-  bool isReceivingShadow;
 
   std::vector<Model3DAnimation> animations;
   static Model3DAnimation badAnimation; //< Bad animation when an out of bound

Extensions/3D/Model3DRuntimeObject.ts

@@ -38,8 +38,6 @@ namespace gdjs {
         | 'BottomCenterY';
       animations: Model3DAnimation[];
       crossfadeDuration: float;
-      isCastingShadow: boolean;
-      isReceivingShadow: boolean;
     };
   }
 
@@ -103,8 +101,6 @@ namespace gdjs {
     _animationSpeedScale: float = 1;
     _animationPaused: boolean = false;
     _crossfadeDuration: float = 0;
-    _isCastingShadow: boolean = true;
-    _isReceivingShadow: boolean = true;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -127,8 +123,6 @@ namespace gdjs {
         objectData.content.materialType
       );
 
-      this.setIsCastingShadow(objectData.content.isCastingShadow);
-      this.setIsReceivingShadow(objectData.content.isReceivingShadow);
       this.onModelChanged(objectData);
 
       this._crossfadeDuration = objectData.content.crossfadeDuration || 0;
@@ -201,18 +195,6 @@ namespace gdjs {
           newObjectData.content.centerLocation
         );
       }
-      if (
-        oldObjectData.content.isCastingShadow !==
-        newObjectData.content.isCastingShadow
-      ) {
-        this.setIsCastingShadow(newObjectData.content.isCastingShadow);
-      }
-      if (
-        oldObjectData.content.isReceivingShadow !==
-        newObjectData.content.isReceivingShadow
-      ) {
-        this.setIsReceivingShadow(newObjectData.content.isReceivingShadow);
-      }
       return true;
     }
 
@@ -303,7 +285,7 @@ namespace gdjs {
 
     update(instanceContainer: gdjs.RuntimeInstanceContainer): void {
       const elapsedTime = this.getElapsedTime() / 1000;
-      this._renderer.updateAnimation(elapsedTime);
+      this._renderer.updateAnimation(elapsedTime * this._animationSpeedScale);
     }
 
     /**
@@ -376,16 +358,6 @@ namespace gdjs {
       return this._renderer.hasAnimationEnded();
     }
 
-    setIsCastingShadow(value: boolean): void {
-      this._isCastingShadow = value;
-      this._renderer._updateShadow();
-    }
-
-    setIsReceivingShadow(value: boolean): void {
-      this._isReceivingShadow = value;
-      this._renderer._updateShadow();
-    }
-
     setCrossfadeDuration(duration: number): void {
       if (this._crossfadeDuration === duration) return;
       this._crossfadeDuration = duration;
@@ -411,7 +383,6 @@ namespace gdjs {
 
     setAnimationSpeedScale(ratio: float): void {
       this._animationSpeedScale = ratio;
-      this._renderer.setAnimationTimeScale(ratio);
     }
 
     getAnimationElapsedTime(): float {

Extensions/3D/Model3DRuntimeObject3DRenderer.ts

@@ -286,7 +286,6 @@ namespace gdjs {
       this.get3DRendererObject().remove(this._threeObject);
       this.get3DRendererObject().add(threeObject);
       this._threeObject = threeObject;
-      this._updateShadow();
 
       // Start the current animation on the new 3D object.
       this._animationMixer = new THREE.AnimationMixer(root);
@@ -324,13 +323,6 @@ namespace gdjs {
       return this._originalModel.animations[animationIndex].name;
     }
 
-    _updateShadow() {
-      this._threeObject.traverse((child) => {
-        child.castShadow = this._model3DRuntimeObject._isCastingShadow;
-        child.receiveShadow = this._model3DRuntimeObject._isReceivingShadow;
-      });
-    }
-
     /**
      * Return true if animation has ended.
      * The animation had ended if:
@@ -379,19 +371,14 @@ namespace gdjs {
       }
       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.enabled = true;
         this._action.crossFadeFrom(
           previousAction,
           this._model3DRuntimeObject._crossfadeDuration,
@@ -413,12 +400,6 @@ 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.9')
+      .setVersion('3.0.0-alpha.8')
       .onlyIfOtherDependencyIsExported('AdMob Cordova plugin');
 
     extension
@@ -93,68 +93,6 @@ 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,7 +1,6 @@
 namespace gdjs {
   declare var admob: any;
   declare var cordova: any;
-  declare var consent: any;
 
   export namespace adMob {
     const logger = new gdjs.Logger('AdMob');
@@ -109,119 +108,26 @@ 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'; // 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;
-      }
-    };
+    let npaValue = '0'; // TODO: expose an API to change this and also an automatic way using the consent SDK.
 
     // Admob initialization listener
     document.addEventListener(
       'deviceready',
       async () => {
+        // Obtain user consent ?
+
+        logger.info('Starting AdMob.');
         isStarting = 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);
+
+        await admob.start();
+
+        logger.info('AdMob successfully started.');
+        isStarting = false;
+        admobStarted = true;
       },
       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.
      */
@@ -428,7 +334,6 @@ namespace gdjs {
         position: atTop ? 'top' : 'bottom',
         size: bannerRequestedAdSizeType,
         offset: 0,
-        npa: npaValue,
       });
 
       banner.on('load', () => {

Extensions/AnchorBehavior/anchorruntimebehavior.ts

@@ -20,33 +20,18 @@ namespace gdjs {
   }
 
   export class AnchorRuntimeBehavior extends gdjs.RuntimeBehavior {
-    // Configuration
-
-    _relativeToOriginalWindowSize: boolean;
+    _relativeToOriginalWindowSize: any;
     _leftEdgeAnchor: HorizontalAnchor;
     _rightEdgeAnchor: HorizontalAnchor;
-    _topEdgeAnchor: VerticalAnchor;
-    _bottomEdgeAnchor: VerticalAnchor;
+    _topEdgeAnchor: any;
+    _bottomEdgeAnchor: any;
+    _invalidDistances: boolean = true;
+    _leftEdgeDistance: number = 0;
+    _rightEdgeDistance: number = 0;
+    _topEdgeDistance: number = 0;
+    _bottomEdgeDistance: number = 0;
     _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,
@@ -65,7 +50,7 @@ namespace gdjs {
           : behaviorData.useLegacyBottomAndRightAnchors;
     }
 
-    override updateFromBehaviorData(oldBehaviorData, newBehaviorData): boolean {
+    updateFromBehaviorData(oldBehaviorData, newBehaviorData): boolean {
       if (oldBehaviorData.leftEdgeAnchor !== newBehaviorData.leftEdgeAnchor) {
         this._leftEdgeAnchor = newBehaviorData.leftEdgeAnchor;
       }
@@ -96,381 +81,266 @@ namespace gdjs {
       return 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;
+    onActivate() {
+      this._invalidDistances = true;
     }
 
-    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
-    ) {
+    doStepPreEvents(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();
-
-      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;
+      let parentCenterX = (parentMaxX + parentMinX) / 2;
+      let parentCenterY = (parentMaxY + parentMinY) / 2;
+      let parentWidth = parentMaxX - parentMinX;
+      let parentHeight = parentMaxY - parentMinY;
       const layer = instanceContainer.getLayer(this.owner.getLayer());
-
-      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);
+      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;
         }
-        if (this._bottomEdgeAnchor !== VerticalAnchor.None) {
-          this.owner.setHeight(bottom - top);
+
+        //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._leftEdgeAnchor !== HorizontalAnchor.None) {
-          this.owner.setX(left + this.owner.getX() - this.owner.getDrawableX());
+
+        // 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._topEdgeAnchor !== VerticalAnchor.None) {
-          this.owner.setY(top + this.owner.getY() - this.owner.getDrawableY());
+
+        // 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;
         }
-      }
-      // 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 {
+
+        // 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);
+          }
           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()
             );
           }
-          if (this._bottomEdgeAnchor !== VerticalAnchor.None) {
-            this.owner.setY(
-              bottom +
-                this.owner.getY() -
-                this.owner.getDrawableY() -
-                this.owner.getHeight()
+        }
+        // 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()
+              );
+            }
+            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

@@ -1,47 +0,0 @@
-// @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: {},
-      isInnerAreaFollowingParentSize: false,
-    });
-    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,49 +1,39 @@
 // @ts-check
-describe('gdjs.AnchorRuntimeBehavior', () => {
+describe('gdjs.AnchorRuntimeBehavior', function () {
+  const runtimeGame = gdjs.getPixiRuntimeGame({
+    propertiesOverrides: { windowHeight: 1000, windowWidth: 1000 },
+  });
   const anchorBehaviorName = 'Anchor';
-
-  /** @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 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: [],
   });
 
   const setGameResolutionSizeAndStep = (width, height) => {
@@ -53,11 +43,6 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
     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',
@@ -129,50 +114,10 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
     return object;
   };
 
-  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 });
+  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 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -180,11 +125,25 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
 
         expect(object.getX()).to.equal(500);
         expect(object.getY()).to.equal(500);
-        expect(object.getWidth()).to.equal(1010);
+        expect(object.getWidth()).to.equal(10);
       });
+    });
+    ['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);
 
-      it('anchors the left edge of an object (proportional)', () => {
-        const object = createObject({ leftEdgeAnchor: 3 });
+        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 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -195,267 +154,36 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
         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);
 
-          object.setPosition(600, 700);
-          setGameResolutionSizeAndStep(2000, 2000);
+    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);
 
-          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);
+      setGameResolutionSizeAndStep(2000, 2000);
 
-          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);
-      });
+      expect(object.getX()).to.equal(500);
+      expect(object.getY()).to.equal(500);
+      expect(object.getWidth()).to.equal(1010);
     });
-    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);
 
-          setCamera(1300, 1400);
-          setGameResolutionSizeAndStep(2000, 2000);
+    it('anchors the left edge of object (proportional)', function () {
+      const object = createObject({ leftEdgeAnchor: 3 });
+      object.setPosition(500, 500);
+      runtimeScene.renderAndStep(1000 / 60);
 
-          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);
+      setGameResolutionSizeAndStep(2000, 2000);
 
-          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);
-      });
+      expect(object.getX()).to.equal(1000);
+      expect(object.getY()).to.equal(500);
+      expect(object.getWidth()).to.equal(10);
     });
   });
 
-  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 });
+  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 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -463,11 +191,25 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
 
         expect(object.getX()).to.equal(500);
         expect(object.getY()).to.equal(500);
-        expect(object.getHeight()).to.equal(1010);
+        expect(object.getWidth()).to.equal(10);
       });
+    });
+    ['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);
 
-      it('anchors the top edge of object (proportional)', () => {
-        const object = createObject({ topEdgeAnchor: 3 });
+        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 });
         object.setPosition(500, 500);
         runtimeScene.renderAndStep(1000 / 60);
 
@@ -478,262 +220,71 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
         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);
 
-          object.setPosition(600, 700);
-          setGameResolutionSizeAndStep(2000, 2000);
+    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);
 
-          expect(object.getX()).to.equal(600);
-          expect(object.getY()).to.equal(700);
-          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);
 
-          object.setPosition(600, 700);
-          setGameResolutionSizeAndStep(2000, 2000);
-
-          expect(object.getX()).to.equal(600);
-          expect(object.getY()).to.equal(1700);
-          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);
-          setGameResolutionSizeAndStep(2000, 2000);
-
-          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);
-      });
+      expect(object.getX()).to.equal(500);
+      expect(object.getY()).to.equal(500);
+      expect(object.getHeight()).to.equal(1010);
     });
-    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);
+    it('anchors the top edge of object (proportional)', function () {
+      const object = createObject({ topEdgeAnchor: 3 });
+      object.setPosition(500, 500);
+      runtimeScene.renderAndStep(1000 / 60);
 
-          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);
+      setGameResolutionSizeAndStep(2000, 2000);
 
-          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);
-      });
+      expect(object.getX()).to.equal(500);
+      expect(object.getY()).to.equal(1000);
+      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);
+    it('can fill the screen with an object (with custom origin)', function () {
+      setGameResolutionSizeAndStep(1000, 500);
 
-          expect(object.getX()).to.equal(600);
-          expect(object.getY()).to.equal(1100);
-          expect(object.getWidth()).to.equal(10);
-        });
+      const object = createSpriteWithOriginAtCenter({
+        leftEdgeAnchor: 1,
+        topEdgeAnchor: 1,
+        rightEdgeAnchor: 2,
+        bottomEdgeAnchor: 2,
       });
-      ['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.setCustomWidthAndHeight(1000, 500);
+      object.setPosition(500, 250);
+      runtimeScene.renderAndStep(1000 / 60);
 
-          object.setPosition(600, 700);
-          setCamera(1300, 1400);
-          setGameResolutionSizeAndStep(2000, 2000);
+      setGameResolutionSizeAndStep(2000, 3000);
 
-          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);
-      });
+      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 (with custom origin)', () => {
-    setGameResolutionSizeAndStep(1000, 500);
+    it('can fill the screen with an object using proportional anchors (with custom origin)', () => {
+      setGameResolutionSizeAndStep(1000, 500);
 
-    const object = createSpriteWithOriginAtCenter({
-      leftEdgeAnchor: 1,
-      topEdgeAnchor: 1,
-      rightEdgeAnchor: 2,
-      bottomEdgeAnchor: 2,
+      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);
     });
-    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('multilinestring')
+        .setType('textarea')
         .setLabel(_('BBCode text'));
 
       objectProperties
@@ -75,25 +75,12 @@ module.exports = {
         .getOrCreate('align')
         .setValue(objectContent.align)
         .setType('choice')
-        .addChoice('left', _('Left'))
-        .addChoice('center', _('Center'))
-        .addChoice('right', _('Right'))
+        .addExtraInfo('left')
+        .addExtraInfo('center')
+        .addExtraInfo('right')
         .setLabel(_('Base alignment'))
         .setGroup(_('Appearance'));
 
-      if (!objectContent.verticalTextAlignment) {
-        objectContent.verticalTextAlignment = 'top';
-      }
-      objectProperties
-        .getOrCreate('verticalTextAlignment')
-        .setValue(objectContent.verticalTextAlignment)
-        .setType('choice')
-        .addChoice('top', _('Top'))
-        .addChoice('center', _('Center'))
-        .addChoice('bottom', _('Bottom'))
-        .setLabel(_('Vertical alignment'))
-        .setGroup(_('Appearance'));
-
       objectProperties
         .getOrCreate('fontFamily')
         .setValue(objectContent.fontFamily)
@@ -102,6 +89,13 @@ 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')
@@ -119,7 +113,7 @@ module.exports = {
       color: '0;0;0',
       fontFamily: 'Arial',
       align: 'left',
-      verticalTextAlignment: 'top',
+      wordWrap: true,
     };
 
     objectBBText.updateInitialInstanceProperty = function (
@@ -377,6 +371,19 @@ 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',
@@ -398,35 +405,6 @@ 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`,
@@ -507,16 +485,14 @@ module.exports = {
         instance,
         associatedObjectConfiguration,
         pixiContainer,
-        pixiResourcesLoader,
-        getPropertyOverridings
+        pixiResourcesLoader
       ) {
         super(
           project,
           instance,
           associatedObjectConfiguration,
           pixiContainer,
-          pixiResourcesLoader,
-          getPropertyOverridings
+          pixiResourcesLoader
         );
 
         const bbTextStyles = {
@@ -526,6 +502,7 @@ 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',
           },
@@ -555,11 +532,7 @@ module.exports = {
           gd.ObjectJsImplementation
         );
 
-        const propertyOverridings = this.getPropertyOverridings();
-        const rawText =
-          propertyOverridings && propertyOverridings.has('Text')
-            ? propertyOverridings.get('Text')
-            : object.content.text;
+        const rawText = object.content.text;
         if (rawText !== this._pixiObject.text) {
           this._pixiObject.text = rawText;
         }
@@ -601,18 +574,11 @@ module.exports = {
             });
         }
 
-        const wordWrap = this._instance.hasCustomSize();
+        const wordWrap = object.content.wordWrap;
         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) {
@@ -620,42 +586,25 @@ module.exports = {
           this._pixiObject.dirty = true;
         }
 
-        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.x =
+          this._instance.getX() + this._pixiObject.width / 2;
         this._pixiObject.position.y =
-          this._instance.getY() + this._pixiObject.height * (0.5 - alignmentY);
-        this._pixiObject.anchor.y = 0.5;
-
+          this._instance.getY() + this._pixiObject.height / 2;
         this._pixiObject.rotation = RenderedInstance.toRad(
           this._instance.getAngle()
         );
 
+        if (this._instance.hasCustomSize() && this._pixiObject) {
+          const customWidth = this.getCustomWidth();
+          if (
+            this._pixiObject &&
+            this._pixiObject._style.wordWrapWidth !== customWidth
+          ) {
+            this._pixiObject._style.wordWrapWidth = customWidth;
+            this._pixiObject.dirty = true;
+          }
+        }
+
         // Do not hide completely an object so it can still be manipulated
         const alphaForDisplay = Math.max(
           this._instance.getOpacity() / 255,
@@ -677,19 +626,6 @@ 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._wrapping,
+          wordWrap: runtimeObject._wordWrap,
           wordWrapWidth: runtimeObject._wrappingWidth,
-          align: runtimeObject._textAlign as PIXI.TextStyleAlign | undefined,
+          align: runtimeObject._align as PIXI.TextStyleAlign | undefined,
         },
       });
       instanceContainer
@@ -39,7 +39,10 @@ namespace gdjs {
         .getRenderer()
         .addRendererObject(this._pixiObject, runtimeObject.getZOrder());
 
-      this.updateAlignment();
+      // 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.updateText();
       this.updatePosition();
       this.updateAngle();
@@ -52,7 +55,7 @@ namespace gdjs {
 
     updateWordWrap(): void {
       //@ts-ignore Private member usage.
-      this._pixiObject._style.wordWrap = this._object._wrapping;
+      this._pixiObject._style.wordWrap = this._object._wordWrap;
       this._pixiObject.dirty = true;
       this.updatePosition();
     }
@@ -81,7 +84,7 @@ namespace gdjs {
 
     updateAlignment(): void {
       //@ts-ignore Private member usage.
-      this._pixiObject._style.align = this._object._textAlign;
+      this._pixiObject._style.align = this._object._align;
       this._pixiObject.dirty = true;
     }
 
@@ -103,38 +106,9 @@ namespace gdjs {
     }
 
     updatePosition(): void {
-      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.x = this._object.x + this._pixiObject.width / 2;
       this._pixiObject.position.y =
-        this._object.y + this._pixiObject.height * (0.5 - alignmentY);
-      this._pixiObject.anchor.y = 0.5;
+        this._object.y + this._pixiObject.height / 2;
     }
 
     updateAngle(): void {