Merge remote-tracking branch 'official/master' into experimental-build/code-generation-let

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
   # Build the **entire** app for macOS.
   build-macos:
     macos:
-      xcode: 14.2.0
+      xcode: 12.5.1
     steps:
       - checkout
 
@@ -64,11 +64,11 @@ jobs:
       # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac-universal/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app" && rm -rf "newIDE/electron-app/dist/mac-arm64/GDevelop 5.app"
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -101,8 +101,8 @@ jobs:
           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
+         name: Install Python3 dependencies for Emscripten
+         command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)
@@ -178,8 +178,8 @@ jobs:
           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
+         name: Install Python3 dependencies for Emscripten
+         command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -0,0 +1,28 @@
+---
+name: "\U0001F41BBug report"
+about: Create a bug report about GDevelop or the game engine
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Describe the bug
+A clear and concise description of what the bug is.
+
+Please double check that the bug is not already reported in the issues list.
+
+## To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+* Please include a link to a game if possible!
+* If applicable, add screenshots to help explain your problem.
+
+## Other details
+* Include any OS/browser version/smartphone that you're using
+* Which version of GDevelop are you using? The desktop app or the web-app?
+* Add any other context about the problem here.

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

@@ -1,71 +0,0 @@
-name: 🐛Bug report
-description: Create a bug report about GDevelop or the game engine
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      options:
-      - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
-        required: true
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: |
-        * Please include a link to a game if possible!
-        * If applicable, add screenshots to help explain your problem.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: GDevelop platform
-      description: Which platform of GDevelop are you using?
-      multiple: true
-      options:
-        - Desktop
-        - Web
-        - Mobile
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: GDevelop version
-      description: |
-        Which version of GDevelop are you using?
-        Take a look here: [Editor Home - About GDevelop - "This version of GDevelop is: ~~~"]
-      placeholder: 5.1.159? 5.1.160?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Platform info
-      value: |
-        <details>
-
-        *OS (e.g. Windows, Linux, macOS, Android, iOS)*
-        >
-
-        *OS Version (e.g. Windows 10, macOS 10.15)*
-        >
-
-        *Browser(For Web) (e.g. Chrome, Firefox, Safari)*
-        >
-
-        *Device(For Mobile) (e.g. iPhone 12, Samsung Galaxy S21)*
-        >
-
-        </details>
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.

.github/workflows/build-storybook.yml

@@ -17,23 +17,31 @@ jobs:
   build-storybook:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 50
-
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: 'npm'
-          cache-dependency-path: 'newIDE/app/package-lock.json'
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.BUILD_STORYBOOK_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.BUILD_STORYBOOK_AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
 
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
+
       - name: Install newIDE dependencies
         run: npm install
         working-directory: newIDE/app

.github/workflows/extract-translations.yml

@@ -11,12 +11,20 @@ jobs:
   extract-translations:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: 'npm'
-          cache-dependency-path: 'newIDE/app/package-lock.json'
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y

.github/workflows/issues.yml

@@ -3,17 +3,41 @@ on:
   issues:
     types: [opened]
 jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Autoclose issues about adding a bug without changing the bug report template
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*Scroll down to '\\.\\.\\.\\.'.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed because it seems that you have not included any steps to reproduce the bug.\n\nGitHub is a place for the technical development of GDevelop itself - you may want to go on the [forum](https://forum.gdevelop.io/), the Discord chat or [read the documentation](https://wiki.gdevelop.io/gdevelop5/start) to learn more about GDevelop. Thanks!"
+    - name: Autoclose known beta 105 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*_instance.getRawFloatProperty is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
+    - name: Autoclose known beta 114 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*getAssociatedSettings is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
   autocomment:
     runs-on: ubuntu-latest
     if: contains(github.event.issue.body, 'The node to be removed is not a child of this node')
     steps:
-      - name: Autocomment indications on bug if it looks like #3453
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hi @${{ github.actor }}!
-            Thank you for taking the time to open an issue.
+    - name: Autocomment indications on bug if it looks like #3453
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        issue-number: ${{ github.event.issue.number }}
+        body: |
+          Hi @${{ github.actor }}!
+          Thank you for taking the time to open an issue.
 
-            The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.
+          The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-requests.yml

@@ -1,53 +1,29 @@
 name: GDevelop Issues automatic workflow
 on:
   pull_request:
-    types: 
-      - opened
-      - reopened
-      - synchronize
+    types: [opened]
 jobs:
   read-locales-metadata:
-    if: github.event.pull_request.title == '[Auto PR] Update translations'
+    if: contains(github.event.pull_request.title, '[Auto PR] Update translations')
     runs-on: ubuntu-latest
-    env:
-      COMMENT_TITLE: "Translation ratio changes"
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Read and format locales metadata
-        env:
-          BASE: ${{ github.event.pull_request.base.sha }}
-          HEAD: ${{ github.event.pull_request.head.sha }}
-        run: |
-          LANS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
-          ADDS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
-          SUBS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
-          touch sumup.md
-          echo "## $COMMENT_TITLE" >> sumup.md
-          echo "" >> sumup.md
-          echo "| Language | Change |" >> sumup.md
-          echo "| --- | --- |" >> sumup.md
-          for index in ${!ADDS[@]}; do
-            DELTA=$(echo "scale=3; (${ADDS[index]} - ${SUBS[index]})*100/1" | bc)
-            if (( $(echo "$DELTA == 0" | bc -l) )); then
-              continue
-            fi
-            LANGUAGE=${LANS[index]//_/ }
-            echo "| $LANGUAGE | $(printf "%1.3f" $DELTA) % |" >> sumup.md
-          done
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          body-includes: ${{ env.COMMENT_TITLE }}
-      - name: Autocomment pull request with sumup
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          edit-mode: replace
-          body-path: "sumup.md"
+    - name: Read and format locales metadata
+      run: |
+        LANS=($(git diff HEAD^ HEAD --unified=5 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
+        ADDS=($(git diff HEAD^ HEAD --unified=0 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
+        SUBS=($(git diff HEAD^ HEAD --unified=0 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
+        touch sumup.txt
+        for index in ${!ADDS[@]}; do
+          echo ${LANS[index]} | sed -E "s/_/ /g" >> sumup.txt
+          DELTA=$(bc <<< "scale=2;(${ADDS[index]}-${SUBS[index]})*100/1")
+          echo $DELTA % >> sumup.txt
+        done
+    - name: Store sumup in outputs
+      id: sumup
+      run: echo "::set-output name=sumupFileContent::$(cat sumup.txt)"
+    - name: Autocomment pull request with sumup
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        issue-number: ${{ github.event.number }}
+        body: ${{ steps.sumup.outputs.sumupFileContent}}
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update-translations.yml

@@ -14,12 +14,20 @@ jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: 'npm'
-          cache-dependency-path: 'newIDE/app/package-lock.json'
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y
@@ -56,7 +64,7 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v3.10.1
         with:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations

Binaries/README.md

@@ -1,3 +1,3 @@
 This is the directory where native or WebAssembly binaries of the C++ code of GDCore and GDJS are produced.
 
-See GDevelop.js README for the instructions to compile after a change in the C++ source code.
+See GDevelop.js README for the instructions to compile after a change in the C++ source code.

CMakeLists.txt

@@ -1,99 +1,100 @@
-# This is the CMake file used to build GDevelop.
-# For more information, see the README.md file.
+#This is the CMake file used to build GDevelop.
+#For more information, see the Readme.md file.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0011 NEW)
 
 # Add utility functions
 include(scripts/CMakeClangUtils.txt) # To add clang-format and clang-tidy support to a target
 
 # Macro for defining an option
 macro(gd_set_option var default type docstring)
-	if(NOT DEFINED ${var})
-		set(${var} ${default})
-	endif()
-	set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
+    if(NOT DEFINED ${var})
+        set(${var} ${default})
+    endif()
+    set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
 endmacro()
-
-# Set options
 gd_set_option(BUILD_CORE TRUE BOOL "TRUE to build GDevelop Core library")
 gd_set_option(BUILD_GDJS TRUE BOOL "TRUE to build GDevelop JS Platform")
 gd_set_option(BUILD_EXTENSIONS TRUE BOOL "TRUE to build the extensions")
 gd_set_option(BUILD_TESTS TRUE BOOL "TRUE to build the tests")
 
 # Disable deprecated code
-set(NO_GUI TRUE CACHE BOOL "" FORCE) # Force disable old GUI related code.
+set(NO_GUI TRUE CACHE BOOL "" FORCE) #Force disable old GUI related code.
 
-# Setting up installation directory, for Linux (has to be done before "project" command).
-if(NOT WIN32)
-	if(NOT APPLE)
-		gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
-	else()
-		gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
-	endif()
+#Setting up installation directory, for Linux (has to be done before "project" command).
+IF(NOT WIN32)
+	if (NOT APPLE)
+	gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
+	ELSE()
+	gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
+	ENDIF()
 
-	# As we embed SFML, prevent it to be installed system-wide
+	#As we embed SFML, prevent it to be installed system-wide
 	set(CMAKE_INSTALL_PREFIX "${GD_INSTALL_PREFIX}/useless")
-endif()
+ENDIF()
 
 project(GDevelop)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-if(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
-	set(CMAKE_SKIP_BUILD_RPATH TRUE) # Avoid errors when packaging for linux.
-endif()
-if(APPLE)
+IF(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
+	SET(CMAKE_SKIP_BUILD_RPATH  TRUE) #Avoid errors when packaging for linux.
+ENDIF()
+IF(APPLE)
 	set(CMAKE_MACOSX_RPATH 1)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 	set(CMAKE_INSTALL_RPATH ".")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	add_compile_options(
-		-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
-		-Wno-potentially-evaluated-expression)
-endif()
-# Sanity checks
-if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	message(STATUS "CMAKE_BUILD_TYPE is empty, assuming build type is Release")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
+ENDIF()
+#Sanity checks
+IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	message( "CMAKE_BUILD_TYPE is empty, assuming build type is Release" )
 	set(CMAKE_BUILD_TYPE Release)
-endif()
+ENDIF()
 
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
-	set(CMAKE_SHARED_LINKER_FLAGS "-s") # Force stripping to avoid errors when packaging for linux.
-endif()
+IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+	SET(CMAKE_SHARED_LINKER_FLAGS "-s") #Force stripping to avoid errors when packaging for linux.
+ENDIF()
 
 #Activate C++11
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_CXX0X)
+if(COMPILER_SUPPORTS_CXX11)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+else()
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support (with GNU extensions). Please use a different C++ compiler.")
+endif()
 
 # Mark some warnings as errors
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# Activate as much warnings as possible to avoid errors like
 	# uninitialized variables or other hard to debug bugs.
-	add_compile_options(
-		-Wall
-		-Wno-unknown-warning-option
-		-Wno-reorder-ctor
-		-Wno-reorder
-		-Wno-pessimizing-move
-		-Wno-unused-variable
-		-Wno-unused-private-field
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder-ctor -Wno-reorder -Wno-pessimizing-move -Wno-unused-variable -Wno-unused-private-field")
 
-		# Make as much warnings considered as errors as possible (only one for now).
-		-Werror=return-stack-address)
+	# Make as much warnings considered as errors as possible (only one for now).
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
 endif()
 
-# Define common directories:
+#Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 
-# Add all the CMakeLists:
-add_subdirectory(ExtLibs)
-if(BUILD_CORE)
-	add_subdirectory(Core)
-endif()
-if(BUILD_GDJS)
-	add_subdirectory(GDJS)
-endif()
-if(EMSCRIPTEN)
-	add_subdirectory(GDevelop.js)
-endif()
-if(BUILD_EXTENSIONS)
-	add_subdirectory(Extensions)
-endif()
+#Add all the CMakeLists:
+ADD_SUBDIRECTORY(ExtLibs)
+IF(BUILD_CORE)
+	ADD_SUBDIRECTORY(Core)
+ENDIF()
+IF(BUILD_GDJS)
+	ADD_SUBDIRECTORY(GDJS)
+ENDIF()
+IF(EMSCRIPTEN)
+	ADD_SUBDIRECTORY(GDevelop.js)
+ENDIF()
+IF(BUILD_EXTENSIONS)
+	ADD_SUBDIRECTORY(Extensions)
+ENDIF()

Core/CMakeLists.txt

@@ -1,98 +1,83 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0015 NEW)
 
 project(GDCore)
 
-set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) # Force use response file: useful for Ninja build system on Windows.
-set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) #Force use response file: useful for Ninja build system on Windows.
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 
-# Define common directories:
+#Define common directories:
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
-# Dependencies on external libraries:
-#
+#Dependencies on external libraries:
+###
 
-# Defines
-#
-add_definitions(-DGD_IDE_ONLY)
-if(EMSCRIPTEN)
-	add_definitions(-DEMSCRIPTEN)
-endif()
-if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-	add_definitions(-DDEBUG)
-else()
-	add_definitions(-DRELEASE)
-endif()
+#Defines
+###
+add_definitions( -DGD_IDE_ONLY )
+IF (EMSCRIPTEN)
+	add_definitions( -DEMSCRIPTEN )
+ENDIF()
+IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+	add_definitions( -DDEBUG )
+ELSE()
+	add_definitions( -DRELEASE )
+ENDIF()
 
-if(WIN32)
-	add_definitions(-DWINDOWS)
-	add_definitions("-DGD_CORE_API=__declspec(dllexport)")
-	add_definitions(-D__GNUWIN32__)
-else()
-	if(APPLE)
-		add_definitions(-DMACOS)
-	else()
-		add_definitions(-DLINUX)
-	endif()
-	add_definitions(-DGD_API=)
-	add_definitions(-DGD_CORE_API=)
-endif()
+IF(WIN32)
+	add_definitions( -DWINDOWS )
+	add_definitions( "-DGD_CORE_API=__declspec(dllexport)" )
+	add_definitions( -D__GNUWIN32__ )
+ELSE()
+    IF(APPLE)
+    add_definitions( -DMACOS )
+    ELSE()
+	add_definitions( -DLINUX )
+	ENDIF()
+	add_definitions( -DGD_API= )
+	add_definitions( -DGD_CORE_API= )
+ENDIF(WIN32)
 
-# The target
-#
+#The target
+###
 include_directories(.)
-file(
-	GLOB_RECURSE
-	source_files
-	GDCore/*)
+file(GLOB_RECURSE source_files GDCore/*)
 
-file(
-	GLOB_RECURSE
-	formatted_source_files
-	tests/*
-	GDCore/Events/*
-	GDCore/Extensions/*
-	GDCore/IDE/*
-	GDCore/Project/*
-	GDCore/Serialization/*
-	GDCore/Tools/*)
-list(
-	REMOVE_ITEM
-	formatted_source_files
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
+file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensions/* GDCore/IDE/* GDCore/Project/* GDCore/Serialization/* GDCore/Tools/*)
+list(REMOVE_ITEM formatted_source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
 gd_add_clang_utils(GDCore "${formatted_source_files}")
 
-if(EMSCRIPTEN)
+IF(EMSCRIPTEN)
 	# Emscripten treats all libraries as static libraries
 	add_library(GDCore STATIC ${source_files})
-else()
+ELSE()
 	add_library(GDCore SHARED ${source_files})
-endif()
-if(EMSCRIPTEN)
+ENDIF()
+IF(EMSCRIPTEN)
 	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
-elseif(WIN32)
+ELSEIF(WIN32)
 	set_target_properties(GDCore PROPERTIES PREFIX "")
-else()
+ELSE()
 	set_target_properties(GDCore PROPERTIES PREFIX "lib")
-endif()
+ENDIF()
 set(LIBRARY_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(ARCHIVE_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(RUNTIME_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 
-# Tests
-#
+#Tests
+###
 if(BUILD_TESTS)
 	file(
-		GLOB_RECURSE
-		test_source_files
-		tests/*)
+	    GLOB_RECURSE
+	    test_source_files
+	    tests/*
+	)
 
 	add_executable(GDCore_tests ${test_source_files})
-	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) # Allow finding dependencies directly from build path on Mac OS X.
+	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) #Allow finding dependencies directly from build path on Mac OS X.
 	target_link_libraries(GDCore_tests GDCore)
 	target_link_libraries(GDCore_tests ${CMAKE_DL_LIBS})
 endif()

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -38,7 +38,7 @@ void CommentEvent::SerializeTo(SerializerElement &element) const {
       .SetAttribute("textB", textB);
 
   element.AddChild("comment").SetValue(com1);
-  if (!com2.empty()) element.AddChild("comment2").SetValue(com2);
+  element.AddChild("comment2").SetValue(com2);
 }
 
 void CommentEvent::UnserializeFrom(gd::Project &project,
@@ -53,9 +53,7 @@ void CommentEvent::UnserializeFrom(gd::Project &project,
   textB = colorElement.GetIntAttribute("textB");
 
   com1 = element.GetChild("comment", 0, "Com1").GetValue().GetString();
-  if (element.HasChild("comment2")) {
-    com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
-  }
+  com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -267,11 +267,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     return "/* Unknown instruction - skipped. */";
   }
 
-  AddIncludeFiles(instrInfos.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
   maxConditionsListsSize =
       std::max(maxConditionsListsSize, condition.GetSubInstructions().size());
 
-  if (instrInfos.HasCustomCodeGenerator()) {
+  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
     context.EnterCustomCondition();
     conditionCode += instrInfos.codeExtraInformation.customCodeGenerator(
         condition, *this, context);
@@ -289,7 +289,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatches between object type in parameters.
+  // Verify that there are no mismatchs between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
@@ -459,9 +459,9 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     return "/* Unknown instruction - skipped. */";
   }
 
-  AddIncludeFiles(instrInfos.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
 
-  if (instrInfos.HasCustomCodeGenerator()) {
+  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
     return instrInfos.codeExtraInformation.customCodeGenerator(
         action, *this, context);
   }
@@ -481,7 +481,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatches between object type in parameters.
+  // Verify that there are no mismatchs between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
@@ -727,7 +727,6 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilemapResource" ||
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
-             metadata.GetType() == "model3DResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
@@ -1019,15 +1018,15 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
     bool conditionInverted,
     gd::EventsCodeGenerationContext& context) {
   // Generate call
-  gd::String predicate;
+  gd::String predicat;
   if (instrInfos.codeExtraInformation.type == "number" ||
       instrInfos.codeExtraInformation.type == "string") {
-    predicate = GenerateRelationalOperatorCall(
+    predicat = GenerateRelationalOperatorCall(
         instrInfos,
         arguments,
         instrInfos.codeExtraInformation.functionCallName);
   } else {
-    predicate = instrInfos.codeExtraInformation.functionCallName + "(" +
+    predicat = instrInfos.codeExtraInformation.functionCallName + "(" +
                GenerateArgumentsList(arguments, 0) + ")";
   }
 
@@ -1040,10 +1039,10 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
-    predicate = GenerateNegatedPredicate(predicate);
+    predicat = GenerateNegatedPredicat(predicat);
 
   // Generate condition code
-  return returnBoolean + " = " + predicate + ";\n";
+  return returnBoolean + " = " + predicat + ";\n";
 }
 
 gd::String EventsCodeGenerator::GenerateObjectCondition(
@@ -1065,18 +1064,18 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
                 instrInfos.codeExtraInformation.functionCallName;
 
   // Create call
-  gd::String predicate;
+  gd::String predicat;
   if ((instrInfos.codeExtraInformation.type == "number" ||
        instrInfos.codeExtraInformation.type == "string")) {
-    predicate = GenerateRelationalOperatorCall(
+    predicat = GenerateRelationalOperatorCall(
         instrInfos, arguments, objectFunctionCallNamePart, 1);
   } else {
-    predicate = objectFunctionCallNamePart + "(" +
+    predicat = objectFunctionCallNamePart + "(" +
                GenerateArgumentsList(arguments, 1) + ")";
   }
-  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
+  if (conditionInverted) predicat = GenerateNegatedPredicat(predicat);
 
-  return "For each picked object \"" + objectName + "\", check " + predicate +
+  return "For each picked object \"" + objectName + "\", check " + predicat +
          ".\n";
 }
 
@@ -1090,16 +1089,16 @@ gd::String EventsCodeGenerator::GenerateBehaviorCondition(
     bool conditionInverted,
     gd::EventsCodeGenerationContext& context) {
   // Create call
-  gd::String predicate;
+  gd::String predicat;
   if ((instrInfos.codeExtraInformation.type == "number" ||
        instrInfos.codeExtraInformation.type == "string")) {
-    predicate = GenerateRelationalOperatorCall(instrInfos, arguments, "", 2);
+    predicat = GenerateRelationalOperatorCall(instrInfos, arguments, "", 2);
   } else {
-    predicate = "(" + GenerateArgumentsList(arguments, 2) + ")";
+    predicat = "(" + GenerateArgumentsList(arguments, 2) + ")";
   }
-  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
+  if (conditionInverted) predicat = GenerateNegatedPredicat(predicat);
 
-  return "For each picked object \"" + objectName + "\", check " + predicate +
+  return "For each picked object \"" + objectName + "\", check " + predicat +
          " for behavior \"" + behaviorName + "\".\n";
 }
 
@@ -1239,7 +1238,7 @@ size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
               << std::endl;
   }
 
-  // Base the unique id on the address in memory so that the same instruction
+  // Base the unique id on the adress in memory so that the same instruction
   // in memory will get the same id across different code generations.
   size_t uniqueId = (size_t)instruction;
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -507,7 +507,7 @@ class GD_CORE_API EventsCodeGenerator {
    * - string : %Text expression -> string
    * - layer, color, file, stringWithSelector : Same as string
    * - relationalOperator : Used to make a comparison between the function
-  return value and value of the parameter preceding the relationOperator
+  resturn value and value of the parameter preceding the relationOperator
   parameter -> string
    * - operator : Used to update a value using a setter and a getter -> string
    * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
@@ -668,13 +668,13 @@ class GD_CORE_API EventsCodeGenerator {
   };
 
   /**
-   * \brief Must negate a predicate.
+   * \brief Must negate a predicat.
    *
-   * The default implementation generates C-style code : It wraps the predicate
+   * The default implementation generates C-style code : It wraps the predicat
    * inside parenthesis and add a !.
    */
-  virtual gd::String GenerateNegatedPredicate(const gd::String& predicate) const {
-    return "!(" + predicate + ")";
+  virtual gd::String GenerateNegatedPredicat(const gd::String& predicat) const {
+    return "!(" + predicat + ")";
   };
 
   virtual gd::String GenerateFreeCondition(
@@ -785,7 +785,7 @@ class GD_CORE_API EventsCodeGenerator {
   const gd::Project* project;  ///< The project being used.
   const gd::Layout* scene;     ///< The scene being generated.
 
-  bool errorOccurred;          ///< Must be set to true if an error occurred.
+  bool errorOccurred;          ///< Must be set to true if an error occured.
   bool compilationForRuntime;  ///< Is set to true if the code generation is
                                ///< made for runtime only.
 

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -51,8 +51,8 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
                                     codeGenerator.GetObjectsAndGroups(),
                                     rootType);
   node->Visit(validator);
-  if (!validator.GetFatalErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
+  if (!validator.GetErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
               << "\" in: \"" << expression.GetPlainString() << "\" ("
               << rootType << ")" << std::endl;
 
@@ -170,7 +170,7 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   }
   else {
     // This is for function names that are put in IdentifierNode
-    // because the type is needed to tell them apart from variables.
+    // because the type is needed to tell them appart from variables.
     output += GenerateDefaultValue(type);
   }
 }
@@ -216,10 +216,10 @@ gd::String ExpressionCodeGenerator::GenerateFreeFunctionCode(
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -242,10 +242,10 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
       codeGenerator.GetObjectsAndGroups();
 
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -300,10 +300,10 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
       codeGenerator.GetObjectsAndGroups();
 
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }

Core/GDCore/Events/EventVisitor.h

@@ -66,11 +66,6 @@ class GD_CORE_API ReadOnlyEventVisitor {
    * Note that VisitEvent is also called with this event.
    */
   virtual void VisitLinkEvent(const gd::LinkEvent& linkEvent) = 0;
-
-  /**
-   * @brief Abort the iteration on the events.
-   */
-  virtual void StopAnyEventIteration() = 0;
 };
 
 }

Core/GDCore/Events/EventsList.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "EventsList.h"
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Log.h"
@@ -101,8 +100,9 @@ bool EventsList::Contains(const gd::BaseEvent& eventToSearch,
 }
 
 bool EventsList::MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
-                                              gd::EventsList& newEventsList,
-                                              std::size_t newPosition) {
+                                  gd::EventsList& newEventsList,
+                                  std::size_t newPosition) {
+
   for (std::size_t i = 0; i < GetEventsCount(); ++i) {
     if (events[i].get() == &eventToMove) {
       std::shared_ptr<BaseEvent> event = events[i];

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -17,7 +17,7 @@ const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(originalObjectName);
+  gd::String partiallyMangledName = originalObjectName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -43,15 +43,7 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(externalEventsName);
-
-  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
-  return mangledExternalEventsNames[externalEventsName];
-}
-
-gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
+  gd::String partiallyMangledName = externalEventsName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -65,30 +57,11 @@ gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
       partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
     }
   }
-  return partiallyMangledName;
+
+  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
+  return mangledExternalEventsNames[externalEventsName];
 }
 
-gd::String EventsCodeNameMangler::GetMangledName(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
-  static const gd::String allowedCharacters =
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-
-  for (size_t i = 0; i < partiallyMangledName.size();
-       ++i)  // Replace all unallowed letter by an underscore and the ascii
-             // number of the letter
-  {
-    if (allowedCharacters.find_first_of(
-            std::u32string(1, partiallyMangledName[i])) == gd::String::npos) {
-      char32_t unallowedChar = partiallyMangledName[i];
-      partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
-    }
-  }
-  return partiallyMangledName;
-}
-
-
-
 const gd::String& ManObjListName(const gd::String &objectName) {
   return EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName);
 }

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

@@ -36,8 +36,6 @@ class GD_CORE_API EventsCodeNameMangler {
   const gd::String &GetExternalEventsFunctionMangledName(
       const gd::String &externalEventsName);
 
-  static gd::String GetMangledName(const gd::String &name);
-
   static EventsCodeNameMangler *Get();
   static void DestroySingleton();
 
@@ -46,9 +44,6 @@ class GD_CORE_API EventsCodeNameMangler {
   virtual ~EventsCodeNameMangler(){};
   static EventsCodeNameMangler *_singleton;
 
-  // This method is inlined to avoid to copy the returned string.
-  static inline gd::String GetMangledNameWithForbiddenUnderscore(const gd::String &name);
-
   std::unordered_map<gd::String, gd::String>
       mangledObjectNames;  ///< Memoized results of mangling for objects
   std::unordered_map<gd::String, gd::String>

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -33,7 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("expression", _("The number to be returned"))
+      .AddParameter("expression", "The number to be returned")
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
@@ -48,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("string", _("The text to be returned"))
+      .AddParameter("string", "The text to be returned")
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
@@ -62,37 +62,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                  "res/function32.png",
                  "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("trueorfalse", _("Should the condition be true or false?"))
-      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyArgumentToVariable",
-                 _("Copy function parameter to variable"),
-                 _("Copy a function parameter (also called \"argument\") to a variable. "
-                 "The parameter type must be a variable."),
-                 _("Copy the parameter _PARAM0_ into the variable _PARAM1_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
-      .SetHelpPath("/events/functions/return")
-      .AddParameter("functionParameterName", _("Parameter name"), "variable")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyVariableToArgument",
-                 _("Copy variable to function parameter"),
-                 _("Copy a variable to function parameter (also called \"argument\"). "
-                 "The parameter type must be a variable."),
-                 _("Copy the variable _PARAM1_ into the parameter _PARAM0_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
-      .SetHelpPath("/events/functions/return")
-      .AddParameter("functionParameterName", _("Parameter name"), "variable")
-      .AddParameter("scenevar", _("Scene variable"))
+      .AddParameter("trueorfalse", "Should the condition be true or false?")
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
@@ -107,7 +77,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "",
                     "res/function32.png",
                     "res/function32.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .AddParameter("functionParameterName", "Parameter name")
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
@@ -118,7 +88,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Get function parameter (also called \"argument\") value."),
           "",
           "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .AddParameter("functionParameterName", "Parameter name")
       .SetRelevantForFunctionEventsOnly();
 
   extension
@@ -128,7 +98,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Get function parameter (also called \"argument\") text."),
           "",
           "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .AddParameter("functionParameterName", "Parameter name")
       .SetRelevantForFunctionEventsOnly();
 
   extension
@@ -140,7 +110,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "",
           "res/function32.png",
           "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .AddParameter("functionParameterName", "Parameter name")
       .UseStandardRelationalOperatorParameters(
           "number", gd::ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly();
@@ -154,7 +124,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "",
           "res/function32.png",
           "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .AddParameter("functionParameterName", "Parameter name")
       .UseStandardRelationalOperatorParameters(
           "string", gd::ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly();

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -1588,7 +1588,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "Raycast",
           _("Raycast"),
           _("Sends a ray from the given source position and angle, "
-            "intersecting the closest object.\nThe intersected "
+            "intersecting the closest object.\nThe instersected "
             "object will become the only one taken into account.\nIf "
             "the condition is inverted, the object to be intersected "
             "will be the farthest one within the ray radius."),
@@ -1619,7 +1619,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "RaycastToPosition",
           _("Raycast to position"),
           _("Sends a ray from the given source position to the final point, "
-            "intersecting the closest object.\nThe intersected "
+            "intersecting the closest object.\nThe instersected "
             "object will become the only one taken into account.\nIf "
             "the condition is inverted, the object to be intersected "
             "will be the farthest one within the ray radius."),

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -69,12 +69,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierExp",
-          _("Save a value"),
-          _("Save the result of the expression in the stored data, in the "
+          _("Write a value"),
+          _("Write the result of the expression in the stored data, in the "
             "specified element.\nSpecify the structure leading to the "
             "element using / (example : Root/Level/Current)\nSpaces are "
             "forbidden in element names."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
           "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
@@ -85,12 +85,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierTxt",
-          _("Save a text"),
-          _("Save the text in the specified storage, in the specified "
+          _("Write a text"),
+          _("Write the text in the specified storage, in the specified "
             "element.\nSpecify "
             "the structure leading to the element using / (example : "
             "Root/Level/Current)\nSpaces are forbidden in element names."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
           "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
@@ -101,13 +101,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LireFichierExp",
-          _("Load a value"),
-          _("Load the value saved in the specified element and store it in a "
+          _("Read a value"),
+          _("Read the value saved in the specified element and store it in a "
             "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
+          _("Read _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
           "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
@@ -119,13 +119,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LireFichierTxt",
-          _("Load a text"),
-          _("Load the text saved in the specified element and store it in a "
+          _("Read a text"),
+          _("Read the text saved in the specified element and store it in a "
             "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
+          _("Read _PARAM1_ from storage _PARAM0_ and store as text in "
             "_PARAM3_"),
           "",
           "res/actions/fichier24.png",

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -48,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .AddParameter("string", "Content type", "", true)
       .SetParameterLongDescription(
           "If empty, \"application/x-www-form-urlencoded\" will be used.")
-      .AddParameter("scenevar", "Response scene variable", "", true)
+      .AddParameter("scenevar", "Reponse scene variable", "", true)
       .SetParameterLongDescription(
           "The response of the server will be stored, as a string, in this "
           "variable. If the server returns *JSON*, you may want to use the "

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -54,19 +54,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .MarkAsSimple();
 
-  extension
-      .AddCondition("DoesSceneExist",
-                    _("Does scene exist"),
-                    _("Check if scene exists."),
-                    _("Scene _PARAM1_ exists"),
-                    "",
-                    "res/actions/texte.png",
-                    "res/actions/texte.png")
-      .SetHelpPath("/interface/scene-editor/events")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Name of the scene to check"))
-      .MarkAsSimple();
-
   extension
       .AddAction("Scene",
                  _("Change the scene"),

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

@@ -110,11 +110,11 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
             .GetBoolAttribute("automatic", true));
 
     if (spriteElement.HasChild("CustomCollisionMask"))
-      sprite.SetFullImageCollisionMask(
+      sprite.SetCollisionMaskAutomatic(
           !spriteElement.GetChild("CustomCollisionMask")
                .GetBoolAttribute("custom", false));
     else
-      sprite.SetFullImageCollisionMask(
+      sprite.SetCollisionMaskAutomatic(
           !spriteElement.GetBoolAttribute("hasCustomCollisionMask", false));
 
     std::vector<Polygon2d> mask;
@@ -173,7 +173,7 @@ void SaveSpritesDirection(const vector<Sprite>& sprites,
         .SetAttribute("automatic", sprites[i].IsDefaultCenterPoint());
 
     spriteElement.SetAttribute("hasCustomCollisionMask",
-                               !sprites[i].IsFullImageCollisionMask());
+                               !sprites[i].IsCollisionMaskAutomatic());
 
     gd::SerializerElement& collisionMaskElement =
         spriteElement.AddChild("customCollisionMask");

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

@@ -4,9 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
-
 #include <iostream>
-
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 
 using namespace std;
@@ -16,10 +14,11 @@ namespace gd {
 Point Sprite::badPoint("");
 
 Sprite::Sprite()
-    : fullImageCollisionMask(false),
+    : automaticCollisionMask(true),
       origine("origine"),
       centre("centre"),
-      automaticCentre(true) {}
+      automaticCentre(true) {
+}
 
 Sprite::~Sprite(){};
 

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

@@ -7,7 +7,6 @@
 #ifndef SPRITE_H
 #define SPRITE_H
 #include <memory>
-
 #include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 #include "GDCore/String.h"
@@ -44,7 +43,7 @@ class GD_CORE_API Sprite {
 
   /**
    * \brief Get the collision mask (custom or automatically generated owing to
-   * IsFullImageCollisionMask())
+   * IsCollisionMaskAutomatic())
    *
    * \warning If the image has not been loaded ( using LoadImage ) and the
    * collision mask is set as automatic, the returned mask won't be correct.
@@ -67,7 +66,7 @@ class GD_CORE_API Sprite {
 
   /**
    * \brief Set the custom collision mask.
-   * Call then `SetFullImageCollisionMask(false)` to use it.
+   * Call then `SetCollisionMaskAutomatic(false)` to use it.
    */
   void SetCustomCollisionMask(const std::vector<Polygon2d>& collisionMask);
 
@@ -75,15 +74,15 @@ class GD_CORE_API Sprite {
    * \brief Return true if the collision mask is a bounding box, false if a
    * custom collision mask is used.
    */
-  inline bool IsFullImageCollisionMask() const {
-    return fullImageCollisionMask;
+  inline bool IsCollisionMaskAutomatic() const {
+    return automaticCollisionMask;
   }
 
   /**
    * \brief Un/set use of the custom collision mask.
    */
-  inline void SetFullImageCollisionMask(bool enabled) {
-    fullImageCollisionMask = enabled;
+  inline void SetCollisionMaskAutomatic(bool enabled) {
+    automaticCollisionMask = enabled;
   };
 
   /**
@@ -162,9 +161,9 @@ class GD_CORE_API Sprite {
  private:
   gd::String image;  ///< Name of the image to be loaded in Image Manager.
 
-  bool fullImageCollisionMask;  ///< True to use a bounding box wrapping the
-                                ///< whole image as collision mask. If false,
-                                ///< custom collision mask is used.
+  bool automaticCollisionMask;  ///< True to use the custom collision mask.
+                                ///< Otherwise, a basic bounding box is returned
+                                ///< by GetCollisionMask()
   std::vector<Polygon2d> customCollisionMask;  ///< Custom collision mask
 
   std::vector<Point> points;  ///< List of the points used by the sprite

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

@@ -287,7 +287,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddCondition("AnimationName",
                    _("Current animation name"),
-                   _("Check the animation played by the object."),
+                   _("Check the animation by played by the object."),
                    _("The animation of _PARAM0_ is _PARAM1_"),
                    _("Animations and images"),
                    "res/conditions/animation24.png",

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

@@ -25,16 +25,13 @@ namespace gd {
 
 Animation SpriteObject::badAnimation;
 
-SpriteObject::SpriteObject()
-    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
+SpriteObject::SpriteObject() : updateIfNotVisible(false) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
 
   RemoveAllAnimations();
   const gd::SerializerElement& animationsElement =
@@ -83,8 +80,6 @@ void SpriteObject::DoUnserializeFrom(gd::Project& project,
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);
 
   // Animations
   gd::SerializerElement& animationsElement = element.AddChild("animations");

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

@@ -47,7 +47,8 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+  bool UpdateProperty(const gd::String& name,
+                      const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
       const gd::InitialInstance& position,
@@ -117,30 +118,14 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   const std::vector<Animation>& GetAllAnimations() const { return animations; }
 
   /**
-   * @brief Check if the collision mask adapts automatically to the animation.
+   * \brief Set if the object animation should be played even if the object is hidden
+   * or far from the camera.
    */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
+  void SetUpdateIfNotVisible(bool updateIfNotVisible_) { updateIfNotVisible = updateIfNotVisible_; }
 
   /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
-
-  /**
-   * \brief Set if the object animation should be played even if the object is
-   * hidden or far from the camera.
-   */
-  void SetUpdateIfNotVisible(bool updateIfNotVisible_) {
-    updateIfNotVisible = updateIfNotVisible_;
-  }
-
-  /**
-   * \brief Check if the object animation should be played even if the object
-   * is hidden or far from the camera (false by default).
+   * \brief Check if the object animation should be played even if the object is hidden
+   * or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
   ///@}
@@ -152,15 +137,11 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
 
   mutable std::vector<Animation> animations;
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
-                            ///< object animation even if hidden or far from
-                            ///< the screen.
+                            ///< object animation even if hidden or far from the
+                            ///< screen.
 
-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
+  static Animation badAnimation;  //< Bad animation when an out of bound
+                                  // animation is requested.
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -126,8 +126,8 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLast",
-          _("Search the last occurrence in a text"),
-          _("Search the last occurrence in a string (return the position of "
+          _("Search the last occurence in a text"),
+          _("Search the last occurence in a string (return the position of "
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
           "",
@@ -169,10 +169,10 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLastFrom",
-          _("Search the last occurrence in a text, starting from a position"),
-          _("Search in a text the last occurrence, starting from a position "
+          _("Search the last occurence in a text, starting from a position"),
+          _("Search in a text the last occurence, starting from a position "
             "(return "
-            "the position of the result, from the beginning of the string, or "
+            " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),
           "",
           "res/conditions/toujours24_black.png")

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -1,135 +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 <algorithm>
-#include <functional>
-#include <map>
-#include <memory>
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/String.h"
-#include "ParameterMetadata.h"
-#include "ParameterOptions.h"
-
-namespace gd {
-class Project;
-class Layout;
-class EventsCodeGenerator;
-class EventsCodeGenerationContext;
-class SerializerElement;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Describe user-friendly information about an expression or an
- * instruction (action or condition), its parameters and the function name as
- * well as other information for code generation.
- *
- * \ingroup Events
- */
-class GD_CORE_API AbstractFunctionMetadata {
-public:
-  AbstractFunctionMetadata(){};
-  virtual ~AbstractFunctionMetadata(){};
-
-  /**
-   * \see gd::InstructionMetadata::AddParameter
-   */
-  virtual AbstractFunctionMetadata &
-  AddParameter(const gd::String &type, const gd::String &label,
-               const gd::String &supplementaryInformation = "",
-               bool parameterIsOptional = false) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::AddCodeOnlyParameter
-   */
-  virtual AbstractFunctionMetadata &
-  AddCodeOnlyParameter(const gd::String &type,
-                       const gd::String &supplementaryInformation) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetDefaultValue
-   */
-  virtual AbstractFunctionMetadata &
-  SetDefaultValue(const gd::String &defaultValue) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetParameterExtraInfo
-   */
-  virtual AbstractFunctionMetadata &
-  SetParameterExtraInfo(const gd::String &defaultValue) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetParameterLongDescription
-   */
-  virtual AbstractFunctionMetadata &
-  SetParameterLongDescription(const gd::String &longDescription) = 0;
-
-  /**
-   * \see gd::InstructionMetadata::SetHidden
-   */
-  virtual AbstractFunctionMetadata &SetHidden() = 0;
-
-  /**
-   * Set that the instruction is private - it can't be used outside of the
-   * object/ behavior that it is attached too.
-   */
-  virtual AbstractFunctionMetadata &SetPrivate() = 0;
-
-  /**
-   * Set that the instruction can be used in layouts or external events.
-   */
-  virtual AbstractFunctionMetadata &SetRelevantForLayoutEventsOnly() = 0;
-
-  /**
-   * Set that the instruction can be used in function events.
-   */
-  virtual AbstractFunctionMetadata &SetRelevantForFunctionEventsOnly() = 0;
-
-  /**
-   * Set that the instruction can be used in asynchronous function events.
-   */
-  virtual AbstractFunctionMetadata &
-  SetRelevantForAsynchronousFunctionEventsOnly() = 0;
-
-  /**
-   * Set that the instruction can be used in custom object events.
-   */
-  virtual AbstractFunctionMetadata &SetRelevantForCustomObjectEventsOnly() = 0;
-
-  /**
-   * \brief Set the function that should be called when generating the source
-   * code from events.
-   * \param functionName the name of the function to call
-   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
-   */
-  virtual AbstractFunctionMetadata &
-  SetFunctionName(const gd::String &functionName) = 0;
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   */
-  virtual AbstractFunctionMetadata &
-  SetIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  virtual AbstractFunctionMetadata &
-  AddIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  virtual const std::vector<gd::String> &GetIncludeFiles() const = 0;
-
-private:
-};
-
-} // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -3,10 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
-#include "InstructionOrExpressionContainerMetadata.h"
-
+#ifndef BEHAVIORMETADATA_H
+#define BEHAVIORMETADATA_H
 #include <map>
 
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -27,7 +25,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMetadata {
+class GD_CORE_API BehaviorMetadata {
  public:
   BehaviorMetadata(
       const gd::String& extensionNamespace,
@@ -69,7 +67,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                         const gd::String& sentence_,
                                         const gd::String& group_,
                                         const gd::String& icon_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the behavior.
@@ -82,7 +80,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                      const gd::String& sentence_,
                                      const gd::String& group_,
                                      const gd::String& icon_,
-                                     const gd::String& smallicon_) override;
+                                     const gd::String& smallicon_);
 
   /**
    * Declare a new condition as being part of the behavior.
@@ -93,7 +91,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                               const gd::String& sentence_,
                                               const gd::String& group_,
                                               const gd::String& icon_,
-                                              const gd::String& smallicon_) override;
+                                              const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the behavior.
@@ -104,7 +102,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                            const gd::String& sentence_,
                                            const gd::String& group_,
                                            const gd::String& icon_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
   /**
    * Declare a new action as being part of the extension.
    */
@@ -112,7 +110,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                         const gd::String& fullname_,
                                         const gd::String& description_,
                                         const gd::String& group_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
 
   /**
    * Declare a new string expression as being part of the extension.
@@ -121,7 +119,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
                                            const gd::String& fullname_,
                                            const gd::String& description_,
                                            const gd::String& group_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
 
   /**
    * \brief Declare a new expression and condition as being part of the
@@ -136,7 +134,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Declare a new expression, condition and action as being part of the
@@ -153,7 +151,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Create a new action which is the duplicate of the specified one.
@@ -162,7 +160,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * one.
    */
   gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName) override;
+      const gd::String& newActionName, const gd::String& copiedActionName);
 
   /**
    * \brief Create a new condition which is the duplicate of the specified one.
@@ -172,7 +170,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName) override;
+      const gd::String& copiedConditionName);
 
   /**
    * \brief Create a new expression which is the duplicate of the specified one.
@@ -195,9 +193,9 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& newExpressionName,
       const gd::String& copiedExpressionName);
 
-  BehaviorMetadata& SetFullName(const gd::String& fullname_) override;
+  BehaviorMetadata& SetFullName(const gd::String& fullname_);
   BehaviorMetadata& SetDefaultName(const gd::String& defaultName_);
-  BehaviorMetadata& SetDescription(const gd::String& description_) override;
+  BehaviorMetadata& SetDescription(const gd::String& description_);
   BehaviorMetadata& SetGroup(const gd::String& group_);
 
   /**
@@ -205,12 +203,12 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
    */
-  BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
+  BehaviorMetadata& SetIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile) override;
+  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Add a file to the already existing required files.
@@ -223,7 +221,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * Get the help path of the behavior, relative to the GDevelop documentation
    * root.
    */
-  const gd::String& GetHelpPath() const override { return helpPath; }
+  const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
    * Set the help path of the behavior, relative to the GDevelop documentation
@@ -232,17 +230,17 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * The behavior instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  BehaviorMetadata& SetHelpPath(const gd::String& path) override {
+  BehaviorMetadata& SetHelpPath(const gd::String& path) {
     helpPath = path;
     return *this;
   }
 
-  const gd::String& GetName() const override;
-  const gd::String& GetFullName() const override { return fullname; }
+  const gd::String& GetName() const;
+  const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetDefaultName() const { return defaultName; }
-  const gd::String& GetDescription() const override { return description; }
+  const gd::String& GetDescription() const { return description; }
   const gd::String& GetGroup() const { return group; }
-  const gd::String& GetIconFilename() const override { return iconFilename; }
+  const gd::String& GetIconFilename() const { return iconFilename; }
 
   /**
    * \brief Set the type of the object that this behavior can be used on.
@@ -295,22 +293,22 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() override { return actionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { return actionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() override { return conditionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() override { return expressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
@@ -339,3 +337,5 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
 };
 
 }  // namespace gd
+
+#endif  // BEHAVIORMETADATA_H

Core/GDCore/Extensions/Metadata/DependencyMetadata.h

@@ -62,7 +62,7 @@ class GD_CORE_API DependencyMetadata {
   };
 
   /**
-   * \brief Sets the type of dependency (what will be used to install it)
+   * \brief Sets the type of dependecy (what will be used to install it)
    *
    * This can either be "npm" or "cordova" for now.
    */

Core/GDCore/Extensions/Metadata/EffectMetadata.cpp

@@ -7,6 +7,9 @@
 
 namespace gd {
 
+EffectMetadata::EffectMetadata(const gd::String& type_)
+    : type(type_), isMarkedAsNotWorkingForObjects(false) {}
+
 EffectMetadata& EffectMetadata::SetIncludeFile(const gd::String& includeFile) {
   includeFiles.clear();
   includeFiles.push_back(includeFile);
@@ -20,4 +23,9 @@ EffectMetadata& EffectMetadata::AddIncludeFile(const gd::String& includeFile) {
   return *this;
 }
 
+EffectMetadata& EffectMetadata::MarkAsNotWorkingForObjects() {
+  isMarkedAsNotWorkingForObjects = true;
+  return *this;
+}
+
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -3,8 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef EFFECTMETADATA_H
+#define EFFECTMETADATA_H
 #include <functional>
 #include <map>
 #include <memory>
@@ -25,25 +25,21 @@ class GD_CORE_API EffectMetadata {
   /**
    * \brief Construct an effect metadata, with the given type
    */
-   EffectMetadata(const gd::String &type_)
-       : type(type_), isMarkedAsNotWorkingForObjects(false),
-         isMarkedAsOnlyWorkingFor2D(false), isMarkedAsOnlyWorkingFor3D(false),
-         isMarkedAsUnique(false) {}
+  EffectMetadata(const gd::String& type_);
 
-   /**
-    * \brief Default constructor, only used for initializing
-    * `badEffectMetadata`.
-    */
-   EffectMetadata() {}
+  /**
+   * \brief Default constructor, only used for initializing `badEffectMetadata`.
+   */
+  EffectMetadata() {}
 
-   virtual ~EffectMetadata(){};
+  virtual ~EffectMetadata(){};
 
-   /**
-    * \brief Set the name shown to the user.
-    */
-   EffectMetadata &SetFullName(const gd::String &fullname_) {
-     fullname = fullname_;
-     return *this;
+  /**
+   * \brief Set the name shown to the user.
+   */
+  EffectMetadata& SetFullName(const gd::String& fullname_) {
+    fullname = fullname_;
+    return *this;
   };
 
   /**
@@ -73,6 +69,11 @@ class GD_CORE_API EffectMetadata {
    */
   EffectMetadata& AddIncludeFile(const gd::String& includeFile);
 
+  /**
+   * \brief Mark the effect as not working as an object effect.
+   */
+  EffectMetadata& MarkAsNotWorkingForObjects();
+
   /**
    * \brief Return a reference to the properties of this effect.
    */
@@ -116,65 +117,10 @@ class GD_CORE_API EffectMetadata {
     return includeFiles;
   }
 
-  /**
-   * \brief Mark the effect as not working as an object effect.
-   */
-  EffectMetadata& MarkAsNotWorkingForObjects() {
-    isMarkedAsNotWorkingForObjects = true;
-    return *this;
-  }
-
-  /**
-   * \brief Mark the effect as only working for the 2D renderer.
-   */
-  EffectMetadata& MarkAsOnlyWorkingFor2D() {
-    isMarkedAsOnlyWorkingFor2D = true;
-    return *this;
-  }
-
-  /**
-   * \brief Mark the effect as only working for the 3D renderer.
-   */
-  EffectMetadata& MarkAsOnlyWorkingFor3D() {
-    isMarkedAsOnlyWorkingFor3D = true;
-    return *this;
-  }
-
-  /**
-   * \brief Mark the effect as only addable once.
-   */
-  EffectMetadata& MarkAsUnique() {
-    isMarkedAsUnique = true;
-    return *this;
-  }
-
   /**
    * \brief Check if the effect is marked as not working as an object effect.
    */
-  bool IsMarkedAsNotWorkingForObjects() const {
-    return isMarkedAsNotWorkingForObjects;
-  };
-
-  /**
-   * \brief Check if the effect is marked as only working for the 2D renderer.
-   */
-  bool IsMarkedAsOnlyWorkingFor2D() const {
-    return isMarkedAsOnlyWorkingFor2D;
-  };
-
-  /**
-   * \brief Check if the effect is marked as only working for the 3D renderer.
-   */
-  bool IsMarkedAsOnlyWorkingFor3D() const {
-    return isMarkedAsOnlyWorkingFor3D;
-  };
-
-  /**
-   * \brief Check if the effect can only be added once.
-   */
-  bool IsMarkedAsUnique() const {
-    return isMarkedAsUnique;
-  };
+  bool IsMarkedAsNotWorkingForObjects() const { return isMarkedAsNotWorkingForObjects; };
 
  private:
   gd::String extensionNamespace;
@@ -184,10 +130,8 @@ class GD_CORE_API EffectMetadata {
   gd::String description;
   std::vector<gd::String> includeFiles;
   bool isMarkedAsNotWorkingForObjects;
-  bool isMarkedAsOnlyWorkingFor2D;
-  bool isMarkedAsOnlyWorkingFor3D;
-  bool isMarkedAsUnique;
   std::map<gd::String, gd::PropertyDescriptor> properties;
 };
 
 }  // namespace gd
+#endif  // EFFECTMETADATA_H

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -3,10 +3,9 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
-#include "AbstractFunctionMetadata.h"
-
+#ifndef EXPRESSIONMETADATA_H
+#define EXPRESSIONMETADATA_H
+#if defined(GD_IDE_ONLY)
 #include <functional>
 #include <memory>
 
@@ -18,6 +17,7 @@ class Layout;
 }
 
 namespace gd {
+
 /**
  * \brief Information about how generate code for an expression
  */
@@ -27,7 +27,79 @@ class ExpressionCodeGenerationInformation {
       : staticFunction(false), hasCustomCodeGenerator(false){};
   virtual ~ExpressionCodeGenerationInformation(){};
 
-  // TODO Move these attributes to ExpressionMetadata.
+  /**
+   * \brief Set the function name which will be used when generating the code.
+   * \param functionName the name of the function to call
+   */
+  ExpressionCodeGenerationInformation& SetFunctionName(
+      const gd::String& functionName) {
+    functionCallName = functionName;
+    return *this;
+  }
+
+  /**
+   * \brief Set that the function is static
+   */
+  ExpressionCodeGenerationInformation& SetStatic() {
+    staticFunction = true;
+    return *this;
+  }
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  ExpressionCodeGenerationInformation& SetIncludeFile(
+      const gd::String& includeFile) {
+    includeFiles.clear();
+    includeFiles.push_back(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  ExpressionCodeGenerationInformation& AddIncludeFile(
+      const gd::String& includeFile) {
+    if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
+        includeFiles.end())
+      includeFiles.push_back(includeFile);
+
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return includeFiles;
+  };
+
+  /**
+   * \brief Set that the function must be generated using a custom code
+   * generator.
+   */
+  ExpressionCodeGenerationInformation& SetCustomCodeGenerator(
+      std::function<gd::String(const std::vector<gd::Expression>& parameters,
+                               gd::EventsCodeGenerator& codeGenerator,
+                               gd::EventsCodeGenerationContext& context)>
+          codeGenerator) {
+    hasCustomCodeGenerator = true;
+    customCodeGenerator = codeGenerator;
+    return *this;
+  }
+
+  ExpressionCodeGenerationInformation& RemoveCustomCodeGenerator() {
+    hasCustomCodeGenerator = false;
+    std::function<gd::String(const std::vector<gd::Expression>& parameters,
+                             gd::EventsCodeGenerator& codeGenerator,
+                             gd::EventsCodeGenerationContext& context)>
+        emptyFunction;
+    customCodeGenerator = emptyFunction;
+    return *this;
+  }
+
+  bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
+
   bool staticFunction;
   gd::String functionCallName;
   bool hasCustomCodeGenerator;
@@ -35,6 +107,8 @@ class ExpressionCodeGenerationInformation {
                            gd::EventsCodeGenerator& codeGenerator,
                            gd::EventsCodeGenerationContext& context)>
       customCodeGenerator;
+
+ private:
   std::vector<gd::String> includeFiles;
 };
 
@@ -44,7 +118,7 @@ class ExpressionCodeGenerationInformation {
  *
  * \ingroup Events
  */
-class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
+class GD_CORE_API ExpressionMetadata {
  public:
   /**
    * Construct a new expression metadata.
@@ -70,7 +144,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * \brief Set the expression as not shown in the IDE.
    */
-  ExpressionMetadata& SetHidden() override;
+  ExpressionMetadata& SetHidden();
 
   /**
    * \brief Set the group of the instruction in the IDE.
@@ -105,7 +179,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    * Set that the instruction is private - it can't be used outside of the
    * object/ behavior that it is attached too.
    */
-  ExpressionMetadata& SetPrivate() override {
+  ExpressionMetadata& SetPrivate() {
     isPrivate = true;
     return *this;
   }
@@ -142,7 +216,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in layouts or external events.
    */
-  ExpressionMetadata &SetRelevantForLayoutEventsOnly() override {
+  ExpressionMetadata &SetRelevantForLayoutEventsOnly() {
     relevantContext = "Layout";
     return *this;
   }
@@ -150,7 +224,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in function events.
    */
-  ExpressionMetadata &SetRelevantForFunctionEventsOnly() override {
+  ExpressionMetadata &SetRelevantForFunctionEventsOnly() {
     relevantContext = "Function";
     return *this;
   }
@@ -158,7 +232,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in asynchronous function events.
    */
-  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
+  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
     relevantContext = "AsynchronousFunction";
     return *this;
   }
@@ -166,7 +240,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in custom object events.
    */
-  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() override {
+  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() {
     relevantContext = "Object";
     return *this;
   }
@@ -174,17 +248,17 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * \see gd::InstructionMetadata::AddParameter
    */
-  gd::ExpressionMetadata &
-  AddParameter(const gd::String &type, const gd::String &label,
-               const gd::String &supplementaryInformation = "",
-               bool parameterIsOptional = false) override;
+  gd::ExpressionMetadata& AddParameter(
+      const gd::String& type,
+      const gd::String& description,
+      const gd::String& supplementaryInformation = "",
+      bool parameterIsOptional = false);
 
   /**
    * \see gd::InstructionMetadata::AddCodeOnlyParameter
    */
-  gd::ExpressionMetadata &
-  AddCodeOnlyParameter(const gd::String &type,
-                       const gd::String &supplementaryInformation) override;
+  gd::ExpressionMetadata& AddCodeOnlyParameter(
+      const gd::String& type, const gd::String& supplementaryInformation);
 
   /**
    * Set the default value used in editor (or if an optional parameter is empty
@@ -192,9 +266,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
-    if (!parameters.empty())
-      parameters.back().SetDefaultValue(defaultValue);
+  ExpressionMetadata& SetDefaultValue(gd::String defaultValue_) {
+    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
 
@@ -204,8 +277,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &
-  SetParameterLongDescription(const gd::String &longDescription) override {
+  ExpressionMetadata& SetParameterLongDescription(gd::String longDescription) {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
@@ -218,8 +290,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &SetParameterExtraInfo(
-      const gd::String &extraInfo) override {
+  ExpressionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
@@ -241,6 +312,50 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
     return requiredBaseObjectCapability;
   };
 
+  /**
+   * \brief Set the function that should be called when generating the source
+   * code from events.
+   * \param functionName the name of the function to call
+   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
+   */
+  ExpressionCodeGenerationInformation& SetFunctionName(
+      const gd::String& functionName) {
+    return codeExtraInformation.SetFunctionName(functionName);
+  }
+
+  /**
+   * \brief Return the structure containing the information about code
+   * generation for the expression.
+   */
+  ExpressionCodeGenerationInformation& GetCodeExtraInformation() {
+    return codeExtraInformation;
+  }
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  ExpressionMetadata &SetIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.SetIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  ExpressionMetadata &AddIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.AddIncludeFile(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const {
+    return codeExtraInformation.GetIncludeFiles();
+  }
+
+  ExpressionCodeGenerationInformation codeExtraInformation;
+
   bool IsShown() const { return shown; }
   const gd::String& GetReturnType() const { return returnType; }
   const gd::String& GetFullName() const { return fullname; }
@@ -260,99 +375,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 
   std::vector<gd::ParameterMetadata> parameters;
 
-  
-  /**
-   * \brief Set the function name which will be used when generating the code.
-   * \param functionName the name of the function to call
-   */
-  ExpressionMetadata& SetFunctionName(
-      const gd::String& functionName) override {
-    codeExtraInformation.functionCallName = functionName;
-    return *this;
-  }
-
-
-  /**
-   * \brief Return the name of the function which will be called in the generated code.
-   */
-  const gd::String &GetFunctionName() {
-    return codeExtraInformation.functionCallName;
-  }
-  /**
-   * \brief Set that the function is static
-   */
-  ExpressionMetadata& SetStatic() {
-    codeExtraInformation.staticFunction = true;
-    return *this;
-  }
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   */
-  ExpressionMetadata& SetIncludeFile(
-      const gd::String& includeFile) override {
-    codeExtraInformation.includeFiles.clear();
-    codeExtraInformation.includeFiles.push_back(includeFile);
-    return *this;
-  }
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  ExpressionMetadata& AddIncludeFile(
-      const gd::String& includeFile) override {
-    if (std::find(codeExtraInformation.includeFiles.begin(), codeExtraInformation.includeFiles.end(), includeFile) ==
-        codeExtraInformation.includeFiles.end())
-      codeExtraInformation.includeFiles.push_back(includeFile);
-
-    return *this;
-  }
-
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  const std::vector<gd::String>& GetIncludeFiles() const override {
-    return codeExtraInformation.includeFiles;
-  };
-
-  /**
-   * \brief Set that the function must be generated using a custom code
-   * generator.
-   */
-  ExpressionMetadata& SetCustomCodeGenerator(
-      std::function<gd::String(const std::vector<gd::Expression>& parameters,
-                               gd::EventsCodeGenerator& codeGenerator,
-                               gd::EventsCodeGenerationContext& context)>
-          codeGenerator) {
-    codeExtraInformation.hasCustomCodeGenerator = true;
-    codeExtraInformation.customCodeGenerator = codeGenerator;
-    return *this;
-  }
-
-  ExpressionMetadata& RemoveCustomCodeGenerator() {
-    codeExtraInformation.hasCustomCodeGenerator = false;
-    std::function<gd::String(const std::vector<gd::Expression>& parameters,
-                             gd::EventsCodeGenerator& codeGenerator,
-                             gd::EventsCodeGenerationContext& context)>
-        emptyFunction;
-    codeExtraInformation.customCodeGenerator = emptyFunction;
-    return *this;
-  }
-
-  bool HasCustomCodeGenerator() const { return codeExtraInformation.hasCustomCodeGenerator; }
-
-  /**
-   * \brief Return the structure containing the information about code
-   * generation for the expression.
-   * 
-   * \deprecated
-   */
-  ExpressionMetadata& GetCodeExtraInformation() {
-    return *this;
-  }
-
-  ExpressionCodeGenerationInformation codeExtraInformation;
-
  private:
   gd::String returnType;
   gd::String fullname;
@@ -369,3 +391,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 };
 
 }  // namespace gd
+
+#endif
+#endif  // EXPRESSIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -4,10 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
-#include "AbstractFunctionMetadata.h"
-
+#ifndef INSTRUCTIONMETADATA_H
+#define INSTRUCTIONMETADATA_H
 #include <algorithm>
 #include <functional>
 #include <map>
@@ -35,7 +33,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
+class GD_CORE_API InstructionMetadata {
  public:
   /**
    * Construct a new instruction metadata.
@@ -98,7 +96,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * Set that the instruction is private - it can't be used outside of the
    * object/ behavior that it is attached too.
    */
-  InstructionMetadata &SetPrivate() override {
+  InstructionMetadata &SetPrivate() {
     isPrivate = true;
     return *this;
   }
@@ -135,7 +133,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in layouts or external events.
    */
-  InstructionMetadata &SetRelevantForLayoutEventsOnly() override {
+  InstructionMetadata &SetRelevantForLayoutEventsOnly() {
     relevantContext = "Layout";
     return *this;
   }
@@ -143,7 +141,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in function events.
    */
-  InstructionMetadata &SetRelevantForFunctionEventsOnly() override {
+  InstructionMetadata &SetRelevantForFunctionEventsOnly() {
     relevantContext = "Function";
     return *this;
   }
@@ -151,7 +149,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in asynchronous function events.
    */
-  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
+  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
     relevantContext = "AsynchronousFunction";
     return *this;
   }
@@ -159,7 +157,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * Set that the instruction can be used in custom object events.
    */
-  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() override {
+  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() {
     relevantContext = "Object";
     return *this;
   }
@@ -194,7 +192,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    *
    * Used mainly when an instruction is deprecated.
    */
-  InstructionMetadata &SetHidden() override {
+  InstructionMetadata &SetHidden() {
     hidden = true;
     return *this;
   }
@@ -233,7 +231,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
       const gd::String &type,
       const gd::String &label,
       const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false) override;
+      bool parameterIsOptional = false);
 
   /**
    * \brief Add a parameter not displayed in editor.
@@ -247,7 +245,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see EventsCodeGenerator::GenerateParametersCodes
    */
   InstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation) override;
+      const gd::String &type, const gd::String &supplementaryInformation);
 
   /**
    * \brief Set the default value used in editor (or if an optional parameter is
@@ -255,7 +253,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) override {
+  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) {
     if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
@@ -267,7 +265,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) override {
+      const gd::String &longDescription) {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
@@ -280,7 +278,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) override {
+  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
@@ -384,13 +382,128 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   /**
    * \brief Defines information about how generate the code for an instruction
    */
-  class ExtraInformation { 
+  class ExtraInformation {
    public:
     enum AccessType { Reference, MutatorAndOrAccessor, Mutators };
     ExtraInformation() : accessType(Reference), hasCustomCodeGenerator(false){};
     virtual ~ExtraInformation(){};
 
-    // TODO Move these attributes to InstructionMetadata.
+    /**
+     * Set the name of the function which will be called in the generated code.
+     * \param functionName the name of the function to call.
+     */
+    ExtraInformation &SetFunctionName(const gd::String &functionName_) {
+      functionCallName = functionName_;
+      return *this;
+    }
+
+    /**
+     * Set the name of the function, doing asynchronous work, which will be
+     * called in the generated code. This function should return an asynchronous
+     * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+     *
+     * \param functionName the name of the function doing asynchronous work to
+     * call.
+     */
+    ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
+      asyncFunctionCallName = functionName_;
+      return *this;
+    }
+
+    /**
+     * Declare if the instruction being declared is somewhat manipulating in a
+     * standard way.
+     */
+    ExtraInformation &SetManipulatedType(const gd::String &type_) {
+      type = type_;
+      return *this;
+    }
+
+    /**
+     * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
+     * with "number" or "string", this function will tell the code generator the
+     * name of the getter function used to retrieve the data value.
+     *
+     * Usage example:
+     * \code
+     *  obj.AddAction("String",
+     *                 _("Change the string"),
+     *                 _("Change the string of a text"),
+     *                 _("the string"),
+     *                 _("Text"),
+     *                 "CppPlatform/Extensions/text24.png",
+     *                 "CppPlatform/Extensions/text_black.png");
+     *
+     *      .AddParameter("object", _("Object"), "Text", false)
+     *      .AddParameter("operator", _("Modification operator"), "string")
+     *      .AddParameter("string", _("String"))
+     *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
+     *
+     *  DECLARE_END_OBJECT_ACTION()
+     * \endcode
+     */
+    ExtraInformation &SetGetter(const gd::String &getter) {
+      optionalAssociatedInstruction = getter;
+      accessType = MutatorAndOrAccessor;
+      return *this;
+    }
+
+    ExtraInformation &SetMutators(
+        const std::map<gd::String, gd::String> &mutators) {
+      optionalMutators = mutators;
+      accessType = Mutators;
+      return *this;
+    }
+
+    /**
+     * \brief Erase any existing include file and add the specified include.
+     */
+    ExtraInformation &SetIncludeFile(const gd::String &includeFile) {
+      includeFiles.clear();
+      includeFiles.push_back(includeFile);
+      return *this;
+    }
+
+    /**
+     * \brief Add a file to the already existing include files.
+     */
+    ExtraInformation &AddIncludeFile(const gd::String &includeFile) {
+      if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
+          includeFiles.end())
+        includeFiles.push_back(includeFile);
+
+      return *this;
+    }
+
+    /**
+     * \brief Get the files that must be included to use the instruction.
+     */
+    const std::vector<gd::String> &GetIncludeFiles() const {
+      return includeFiles;
+    };
+
+    ExtraInformation &SetCustomCodeGenerator(
+        std::function<gd::String(Instruction &instruction,
+                                 gd::EventsCodeGenerator &codeGenerator,
+                                 gd::EventsCodeGenerationContext &context)>
+            codeGenerator) {
+      hasCustomCodeGenerator = true;
+      customCodeGenerator = codeGenerator;
+      return *this;
+    }
+
+    ExtraInformation &RemoveCustomCodeGenerator() {
+      hasCustomCodeGenerator = false;
+      std::function<gd::String(Instruction & instruction,
+                               gd::EventsCodeGenerator & codeGenerator,
+                               gd::EventsCodeGenerationContext & context)>
+          emptyFunction;
+      customCodeGenerator = emptyFunction;
+      return *this;
+    }
+
+    bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
+
     gd::String functionCallName;
     gd::String asyncFunctionCallName;
     gd::String type;
@@ -399,156 +512,75 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
     std::map<gd::String, gd::String> optionalMutators;
     bool hasCustomCodeGenerator;
     std::function<gd::String(Instruction &instruction,
-                              gd::EventsCodeGenerator &codeGenerator,
-                              gd::EventsCodeGenerationContext &context)>
+                             gd::EventsCodeGenerator &codeGenerator,
+                             gd::EventsCodeGenerationContext &context)>
         customCodeGenerator;
+
+   private:
     std::vector<gd::String> includeFiles;
   };
   ExtraInformation codeExtraInformation;  ///< Information about how generate
                                           ///< code for the instruction
 
+  /**
+   * \brief Return the structure containing the information about code
+   * generation for the instruction.
+   */
+  ExtraInformation &GetCodeExtraInformation() { return codeExtraInformation; }
+
+  /**
+   * \brief Declare if the instruction being declared is somewhat manipulating
+   * in a standard way. \param type "number" or "string" \note Shortcut for
+   * `codeExtraInformation.SetManipulatedType(type)`.
+   */
+  ExtraInformation &SetManipulatedType(const gd::String &type_) {
+    return codeExtraInformation.SetManipulatedType(type_);
+  }
+
   /**
    * Set the name of the function which will be called in the generated code.
    * \param functionName the name of the function to call.
+   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
    */
-  InstructionMetadata &SetFunctionName(const gd::String &functionName_) override {
-    codeExtraInformation.functionCallName = functionName_;
-    return *this;
+  ExtraInformation &SetFunctionName(const gd::String &functionName) {
+    return codeExtraInformation.SetFunctionName(functionName);
   }
 
   /**
-   * Set the name of the function, doing asynchronous work, which will be
-   * called in the generated code. This function should return an asynchronous
-   * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+   * Set the name of the function, doing asynchronous work, which will be called
+   * in the generated code. This function should return an asynchronous task
+   * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
    *
    * \param functionName the name of the function doing asynchronous work to
-   * call.
+   * call. \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
    */
-  InstructionMetadata &SetAsyncFunctionName(const gd::String &functionName_) {
-    codeExtraInformation.asyncFunctionCallName = functionName_;
-    return *this;
-  }
-
-  /**
-   * Return the name of the function which will be called in the generated code.
-   */
-  const gd::String &GetFunctionName() {
-    return codeExtraInformation.functionCallName;
-  }
-
-  /**
-   * Return the name of the function, doing asynchronous work, which will be
-   * called in the generated code. This function should return an asynchronous
-   * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
-   */
-  const gd::String &GetAsyncFunctionName() {
-    return codeExtraInformation.asyncFunctionCallName;
-  }
-
-/**
- * \brief Declare if the instruction being declared is somewhat manipulating
- * in a standard way.
- * 
- * \param type "number" or "string"
- */
-  InstructionMetadata &SetManipulatedType(const gd::String &type_) {
-    codeExtraInformation.type = type_;
-    return *this;
-  }
-
-  /**
-   * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
-   * with "number" or "string", this function will tell the code generator the
-   * name of the getter function used to retrieve the data value.
-   *
-   * Usage example:
-   * \code
-   *  obj.AddAction("String",
-   *                 _("Change the string"),
-   *                 _("Change the string of a text"),
-   *                 _("the string"),
-   *                 _("Text"),
-   *                 "CppPlatform/Extensions/text24.png",
-   *                 "CppPlatform/Extensions/text_black.png");
-   *
-   *      .AddParameter("object", _("Object"), "Text", false)
-   *      .AddParameter("operator", _("Modification operator"), "string")
-   *      .AddParameter("string", _("String"))
-   *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
-   *
-   *  DECLARE_END_OBJECT_ACTION()
-   * \endcode
-   */
-  InstructionMetadata &SetGetter(const gd::String &getter) {
-    codeExtraInformation.optionalAssociatedInstruction = getter;
-    codeExtraInformation.accessType = codeExtraInformation.MutatorAndOrAccessor;
-    return *this;
-  }
-
-  InstructionMetadata &SetMutators(
-      const std::map<gd::String, gd::String> &mutators) {
-    codeExtraInformation.optionalMutators = mutators;
-    codeExtraInformation.accessType = codeExtraInformation.Mutators;
-    return *this;
+  ExtraInformation &SetAsyncFunctionName(const gd::String &functionName) {
+    return codeExtraInformation.SetAsyncFunctionName(functionName);
   }
 
   /**
    * \brief Erase any existing include file and add the specified include.
    */
-  InstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
-    codeExtraInformation.includeFiles.clear();
-    codeExtraInformation.includeFiles.push_back(includeFile);
+  InstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.SetIncludeFile(includeFile);
     return *this;
   }
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  InstructionMetadata &AddIncludeFile(const gd::String &includeFile) override {
-    if (std::find(codeExtraInformation.includeFiles.begin(), codeExtraInformation.includeFiles.end(), includeFile) ==
-        codeExtraInformation.includeFiles.end())
-      codeExtraInformation.includeFiles.push_back(includeFile);
-
+  InstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
+    codeExtraInformation.AddIncludeFile(includeFile);
     return *this;
   }
 
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String> &GetIncludeFiles() const override {
-    return codeExtraInformation.includeFiles;
+  const std::vector<gd::String> &GetIncludeFiles() const {
+    return codeExtraInformation.GetIncludeFiles();
   };
 
-  InstructionMetadata &SetCustomCodeGenerator(
-      std::function<gd::String(Instruction &instruction,
-                                gd::EventsCodeGenerator &codeGenerator,
-                                gd::EventsCodeGenerationContext &context)>
-          codeGenerator) {
-    codeExtraInformation.hasCustomCodeGenerator = true;
-    codeExtraInformation.customCodeGenerator = codeGenerator;
-    return *this;
-  }
-
-  InstructionMetadata &RemoveCustomCodeGenerator() {
-    codeExtraInformation.hasCustomCodeGenerator = false;
-    std::function<gd::String(Instruction & instruction,
-                              gd::EventsCodeGenerator & codeGenerator,
-                              gd::EventsCodeGenerationContext & context)>
-        emptyFunction;
-    codeExtraInformation.customCodeGenerator = emptyFunction;
-    return *this;
-  }
-
-  bool HasCustomCodeGenerator() const { return codeExtraInformation.hasCustomCodeGenerator; }
-
-  /**
-   * \brief Return the structure containing the information about code
-   * generation for the instruction.
-   * 
-   * \deprecated
-   */
-  InstructionMetadata &GetCodeExtraInformation() { return *this; }
-
   std::vector<ParameterMetadata> parameters;
 
  private:
@@ -572,3 +604,5 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
 };
 
 }  // namespace gd
+
+#endif  // INSTRUCTIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -1,201 +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 <map>
-
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Behavior;
-class BehaviorsSharedData;
-class MultipleInstructionMetadata;
-class InstructionMetadata;
-class ExpressionMetadata;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Contains user-friendly information about instructions and expressions
- * (usually for a behavior or an object).
- *
- * \ingroup Events
- */
-class GD_CORE_API InstructionOrExpressionContainerMetadata {
-public:
-  InstructionOrExpressionContainerMetadata(){};
-  virtual ~InstructionOrExpressionContainerMetadata(){};
-
-  /**
-   * Declare a new condition as being part of the behavior or object.
-   * \deprecated Prefer using `AddScopedCondition`, to properly namespace
-   * the condition.
-   */
-  virtual gd::InstructionMetadata &
-  AddCondition(const gd::String &name_, const gd::String &fullname_,
-               const gd::String &description_, const gd::String &sentence_,
-               const gd::String &group_, const gd::String &icon_,
-               const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new action as being part of the behavior or object.
-   * \deprecated Prefer using `AddScopedAction`, to properly namespace
-   * the action.
-   */
-  virtual gd::InstructionMetadata &
-  AddAction(const gd::String &name_, const gd::String &fullname_,
-            const gd::String &description_, const gd::String &sentence_,
-            const gd::String &group_, const gd::String &icon_,
-            const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new condition as being part of the behavior or object.
-   */
-  virtual gd::InstructionMetadata &
-  AddScopedCondition(const gd::String &name_, const gd::String &fullname_,
-                     const gd::String &description_,
-                     const gd::String &sentence_, const gd::String &group_,
-                     const gd::String &icon_, const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new action as being part of the behavior or object.
-   */
-  virtual gd::InstructionMetadata &
-  AddScopedAction(const gd::String &name_, const gd::String &fullname_,
-                  const gd::String &description_, const gd::String &sentence_,
-                  const gd::String &group_, const gd::String &icon_,
-                  const gd::String &smallicon_) = 0;
-  /**
-   * Declare a new action as being part of the extension.
-   */
-  virtual gd::ExpressionMetadata &
-  AddExpression(const gd::String &name_, const gd::String &fullname_,
-                const gd::String &description_, const gd::String &group_,
-                const gd::String &smallicon_) = 0;
-
-  /**
-   * Declare a new string expression as being part of the extension.
-   */
-  virtual gd::ExpressionMetadata &
-  AddStrExpression(const gd::String &name_, const gd::String &fullname_,
-                   const gd::String &description_, const gd::String &group_,
-                   const gd::String &smallicon_) = 0;
-
-  /**
-   * \brief Declare a new expression and condition as being part of the
-   * behavior.
-   * \note It's recommended to use this function to avoid declaring twice a
-   * similar expression/condition.
-   */
-  virtual gd::MultipleInstructionMetadata AddExpressionAndCondition(
-      const gd::String &type, const gd::String &name,
-      const gd::String &fullname, const gd::String &description,
-      const gd::String &sentenceName, const gd::String &group,
-      const gd::String &icon) = 0;
-
-  /**
-   * \brief Declare a new expression, condition and action as being part of the
-   * behavior.
-   * \note The action name is prefixed by "Set" (and the namespace, as the
-   * condition).
-   * \note It's recommended to use this function to avoid declaring 3 times a
-   * similar expression/condition/action.
-   */
-  virtual gd::MultipleInstructionMetadata AddExpressionAndConditionAndAction(
-      const gd::String &type, const gd::String &name,
-      const gd::String &fullname, const gd::String &description,
-      const gd::String &sentenceName, const gd::String &group,
-      const gd::String &icon) = 0;
-
-  /**
-   * \brief Create a new action which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated action that is just a "copy" of the new
-   * one.
-   */
-  virtual gd::InstructionMetadata &
-  AddDuplicatedAction(const gd::String &newActionName,
-                      const gd::String &copiedActionName) = 0;
-
-  /**
-   * \brief Create a new condition which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated condition that is just a "copy" of the new
-   * one.
-   */
-  virtual gd::InstructionMetadata &
-  AddDuplicatedCondition(const gd::String &newConditionName,
-                         const gd::String &copiedConditionName) = 0;
-
-  virtual InstructionOrExpressionContainerMetadata &
-  SetFullName(const gd::String &fullname_) = 0;
-  virtual InstructionOrExpressionContainerMetadata &
-  SetDescription(const gd::String &description_) = 0;
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   * \note The requirement may vary depending on the platform: Most of the time,
-   * the include file contains the declaration of the behavior.
-   */
-  virtual InstructionOrExpressionContainerMetadata &
-  SetIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  virtual InstructionOrExpressionContainerMetadata &
-  AddIncludeFile(const gd::String &includeFile) = 0;
-
-  /**
-   * Get the help path of the behavior, relative to the GDevelop documentation
-   * root.
-   */
-  virtual const gd::String &GetHelpPath() const = 0;
-
-  /**
-   * Set the help path of the behavior, relative to the GDevelop documentation
-   * root.
-   *
-   * The behavior instructions will have this help path set by
-   * default, unless you call SetHelpPath on them.
-   */
-  virtual InstructionOrExpressionContainerMetadata &
-  SetHelpPath(const gd::String &path) = 0;
-
-  virtual const gd::String &GetName() const = 0;
-  virtual const gd::String &GetFullName() const = 0;
-  virtual const gd::String &GetDescription() const = 0;
-  virtual const gd::String &GetIconFilename() const = 0;
-
-  /**
-   * \brief Return a reference to a map containing the names of the actions
-   * (as keys) and the metadata associated with (as values).
-   */
-  virtual std::map<gd::String, gd::InstructionMetadata> &GetAllActions() = 0;
-
-  /**
-   * \see gd::PlatformExtension::GetAllActions
-   */
-  virtual std::map<gd::String, gd::InstructionMetadata> &GetAllConditions() = 0;
-
-  /**
-   * \see gd::PlatformExtension::GetAllActions
-   */
-  virtual std::map<gd::String, gd::ExpressionMetadata> &GetAllExpressions() = 0;
-
-  /**
-   * \see gd::PlatformExtension::GetAllActions
-   */
-  virtual std::map<gd::String, gd::ExpressionMetadata> &
-  GetAllStrExpressions() = 0;
-
-private:
-};
-
-} // namespace gd

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -135,11 +135,11 @@ MetadataProvider::GetExtensionAndConditionMetadata(const gd::Platform& platform,
 
     const auto& objects = extension->GetExtensionObjectsTypes();
     for (const gd::String& extObjectType : objects) {
-      const auto& allObjectsConditions =
+      const auto& allObjetsConditions =
           extension->GetAllConditionsForObject(extObjectType);
-      if (allObjectsConditions.find(conditionType) != allObjectsConditions.end())
+      if (allObjetsConditions.find(conditionType) != allObjetsConditions.end())
         return ExtensionAndMetadata<InstructionMetadata>(
-            *extension, allObjectsConditions.find(conditionType)->second);
+            *extension, allObjetsConditions.find(conditionType)->second);
     }
 
     const auto& autos = extension->GetBehaviorsTypes();

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.cpp

@@ -0,0 +1,12 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "MultipleInstructionMetadata.h"
+
+#include "InstructionMetadata.h"
+
+namespace gd {
+
+}  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -3,8 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef MULTIPLEINSTRUCTIONSMETADATA_H
+#define MULTIPLEINSTRUCTIONSMETADATA_H
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
@@ -21,7 +21,7 @@ namespace gd {
  *
  * \ingroup PlatformDefinition
  */
-class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata {
+class GD_CORE_API MultipleInstructionMetadata {
  public:
   static MultipleInstructionMetadata WithExpressionAndCondition(
       gd::ExpressionMetadata &expression, gd::InstructionMetadata &condition) {
@@ -45,7 +45,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
       const gd::String &type,
       const gd::String &label,
       const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false) override {
+      bool parameterIsOptional = false) {
     if (expression)
       expression->AddParameter(
           type, label, supplementaryInformation, parameterIsOptional);
@@ -62,7 +62,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
    * \see gd::InstructionMetadata::AddCodeOnlyParameter
    */
   MultipleInstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation) override {
+      const gd::String &type, const gd::String &supplementaryInformation) {
     if (expression)
       expression->AddCodeOnlyParameter(type, supplementaryInformation);
     if (condition)
@@ -74,7 +74,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
   /**
    * \see gd::InstructionMetadata::SetDefaultValue
    */
-  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
+  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) {
     if (expression) expression->SetDefaultValue(defaultValue);
     if (condition) condition->SetDefaultValue(defaultValue);
     if (action) action->SetDefaultValue(defaultValue);
@@ -85,7 +85,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
    * \see gd::InstructionMetadata::SetParameterExtraInfo
    */
   MultipleInstructionMetadata &SetParameterExtraInfo(
-      const gd::String &defaultValue) override {
+      const gd::String &defaultValue) {
     if (expression) expression->SetParameterExtraInfo(defaultValue);
     if (condition) condition->SetParameterExtraInfo(defaultValue);
     if (action) action->SetParameterExtraInfo(defaultValue);
@@ -96,7 +96,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
    * \see gd::InstructionMetadata::SetParameterLongDescription
    */
   MultipleInstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) override {
+      const gd::String &longDescription) {
     if (expression) expression->SetParameterLongDescription(longDescription);
     if (condition) condition->SetParameterLongDescription(longDescription);
     if (action) action->SetParameterLongDescription(longDescription);
@@ -106,7 +106,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
   /**
    * \see gd::InstructionMetadata::SetHidden
    */
-  MultipleInstructionMetadata &SetHidden() override {
+  MultipleInstructionMetadata &SetHidden() {
     if (expression) expression->SetHidden();
     if (condition) condition->SetHidden();
     if (action) action->SetHidden();
@@ -136,47 +136,47 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) override {
+  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) {
     if (expression) expression->SetFunctionName(functionName);
     if (condition) condition->SetFunctionName(functionName);
-    if (action) action->SetFunctionName(functionName);
+    if (action) action->GetCodeExtraInformation().SetFunctionName(functionName);
     return *this;
   }
 
   MultipleInstructionMetadata &SetGetter(const gd::String &getter) {
     if (expression) expression->SetFunctionName(getter);
     if (condition) condition->SetFunctionName(getter);
-    if (action) action->SetGetter(getter);
+    if (action) action->GetCodeExtraInformation().SetGetter(getter);
     return *this;
   }
 
-  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
+  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
     if (expression)
-      expression->SetIncludeFile(includeFile);
+      expression->GetCodeExtraInformation().SetIncludeFile(includeFile);
     if (condition)
-      condition->SetIncludeFile(includeFile);
-    if (action) action->SetIncludeFile(includeFile);
+      condition->GetCodeExtraInformation().SetIncludeFile(includeFile);
+    if (action) action->GetCodeExtraInformation().SetIncludeFile(includeFile);
     return *this;
   }
 
-  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) override {
+  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
     if (expression)
       expression->GetCodeExtraInformation().AddIncludeFile(includeFile);
     if (condition)
-      condition->AddIncludeFile(includeFile);
-    if (action) action->AddIncludeFile(includeFile);
+      condition->GetCodeExtraInformation().AddIncludeFile(includeFile);
+    if (action) action->GetCodeExtraInformation().AddIncludeFile(includeFile);
     return *this;
   }
 
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String> &GetIncludeFiles() const override {
+  const std::vector<gd::String> &GetIncludeFiles() const {
     if (expression)
       return expression->GetCodeExtraInformation().GetIncludeFiles();
     if (condition)
-      return condition->GetIncludeFiles();
-    if (action) return action->GetIncludeFiles();
+      return condition->GetCodeExtraInformation().GetIncludeFiles();
+    if (action) return action->GetCodeExtraInformation().GetIncludeFiles();
     // It can't actually happen.
     throw std::logic_error("no instruction metadata");
   }
@@ -184,7 +184,7 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
   /**
    * \see gd::InstructionMetadata::SetPrivate
    */
-  MultipleInstructionMetadata &SetPrivate() override {
+  MultipleInstructionMetadata &SetPrivate() {
     if (expression) expression->SetPrivate();
     if (condition) condition->SetPrivate();
     if (action) action->SetPrivate();
@@ -218,42 +218,6 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  /**
-   * Set that the instruction can be used in layouts or external events.
-   */
-  MultipleInstructionMetadata &SetRelevantForLayoutEventsOnly() override {
-    if (condition) condition->SetRelevantForLayoutEventsOnly();
-    if (action) action->SetRelevantForLayoutEventsOnly();
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in function events.
-   */
-  MultipleInstructionMetadata &SetRelevantForFunctionEventsOnly() override {
-    if (condition) condition->SetRelevantForFunctionEventsOnly();
-    if (action) action->SetRelevantForFunctionEventsOnly();
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in asynchronous function events.
-   */
-  MultipleInstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
-    if (condition) condition->SetRelevantForAsynchronousFunctionEventsOnly();
-    if (action) action->SetRelevantForAsynchronousFunctionEventsOnly();
-    return *this;
-  }
-
-  /**
-   * Set that the instruction can be used in custom object events.
-   */
-  MultipleInstructionMetadata &SetRelevantForCustomObjectEventsOnly() override {
-    if (condition) condition->SetRelevantForCustomObjectEventsOnly();
-    if (action) action->SetRelevantForCustomObjectEventsOnly();
-    return *this;
-  }
-
   /**
    * \brief Don't use, only here to fulfill Emscripten bindings requirements.
    */
@@ -278,3 +242,5 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
 };
 
 }  // namespace gd
+
+#endif  // MULTIPLEINSTRUCTIONSMETADATA_H

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -3,10 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
-#include "InstructionOrExpressionContainerMetadata.h"
-
+#ifndef OBJECTMETADATA_H
+#define OBJECTMETADATA_H
 #include <functional>
 #include <map>
 #include <set>
@@ -34,7 +32,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetadata {
+class GD_CORE_API ObjectMetadata {
  public:
   /**
    * \brief Construct an object metadata, using a "blueprint" object that will
@@ -59,7 +57,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   /**
    * \brief Construct an object metadata, with a function that will be called
-   * to instantiate a new object.
+   * to instanciate a new object.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -81,7 +79,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                         const gd::String& sentence_,
                                         const gd::String& group_,
                                         const gd::String& icon_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
 
   /**
    * \brief Declare a new action as being part of the extension.
@@ -94,7 +92,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                      const gd::String& sentence_,
                                      const gd::String& group_,
                                      const gd::String& icon_,
-                                     const gd::String& smallicon_) override;
+                                     const gd::String& smallicon_);
 
   /**
    * Declare a new condition as being part of the object.
@@ -105,7 +103,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                               const gd::String& sentence_,
                                               const gd::String& group_,
                                               const gd::String& icon_,
-                                              const gd::String& smallicon_) override;
+                                              const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the object.
@@ -116,7 +114,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                            const gd::String& sentence_,
                                            const gd::String& group_,
                                            const gd::String& icon_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
 
   /**
    * \brief Declare a new expression as being part of the extension.
@@ -125,7 +123,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                         const gd::String& fullname_,
                                         const gd::String& description_,
                                         const gd::String& group_,
-                                        const gd::String& smallicon_) override;
+                                        const gd::String& smallicon_);
   /**
    * \brief Declare a new string expression as being part of the extension.
    */
@@ -133,7 +131,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                                            const gd::String& fullname_,
                                            const gd::String& description_,
                                            const gd::String& group_,
-                                           const gd::String& smallicon_) override;
+                                           const gd::String& smallicon_);
 
   /**
    * \brief Declare a new expression and condition as being part of the
@@ -148,7 +146,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Declare a new expression, condition and action as being part of the
@@ -165,7 +163,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon) override;
+      const gd::String& icon);
 
   /**
    * \brief Create a new action which is the duplicate of the specified one.
@@ -174,7 +172,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * one.
    */
   gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName) override;
+      const gd::String& newActionName, const gd::String& copiedActionName);
 
   /**
    * \brief Create a new condition which is the duplicate of the specified one.
@@ -184,23 +182,23 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName) override;
+      const gd::String& copiedConditionName);
 
   /**
    * \brief Set the name shown to the user.
    */
-  ObjectMetadata& SetFullName(const gd::String& fullname_) override;
+  ObjectMetadata& SetFullName(const gd::String& fullname_);
 
   /**
    * \brief Set the description shown to the user.
    */
-  ObjectMetadata& SetDescription(const gd::String& description_) override;
+  ObjectMetadata& SetDescription(const gd::String& description_);
 
   /**
    * \brief Get the help path of the object, relative to the GDevelop
    * documentation root.
    */
-  const gd::String& GetHelpPath() const override { return helpPath; }
+  const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
    * \brief Set the help path of the object, relative to the GDevelop
@@ -209,7 +207,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * The object instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  ObjectMetadata& SetHelpPath(const gd::String& path) override {
+  ObjectMetadata& SetHelpPath(const gd::String& path) {
     helpPath = path;
     return *this;
   }
@@ -226,7 +224,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   /**
    * \brief The "capabilities" that are offered by the base object that are
    * *not* supported by this object, and should be hidden in the editor
-   * interface.
+   * inferface.
    */
   const std::set<gd::String>& GetUnsupportedBaseObjectCapabilities() const {
     return unsupportedBaseObjectCapabilities;
@@ -234,7 +232,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   /**
    * \brief Add a "capability" that is offered by the base object that is *not*
-   * supported by this object, and should be hidden in the editor interface.
+   * supported by this object, and should be hidden in the editor inferface.
    */
   ObjectMetadata& AddUnsupportedBaseObjectCapability(
       const gd::String& capability) {
@@ -244,18 +242,18 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   /**
    * \brief Check if a "capability" that is offered by the base object is *not*
-   * supported by this object, and should be hidden in the editor interface.
+   * supported by this object, and should be hidden in the editor inferface.
    */
   bool IsUnsupportedBaseObjectCapability(const gd::String& capability) const {
     return unsupportedBaseObjectCapabilities.find(capability) != unsupportedBaseObjectCapabilities.end();
   }
 
-  const gd::String& GetName() const override { return name; }
-  const gd::String& GetFullName() const override { return fullname; }
+  const gd::String& GetName() const { return name; }
+  const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetCategoryFullName() const { return categoryFullName; }
   const gd::String& GetHelpUrl() const { return helpUrl; }
-  const gd::String& GetDescription() const override { return description; }
-  const gd::String& GetIconFilename() const override { return iconFilename; }
+  const gd::String& GetDescription() const { return description; }
+  const gd::String& GetIconFilename() const { return iconFilename; }
 
   /**
    * \brief Set the URL pointing to the help page about this object
@@ -269,33 +267,33 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
    */
-  ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
+  ObjectMetadata& SetIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  ObjectMetadata& AddIncludeFile(const gd::String& includeFile) override;
+  ObjectMetadata& AddIncludeFile(const gd::String& includeFile);
 
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() override { return actionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { return actionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() override { return conditionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() override { return expressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
   /**
    * \brief Set the object to be hidden in the IDE.
@@ -343,3 +341,4 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 };
 
 }  // namespace gd
+#endif  // OBJECTMETADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -209,10 +209,10 @@ class GD_CORE_API ParameterMetadata {
    * \brief Return the expression type from the parameter type.
    * Declinations of "number" and "string" types (like "forceMultiplier" or
    * "sceneName") are replaced by "number" and "string".
-   * \deprecated Use gd::ValueTypeMetadata or gd::GetExpressionPrimitiveValueType instead.
+   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static const gd::String &GetExpressionValueType(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(parameterType);
+    return gd::ValueTypeMetadata::GetPrimitiveValueType(parameterType);
   }
 
   /** \name Serialization

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -35,40 +35,17 @@ void ValueTypeMetadata::UnserializeFrom(const SerializerElement& element) {
 
 const gd::String ValueTypeMetadata::numberType = "number";
 const gd::String ValueTypeMetadata::stringType = "string";
-const gd::String ValueTypeMetadata::variableType = "variable";
-const gd::String ValueTypeMetadata::booleanType = "boolean";
 
-const gd::String &ValueTypeMetadata::GetExpressionPrimitiveValueType(
-    const gd::String &parameterType) {
-  if (parameterType == "number" ||
-      gd::ValueTypeMetadata::IsTypeExpression("number", parameterType)) {
+const gd::String &ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
+  if (parameterType == "number" || gd::ValueTypeMetadata::IsTypeExpression("number", parameterType)) {
     return ValueTypeMetadata::numberType;
   }
-  if (parameterType == "string" ||
-      gd::ValueTypeMetadata::IsTypeExpression("string", parameterType)) {
+  if (parameterType == "string" || gd::ValueTypeMetadata::IsTypeExpression("string", parameterType)) {
     return ValueTypeMetadata::stringType;
   }
   return parameterType;
 }
 
-const gd::String &
-ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
-  if (parameterType == "variable" ||
-      gd::ValueTypeMetadata::IsTypeExpression("variable", parameterType)) {
-    return ValueTypeMetadata::variableType;
-  }
-  if (parameterType == "boolean" || parameterType == "yesorno" ||
-      parameterType == "trueorfalse") {
-    return ValueTypeMetadata::booleanType;
-  }
-  // These 2 types are not strings from the code generator point of view,
-  // but it is for event-based extensions.
-  if (parameterType == "key" || parameterType == "mouse") {
-    return ValueTypeMetadata::stringType;
-  }
-  return GetExpressionPrimitiveValueType(parameterType);
-}
-
 const gd::String ValueTypeMetadata::numberValueType = "number";
 const gd::String ValueTypeMetadata::booleanValueType = "boolean";
 const gd::String ValueTypeMetadata::colorValueType = "color";

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -178,16 +178,6 @@ class GD_CORE_API ValueTypeMetadata {
     } else if (type == "variable") {
       return parameterType == "objectvar" || parameterType == "globalvar" ||
              parameterType == "scenevar";
-    } else if (type == "resource") {
-      return parameterType == "fontResource" ||
-             parameterType == "soundfile" ||
-             parameterType == "musicfile" ||
-             parameterType == "bitmapFontResource" ||
-             parameterType == "imageResource" ||
-             parameterType == "jsonResource" ||
-             parameterType == "tilemapResource" ||
-             parameterType == "tilesetResource" ||
-             parameterType == "model3DResource";
     }
     return false;
   }
@@ -196,23 +186,10 @@ class GD_CORE_API ValueTypeMetadata {
    * \brief Return the expression type from the parameter type.
    * Declinations of "number" and "string" types (like "forceMultiplier" or
    * "sceneName") are replaced by "number" and "string".
-   * 
-   * \note It only maps string and number types.
-   */
-  static const gd::String &GetExpressionPrimitiveValueType(const gd::String &parameterType);
-
-  /**
-   * \brief Return the primitive type from the parameter type.
-   * Declinations of "number" and "string" types (like "forceMultiplier" or
-   * "sceneName") are replaced by "number" and "string".
-   * 
-   * \note It also maps variable and boolean types.
    */
   static const gd::String &GetPrimitiveValueType(const gd::String &parameterType);
   static const gd::String numberType;
   static const gd::String stringType;
-  static const gd::String variableType;
-  static const gd::String booleanType;
 
   /**
    * \brief Return the ValueTypeMetadata name for a property type.

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -653,7 +653,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllActions().begin();
        it != GetAllActions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllActions().erase(it++);
     } else
       ++it;
@@ -663,7 +663,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllConditions().begin();
        it != GetAllConditions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllConditions().erase(it++);
     } else
       ++it;
@@ -673,7 +673,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllExpressions().begin();
        it != GetAllExpressions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllExpressions().erase(it++);
     } else
       ++it;
@@ -683,7 +683,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllStrExpressions().begin();
        it != GetAllStrExpressions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.HasCustomCodeGenerator()) {
+        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
       GetAllStrExpressions().erase(it++);
     } else
       ++it;
@@ -699,7 +699,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.actionsInfos.begin();
          it != obj.actionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.actionsInfos.erase(it++);
       } else
         ++it;
@@ -709,7 +709,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.conditionsInfos.begin();
          it != obj.conditionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.conditionsInfos.erase(it++);
       } else
         ++it;
@@ -719,7 +719,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.expressionsInfos.begin();
          it != obj.expressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.expressionsInfos.erase(it++);
       } else
         ++it;
@@ -729,7 +729,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.strExpressionsInfos.begin();
          it != obj.strExpressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.strExpressionsInfos.erase(it++);
       } else
         ++it;
@@ -746,7 +746,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.actionsInfos.begin();
          it != obj.actionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.actionsInfos.erase(it++);
       } else
         ++it;
@@ -756,7 +756,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.conditionsInfos.begin();
          it != obj.conditionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.conditionsInfos.erase(it++);
       } else
         ++it;
@@ -766,7 +766,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.expressionsInfos.begin();
          it != obj.expressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.expressionsInfos.erase(it++);
       } else
         ++it;
@@ -776,7 +776,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.strExpressionsInfos.begin();
          it != obj.strExpressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.HasCustomCodeGenerator()) {
+          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
         obj.strExpressionsInfos.erase(it++);
       } else
         ++it;

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -42,7 +42,7 @@ class GD_CORE_API DependenciesAnalyzer {
    *
    * You can also call then
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
-   * external events can be compiled separately and called by a scene. \see
+   * external events can be compiled separatly and called by a scene. \see
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -84,9 +84,6 @@ void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events)
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size(); ++i) {
-    if (shouldStopIteration) {
-      break;
-    }
     events[i].AcceptVisitor(*this);
 
     if (events[i].CanHaveSubEvents()) {
@@ -101,17 +98,11 @@ void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
   const vector<const gd::InstructionsList*> conditionsVectors =
       event.GetAllConditionsVectors();
   for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
-    if (shouldStopIteration) {
-      break;
-    }
     VisitInstructionList(*conditionsVectors[j], true);
   }
 
   const vector<const gd::InstructionsList*> actionsVectors = event.GetAllActionsVectors();
   for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
-    if (shouldStopIteration) {
-      break;
-    }
     VisitInstructionList(*actionsVectors[j], false);
   }
 }
@@ -125,9 +116,6 @@ void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
   DoVisitInstructionList(instructions, areConditions);
 
   for (std::size_t i = 0; i < instructions.size(); ++i) {
-    if (shouldStopIteration) {
-      break;
-    }
     VisitInstruction(instructions[i], areConditions);
     if (!instructions[i].GetSubInstructions().empty()) {
       VisitInstructionList(instructions[i].GetSubInstructions(),
@@ -141,10 +129,6 @@ void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& inst
   DoVisitInstruction(instruction, isCondition);
 }
 
-void ReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
-  shouldStopIteration = true;
-}
-
 ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
 
 }  // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -144,7 +144,7 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
  */
 class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
  public:
-  ReadOnlyArbitraryEventsWorker() : shouldStopIteration(false) {};
+  ReadOnlyArbitraryEventsWorker(){};
   virtual ~ReadOnlyArbitraryEventsWorker();
 
   /**
@@ -152,9 +152,6 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
    */
   void Launch(const gd::EventsList& events) { VisitEventList(events); };
 
-protected:
-  void StopAnyEventIteration() override;
-
  private:
   void VisitEventList(const gd::EventsList& events);
   void VisitEvent(const gd::BaseEvent& event) override;
@@ -191,8 +188,6 @@ protected:
    */
   virtual void DoVisitInstruction(const gd::Instruction& instruction,
                                   bool isCondition) {};
-
-  bool shouldStopIteration;
 };
 
 /**

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.cpp

@@ -1,175 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsFunctionSelfCallChecker.h"
-
-#include "GDCore/Events/Expression.h"
-#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/Project/EventsBasedBehavior.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/EventsFunction.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-/**
- * \brief Check the type of the first condition or action.
- */
-class GD_CORE_API FirstInstructionTypeChecker
-    : public ReadOnlyArbitraryEventsWorker {
-public:
-  FirstInstructionTypeChecker(const gd::String &eventFunctionType_,
-                              const bool isEventFunctionCondition_)
-      : eventFunctionType(eventFunctionType_),
-        isEventFunctionCondition(isEventFunctionCondition_),
-        isOnlyCallingItself(false){};
-  virtual ~FirstInstructionTypeChecker(){};
-
-  void DoVisitInstruction(const gd::Instruction &instruction,
-                          bool isCondition) override {
-    if (isCondition == isEventFunctionCondition) {
-      isOnlyCallingItself = instruction.GetType() == eventFunctionType;
-      StopAnyEventIteration();
-    }
-  };
-
-  bool isOnlyCallingItself;
-
-private:
-  gd::String eventFunctionType;
-  bool isEventFunctionCondition;
-};
-
-/**
- * \brief Check the type of the first condition or action.
- */
-class GD_CORE_API FirstActionExpressionTypeChecker
-    : public ReadOnlyArbitraryEventsWorker,
-      ExpressionParser2NodeWorker {
-public:
-  FirstActionExpressionTypeChecker(const gd::Platform &platform_,
-                                   const gd::String &eventFunctionType_)
-      : platform(platform_), eventFunctionType(eventFunctionType_),
-        isOnlyCallingItself(false){};
-  virtual ~FirstActionExpressionTypeChecker(){};
-
-  void DoVisitInstruction(const gd::Instruction &instruction,
-                          bool isCondition) override {
-    // Typically, it should be a "return" action.
-    if (!isCondition) {
-      gd::String lastObjectParameter = "";
-      const gd::InstructionMetadata &instrInfos =
-          MetadataProvider::GetActionMetadata(platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-
-        if (ParameterMetadata::IsExpression(
-                "number", instrInfos.parameters[pNb].GetType()) ||
-            ParameterMetadata::IsExpression(
-                "string", instrInfos.parameters[pNb].GetType())) {
-          auto node = instruction.GetParameter(pNb).GetRootNode();
-          node->Visit(*this);
-        }
-      }
-      StopAnyEventIteration();
-    }
-  }
-
-  // Only check expressions that directly calls a function.
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    isOnlyCallingItself |= node.functionName == eventFunctionType;
-  }
-
-  // Handle extra parenthesis.
-  void OnVisitSubExpressionNode(SubExpressionNode &node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode &node) override {}
-  // Handle sign that could have been forgotten
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode &node) override {}
-  void OnVisitTextNode(TextNode &node) override {}
-  void OnVisitVariableNode(VariableNode &node) override {}
-  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override {}
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode &node) override {}
-  void OnVisitIdentifierNode(IdentifierNode &node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override {}
-  void OnVisitEmptyNode(EmptyNode &node) override {}
-
-  bool isOnlyCallingItself;
-
-private:
-  const gd::Platform &platform;
-  gd::String eventFunctionType;
-};
-
-bool EventsFunctionSelfCallChecker::IsOnlyCallingItself(
-    const gd::Project &project, const gd::String &functionFullType,
-    const gd::EventsFunction &eventsFunction) {
-  bool isOnlyCallingItself = false;
-
-  if (eventsFunction.IsExpression()) {
-    FirstActionExpressionTypeChecker eventWorker(project.GetCurrentPlatform(),
-                                                 functionFullType);
-    eventWorker.Launch(eventsFunction.GetEvents());
-    isOnlyCallingItself = eventWorker.isOnlyCallingItself;
-  } else {
-    FirstInstructionTypeChecker eventWorker(functionFullType,
-                                            !eventsFunction.IsAction());
-    eventWorker.Launch(eventsFunction.GetEvents());
-    isOnlyCallingItself = eventWorker.isOnlyCallingItself;
-  }
-  return isOnlyCallingItself;
-}
-
-bool EventsFunctionSelfCallChecker::IsFreeFunctionOnlyCallingItself(
-    const gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsFunction &eventsFunction) {
-  return IsOnlyCallingItself(
-      project,
-      PlatformExtension::GetEventsFunctionFullType(
-          eventsFunctionsExtension.GetName(), eventsFunction.GetName()),
-      eventsFunction);
-}
-
-bool EventsFunctionSelfCallChecker::IsBehaviorFunctionOnlyCallingItself(
-    const gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::EventsFunction &eventsFunction) {
-  return IsOnlyCallingItself(
-      project,
-      PlatformExtension::GetBehaviorEventsFunctionFullType(
-          eventsFunctionsExtension.GetName(), eventsBasedBehavior.GetName(),
-          eventsFunction.GetName()),
-      eventsFunction);
-}
-bool EventsFunctionSelfCallChecker::IsObjectFunctionOnlyCallingItself(
-    const gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    const gd::EventsFunction &eventsFunction) {
-  return IsOnlyCallingItself(project,
-                             PlatformExtension::GetObjectEventsFunctionFullType(
-                                 eventsFunctionsExtension.GetName(),
-                                 eventsBasedObject.GetName(),
-                                 eventsFunction.GetName()),
-                             eventsFunction);
-}
-
-} // namespace gd

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.h

@@ -1,64 +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 "GDCore/String.h"
-#include <vector>
-namespace gd {
-class Project;
-class EventsFunctionsExtension;
-class EventsFunctionsContainer;
-class EventsFunction;
-class EventsBasedBehavior;
-class EventsBasedObject;
-} // namespace gd
-
-namespace gd {
-/**
- * \brief Check if functions are only calling themselves.
- *
- * It allows to detect mistakes when implementing functions for compatibility
- * after a function renaming.
- * Infinite loops can happens when the legacy function call itself instead of
- * the new function.
- * 
- * \note Only the first instruction or the expressions of the first action is
- * checked.
- */
-class GD_CORE_API EventsFunctionSelfCallChecker {
-public:
-  /**
-   * \brief Check if a free function is only calling itself.
-   */
-  static bool IsFreeFunctionOnlyCallingItself(
-      const gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsFunction &eventsFunction);
-
-  /**
-   * \brief Check if a behavior function is only calling itself.
-   */
-  static bool IsBehaviorFunctionOnlyCallingItself(
-      const gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::EventsFunction &eventsFunction);
-
-  /**
-   * \brief Check if an object function is only calling itself.
-   */
-  static bool IsObjectFunctionOnlyCallingItself(
-      const gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::EventsFunction &eventsFunction);
-
-private:
-  static bool IsOnlyCallingItself(const gd::Project &project,
-                                  const gd::String &functionFullType,
-                                  const gd::EventsFunction &eventsFunction);
-};
-} // namespace gd

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -642,7 +642,7 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
   return modifiedEvents;
 }
 
-gd::String ReplaceAllOccurrencesCaseInsensitive(gd::String context,
+gd::String ReplaceAllOccurencesCaseUnsensitive(gd::String context,
                                                gd::String from,
                                                const gd::String& to) {
   size_t lookHere = 0;
@@ -673,7 +673,7 @@ bool EventsRefactorer::ReplaceStringInActions(gd::ObjectsContainer& project,
           matchCase
               ? actions[aId].GetParameter(pNb).GetPlainString().FindAndReplace(
                     toReplace, newString, true)
-              : ReplaceAllOccurrencesCaseInsensitive(
+              : ReplaceAllOccurencesCaseUnsensitive(
                     actions[aId].GetParameter(pNb).GetPlainString(),
                     toReplace,
                     newString);
@@ -713,7 +713,7 @@ bool EventsRefactorer::ReplaceStringInConditions(
                           .GetParameter(pNb)
                           .GetPlainString()
                           .FindAndReplace(toReplace, newString, true)
-                    : ReplaceAllOccurrencesCaseInsensitive(
+                    : ReplaceAllOccurencesCaseUnsensitive(
                           conditions[cId].GetParameter(pNb).GetPlainString(),
                           toReplace,
                           newString);
@@ -749,7 +749,7 @@ bool EventsRefactorer::ReplaceStringInEventSearchableStrings(
   for (std::size_t sNb = 0; sNb < stringEvent.size(); ++sNb) {
     gd::String newStringEvent =
         matchCase ? stringEvent[sNb].FindAndReplace(toReplace, newString, true)
-                  : ReplaceAllOccurrencesCaseInsensitive(
+                  : ReplaceAllOccurencesCaseUnsensitive(
                         stringEvent[sNb], toReplace, newString);
     newEventStrings.push_back(newStringEvent);
   }

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -77,43 +77,25 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
       MetadataProvider::GetBehaviorAnyExpressionMetadata(
             platform, behaviorType, function.functionName);
 
-  Type returnType = StringToType(metadata.GetReturnType());
-
-  if (!function.objectName.empty() &&
-      !globalObjectsContainer.HasObjectNamed(function.objectName) &&
-      !globalObjectsContainer.GetObjectGroups().Has(function.objectName) &&
-      !objectsContainer.HasObjectNamed(function.objectName) &&
-      !objectsContainer.GetObjectGroups().Has(function.objectName)) {
-    RaiseTypeError(_("This object doesn't exist."),
-                   function.objectNameLocation, /*isFatal=*/false);
-    return returnType;
-  }
-
-  if (!function.behaviorName.empty() &&
-      !gd::HasBehaviorInObjectOrGroup(globalObjectsContainer, objectsContainer,
-                                     function.objectName,
-                                     function.behaviorName)) {
-    RaiseTypeError(_("This behavior is not attached to this object."),
-                   function.behaviorNameLocation, /*isFatal=*/false);
-    return returnType;
-  }
-
-  if (!function.objectName.empty() &&
+  if (!function.objectName.empty()) {
     // If the function needs a capability on the object that may not be covered
     // by all objects, check it now.
-  !metadata.GetRequiredBaseObjectCapability().empty()) {
-    const gd::ObjectMetadata &objectMetadata =
-        MetadataProvider::GetObjectMetadata(platform, objectType);
+    if (!metadata.GetRequiredBaseObjectCapability().empty()) {
+      const gd::ObjectMetadata &objectMetadata =
+          MetadataProvider::GetObjectMetadata(platform, objectType);
 
-    if (objectMetadata.IsUnsupportedBaseObjectCapability(
-            metadata.GetRequiredBaseObjectCapability())) {
-      RaiseTypeError(
-          _("This expression exists, but it can't be used on this object."),
-          function.objectNameLocation);
-      return returnType;
+      if (objectMetadata.IsUnsupportedBaseObjectCapability(
+              metadata.GetRequiredBaseObjectCapability())) {
+        RaiseTypeError(
+            _("This expression exists, but it can't be used on this object."),
+            function.objectNameLocation);
+        return StringToType(metadata.GetReturnType());
+      }
     }
   }
 
+  Type returnType = StringToType(metadata.GetReturnType());
+
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
     RaiseError(
         "invalid_function_name",
@@ -133,8 +115,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
             "number to a string."),
           function.location);
       return returnType;
-    } else if (parentType != Type::Number &&
-               parentType != Type::NumberOrString) {
+    }
+    else if (parentType != Type::Number && parentType != Type::NumberOrString) {
       RaiseTypeError(_("You tried to use an expression that returns a "
                               "number, but another type is expected:") +
                               " " + TypeToString(parentType),
@@ -149,8 +131,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
             "string to a number."),
           function.location);
       return returnType;
-    } else if (parentType != Type::String &&
-               parentType != Type::NumberOrString) {
+    }
+    else if (parentType != Type::String && parentType != Type::NumberOrString) {
       RaiseTypeError(_("You tried to use an expression that returns a "
                               "string, but another type is expected:") +
                               " " + TypeToString(parentType),
@@ -190,7 +172,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
           _("You have not entered enough parameters for the expression.") + " " +
               expectedCountMessage,
           function.location);
-    } else {
+    }
+    else {
       RaiseError(
           "extra_parameter",
           _("This parameter was not expected by this expression. Remove it "
@@ -234,7 +217,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
                     "parameter."),
                 parameter->location);
         }
-      } else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
+      }
+      else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
         if (dynamic_cast<IdentifierNode *>(parameter.get()) == nullptr) {
           RaiseError(
                   "malformed_object_parameter",

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -45,7 +45,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
 
   /**
    * \brief Helper function to check if a given node does not contain
-   * any error including non-fatal ones.
+   * any error.
    */
   static bool HasNoErrors(const gd::Platform &platform,
                       const gd::ObjectsContainer &globalObjectsContainer,
@@ -54,25 +54,16 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                       gd::ExpressionNode& node) {
     gd::ExpressionValidator validator(platform, globalObjectsContainer, objectsContainer, rootType);
     node.Visit(validator);
-    return validator.GetAllErrors().empty();
+    return validator.GetErrors().empty();
   }
 
-  /**
-   * \brief Get only the fatal errors
-   *
-   * Expressions with fatal error can't be generated.
-   */
-  const std::vector<ExpressionParserDiagnostic*>& GetFatalErrors() {
-    return fatalErrors;
-  };
-
   /**
    * \brief Get all the errors
    *
    * No errors means that the expression is valid.
    */
-  const std::vector<ExpressionParserDiagnostic*>& GetAllErrors() {
-    return allErrors;
+  const std::vector<ExpressionParserDiagnostic*>& GetErrors() {
+    return errors;
   };
 
  protected:
@@ -159,29 +150,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {
     ReportAnyError(node);
     childType = Type::Number;
-    if (parentType == Type::String) {
-      RaiseTypeError(
-          _("You entered a number, but a text was expected (in quotes)."),
-          node.location);
-    } else if (parentType != Type::Number &&
-               parentType != Type::NumberOrString) {
-      RaiseTypeError(_("You entered a number, but this type was expected:") +
-                         " " + TypeToString(parentType),
-                     node.location);
-    }
+    CheckType(parentType, childType, node.location);
   }
   void OnVisitTextNode(TextNode& node) override {
     ReportAnyError(node);
     childType = Type::String;
-    if (parentType == Type::Number) {
-      RaiseTypeError(_("You entered a text, but a number was expected."),
-                     node.location);
-    } else if (parentType != Type::String &&
-               parentType != Type::NumberOrString) {
-      RaiseTypeError(_("You entered a text, but this type was expected:") +
-                         " " + TypeToString(parentType),
-                     node.location);
-    }
+    CheckType(parentType, childType, node.location);
   }
   void OnVisitVariableNode(VariableNode& node) override {
     ReportAnyError(node);
@@ -189,21 +163,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       node.child->Visit(*this);
     }
     childType = Type::Variable;
-    if (parentType == Type::String) {
-      RaiseTypeError(_("Variables must be surrounded by VariableString()."),
-                     node.location);
-    } else if (parentType == Type::Number) {
-      RaiseTypeError(_("Variables must be surrounded by Variable()."),
-                     node.location);
-    } else if (parentType == Type::NumberOrString) {
-      RaiseTypeError(
-          _("Variables must be surrounded by Variable() or VariableString()."),
-          node.location);
-    } else if (parentType != Type::Variable) {
-      RaiseTypeError(_("You entered a variable, but this type was expected:") +
-                         " " + TypeToString(parentType),
-                     node.location);
-    }
+    CheckType(parentType, childType, node.location);
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
@@ -279,26 +239,20 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   enum Type {Unknown = 0, Number, String, NumberOrString, Variable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
 
-  void ReportAnyError(const ExpressionNode& node, bool isFatal = true) {
+  void ReportAnyError(const ExpressionNode& node) {
     if (node.diagnostic && node.diagnostic->IsError()) {
       // Syntax errors are holden by the AST nodes.
       // It's fine to give pointers on them as the AST live longer than errors
       // handling.
-      allErrors.push_back(node.diagnostic.get());
-      if (isFatal) {
-        fatalErrors.push_back(node.diagnostic.get());
-      }
+      errors.push_back(node.diagnostic.get());
     }
   }
 
   void RaiseError(const gd::String &type, 
-      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
+      const gd::String &message, const ExpressionParserLocation &location) {
     auto diagnostic = gd::make_unique<ExpressionParserError>(
         type, message, location);
-    allErrors.push_back(diagnostic.get());
-    if (isFatal) {
-      fatalErrors.push_back(diagnostic.get());
-    }
+    errors.push_back(diagnostic.get());
     // Errors found by the validator are not holden by the AST nodes.
     // They must be owned by the validator to keep living while errors are
     // handled by the caller.
@@ -306,8 +260,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
 
   void RaiseTypeError(
-      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
-    RaiseError("type_error", message, location, isFatal);
+      const gd::String &message, const ExpressionParserLocation &location) {
+    RaiseError("type_error", message, location);
   }
 
   void RaiseOperatorError(
@@ -315,6 +269,32 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     RaiseError("invalid_operator", message, location);
   }
 
+  void CheckType(Type expect, Type actual, const ExpressionParserLocation &location) {
+    if (actual == Type::String) {
+      if (expect == Type::Number) {
+        RaiseTypeError(_("You entered a text, but a number was expected."),
+                           location);
+      }
+      else if (expect != Type::String && expect != Type::NumberOrString) {
+        RaiseTypeError(
+            _("You entered a text, but this type was expected:") + " " + TypeToString(expect),
+            location);
+      }
+    }
+    else if (actual == Type::Number) {
+      if (expect == Type::String) {
+        RaiseTypeError(
+            _("You entered a number, but a text was expected (in quotes)."),
+            location);
+      }
+      else if (expect != Type::Number && expect != Type::NumberOrString) {
+        RaiseTypeError(
+            _("You entered a number, but this type was expected:") + " " + TypeToString(expect),
+            location);
+      }
+    }
+  }
+
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;
@@ -326,8 +306,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   static const gd::String identifierTypeString;
   static const gd::String emptyTypeString;
 
-  std::vector<ExpressionParserDiagnostic*> fatalErrors;
-  std::vector<ExpressionParserDiagnostic*> allErrors;
+  std::vector<ExpressionParserDiagnostic*> errors;
   std::vector<std::unique_ptr<ExpressionParserDiagnostic>> supplementalErrors;
   Type childType;
   Type parentType;

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -82,7 +82,7 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
 
 // Expressions scanner
 
-// Ignore literals nodes
+// Ignore litterals nodes
 void UsedExtensionsFinder::OnVisitNumberNode(NumberNode& node){};
 void UsedExtensionsFinder::OnVisitTextNode(TextNode& node){};
 

Core/GDCore/IDE/ExtensionsLoader.cpp

@@ -144,7 +144,7 @@ void ExtensionsLoader::LoadExtension(const gd::String &fullpath,
                                      bool forgiving) {
   if (platform.GetExtensionCreateFunctionName().empty()) {
     cout << "Unable to load extension " << fullpath << ":" << endl;
-    cout << "The platform does not support extensions creation." << endl;
+    cout << "The plaftorm does not support extensions creation." << endl;
     return;
   }
 

Core/GDCore/IDE/ExtensionsLoader.h

@@ -35,7 +35,7 @@ class GD_CORE_API ExtensionsLoader {
    * \param platform The platform the extensions belongs to.
    * \param forgiving If set to true, files will try to be opened, but a failure
    * when searching for the platform creation function symbol won't be logged as
-   * an error. (All other errors are still reported as usual).
+   * an error. (All other errors are still reparted as usual).
    *
    * \note Extensions files must have extensions *.xgd(w|l|m)(e),
    * w for Windows, l for Linux, m for Mac, e for Edittime extensions.
@@ -51,7 +51,7 @@ class GD_CORE_API ExtensionsLoader {
    * \param platform The platform the extension belongs to.
    * \param forgiving If set to true, files will try to be opened, but a failure
    * when searching for the platform creation function symbol won't be logged as
-   * an error. (All other errors are still reported as usual).
+   * an error. (All other errors are still reparted as usual).
    */
   static void LoadExtension(const gd::String& fullpath,
                             gd::Platform& platform,

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -45,11 +45,6 @@ void ArbitraryResourceWorker::ExposeTileset(gd::String& tilesetName){
     // do.
 };
 
-void ArbitraryResourceWorker::ExposeModel3D(gd::String& resourceName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
 void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
     // Nothing to do by default - each child class can define here the action to
     // do.
@@ -71,7 +66,7 @@ void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
     }
   }
 
-  // For compatibility with older projects (where events were referring to files
+  // For compatibility with older projects (where events were refering to files
   // directly), we consider that this resource name is a filename, and so expose
   // it as a file.
   ExposeFile(audioName);
@@ -88,7 +83,7 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
     }
   }
 
-  // For compatibility with older projects (where events were referring to files
+  // For compatibility with older projects (where events were refering to files
   // directly), we consider that this resource name is a filename, and so expose
   // it as a file.
   ExposeFile(fontName);
@@ -151,8 +146,6 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
             ExposeTileset(potentiallyUpdatedTargetResourceName);
           } else if (targetResourceKind == "video") {
             ExposeVideo(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "model3D") {
-            ExposeModel3D(potentiallyUpdatedTargetResourceName);
           }
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
@@ -240,10 +233,6 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
             gd::String updatedParameterValue = parameterValue;
             worker.ExposeTileset(updatedParameterValue);
             instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "model3DResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeModel3D(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
           }
         });
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -85,11 +85,6 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeTileset(gd::String &tilesetName);
 
-  /**
-   * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
-   */
-  virtual void ExposeModel3D(gd::String &resourceName);
-
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
    */

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -29,7 +29,7 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
   originalProject.ExposeResources(absolutePathChecker);
 
   auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
-  std::cout << "Copying all resources from " << projectDirectory << " to "
+  std::cout << "Copying all ressources from " << projectDirectory << " to "
             << destinationDirectory << "..." << std::endl;
 
   // Get the resources to be copied

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -44,7 +44,6 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String>& GetAllTilesets() { return GetAll("tileset"); };
   std::set<gd::String>& GetAllVideos() { return GetAll("video"); };
   std::set<gd::String>& GetAllBitmapFonts() { return GetAll("bitmapFont"); };
-  std::set<gd::String>& GetAll3DModels() { return GetAll("model3D"); };
   std::set<gd::String>& GetAll(const gd::String& resourceType) {
     if (resourceType == "image") return allImages;
     if (resourceType == "audio") return allAudios;
@@ -54,7 +53,6 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
     if (resourceType == "tileset") return allTilesets;
     if (resourceType == "video") return allVideos;
     if (resourceType == "bitmapFont") return allBitmapFonts;
-    if (resourceType == "model3D") return allModel3Ds;
 
     return emptyResources;
   };
@@ -86,9 +84,6 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual void ExposeBitmapFont(gd::String& bitmapFontResourceName) override {
     allBitmapFonts.insert(bitmapFontResourceName);
   };
-  virtual void ExposeModel3D(gd::String& resourceName) override {
-    allModel3Ds.insert(resourceName);
-  };
 
  protected:
   std::set<gd::String> allImages;
@@ -99,7 +94,6 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String> allTilesets;
   std::set<gd::String> allVideos;
   std::set<gd::String> allBitmapFonts;
-  std::set<gd::String> allModel3Ds;
   std::set<gd::String> emptyResources;
 };
 

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -59,9 +59,6 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeBitmapFont(gd::String& bitmapFontName) override {
     RenameIfNeeded(bitmapFontName);
   };
-  virtual void ExposeModel3D(gd::String& resourceName) override {
-    RenameIfNeeded(resourceName);
-  };
 
  private:
   void RenameIfNeeded(gd::String& resourceName) {

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -16,7 +16,7 @@ class EventsBasedObject;
 class AbstractEventsBasedEntity;
 class PropertyDescriptor;
 class NamedPropertyDescriptor;
-}  // namespace gd
+} // namespace gd
 
 namespace gd {
 
@@ -24,24 +24,22 @@ namespace gd {
  * \brief Generate a getter and a setter functions for properties.
  */
 class GD_CORE_API PropertyFunctionGenerator {
- public:
+public:
   /**
    * \brief Generate a getter and a setter for the given behavior property.
    */
   static void GenerateBehaviorGetterAndSetter(
-      gd::Project &project,
-      gd::EventsFunctionsExtension &extension,
+      gd::Project &project, gd::EventsFunctionsExtension &extension,
       gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::NamedPropertyDescriptor &property,
-      bool isSharedProperties);
+      const gd::NamedPropertyDescriptor &property, bool isSharedProperties);
   /**
    * \brief Generate a getter and a setter for the given object property.
    */
-  static void GenerateObjectGetterAndSetter(
-      gd::Project &project,
-      gd::EventsFunctionsExtension &extension,
-      gd::EventsBasedObject &eventsBasedObject,
-      const gd::NamedPropertyDescriptor &property);
+  static void
+  GenerateObjectGetterAndSetter(gd::Project &project,
+                                gd::EventsFunctionsExtension &extension,
+                                gd::EventsBasedObject &eventsBasedObject,
+                                const gd::NamedPropertyDescriptor &property);
   static bool CanGenerateGetterAndSetter(
       const gd::AbstractEventsBasedEntity &eventsBasedEntity,
       const gd::NamedPropertyDescriptor &property);
@@ -52,26 +50,23 @@ class GD_CORE_API PropertyFunctionGenerator {
   static void GenerateConditionSkeleton(gd::Project &project,
                                         gd::EventsFunction &eventFunction);
 
-  ~PropertyFunctionGenerator(){};
+  ~PropertyFunctionGenerator();
 
- private:
+private:
   static void GenerateGetterAndSetter(
-      gd::Project &project,
-      gd::EventsFunctionsExtension &extension,
+      gd::Project &project, gd::EventsFunctionsExtension &extension,
       gd::AbstractEventsBasedEntity &eventsBasedEntity,
-      const gd::NamedPropertyDescriptor &property,
-      const gd::String &objectType,
-      bool isBehavior,
-      bool isSharedProperties);
+      const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
+      bool isBehavior, bool isSharedProperties);
 
   static gd::String CapitalizeFirstLetter(const gd::String &string);
   static gd::String UnCapitalizeFirstLetter(const gd::String &string);
-  static gd::String GetStringifiedExtraInfo(
-      const gd::PropertyDescriptor &property);
+  static gd::String
+  GetStringifiedExtraInfo(const gd::PropertyDescriptor &property);
 
   PropertyFunctionGenerator();
 };
 
-}  // namespace gd
+} // namespace gd
 
-#endif  // GDCORE_PROPERTYFUNCTIONGENERATOR_H
+#endif // GDCORE_PROPERTYFUNCTIONGENERATOR_H

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -845,21 +845,9 @@ void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
     return;
   };
 
-  AddRequiredBehaviorsFor(project, object, behaviorName);
-}
-
-void WholeProjectRefactorer::AddRequiredBehaviorsFor(
-    gd::Project& project,
-    gd::Object& object,
-    const gd::String& behaviorName) {
-  if (!object.HasBehaviorNamed(behaviorName)) {
-    return;
-  };
-  gd::Behavior& behavior = object.GetBehavior(behaviorName);
-
   const gd::Platform& platform = project.GetCurrentPlatform();
   const gd::BehaviorMetadata& behaviorMetadata =
-      MetadataProvider::GetBehaviorMetadata(platform, behavior.GetTypeName());
+      MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
   if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
     // Should not happen because the behavior was added successfully (so its
     // metadata are valid) - but double check anyway and bail out if the
@@ -867,6 +855,7 @@ void WholeProjectRefactorer::AddRequiredBehaviorsFor(
     return;
   }
 
+  gd::Behavior& behavior = object.GetBehavior(behaviorName);
   for (auto const& keyValue : behavior.GetProperties()) {
     const gd::String& propertyName = keyValue.first;
     const gd::PropertyDescriptor& property = keyValue.second;
@@ -1393,12 +1382,25 @@ void WholeProjectRefactorer::ObjectOrGroupRemovedInLayout(
 
   // Remove object in external events
   if (removeEventsAndGroups) {
-    for (auto &externalEventsName :
-         GetAssociatedExternalEvents(project, layout.GetName())) {
-      auto &externalEvents = project.GetExternalEvents(externalEventsName);
-      gd::EventsRefactorer::RemoveObjectInEvents(
-          project.GetCurrentPlatform(), project, layout,
-          externalEvents.GetEvents(), objectName);
+    DependenciesAnalyzer analyzer(project, layout);
+    if (analyzer.Analyze()) {
+      for (auto& externalEventsName :
+           analyzer.GetExternalEventsDependencies()) {
+        auto& externalEvents = project.GetExternalEvents(externalEventsName);
+        gd::EventsRefactorer::RemoveObjectInEvents(project.GetCurrentPlatform(),
+                                                   project,
+                                                   layout,
+                                                   externalEvents.GetEvents(),
+                                                   objectName);
+      }
+      for (auto& layoutName : analyzer.GetScenesDependencies()) {
+        auto& layout = project.GetLayout(layoutName);
+        gd::EventsRefactorer::RemoveObjectInEvents(project.GetCurrentPlatform(),
+                                                   project,
+                                                   layout,
+                                                   layout.GetEvents(),
+                                                   objectName);
+      }
     }
   }
 
@@ -1437,12 +1439,26 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInLayout(
   }
 
   // Rename object in external events
-  for (auto &externalEventsName :
-       GetAssociatedExternalEvents(project, layout.GetName())) {
-    auto &externalEvents = project.GetExternalEvents(externalEventsName);
-    gd::EventsRefactorer::RenameObjectInEvents(
-        project.GetCurrentPlatform(), project, layout,
-        externalEvents.GetEvents(), oldName, newName);
+  DependenciesAnalyzer analyzer(project, layout);
+  if (analyzer.Analyze()) {
+    for (auto& externalEventsName : analyzer.GetExternalEventsDependencies()) {
+      auto& externalEvents = project.GetExternalEvents(externalEventsName);
+      gd::EventsRefactorer::RenameObjectInEvents(project.GetCurrentPlatform(),
+                                                 project,
+                                                 layout,
+                                                 externalEvents.GetEvents(),
+                                                 oldName,
+                                                 newName);
+    }
+    for (auto& layoutName : analyzer.GetScenesDependencies()) {
+      auto& layout = project.GetLayout(layoutName);
+      gd::EventsRefactorer::RenameObjectInEvents(project.GetCurrentPlatform(),
+                                                 project,
+                                                 layout,
+                                                 layout.GetEvents(),
+                                                 oldName,
+                                                 newName);
+    }
   }
 
   // Rename object in external layouts

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -212,13 +212,6 @@ class GD_CORE_API WholeProjectRefactorer {
                                               gd::Object& object,
                                               const gd::String& behaviorType,
                                               const gd::String& behaviorName);
-  /**
-   * \brief Add required behaviors if necessary to fill every behavior
-   * properties of the given behaviors.
-   */
-  static void AddRequiredBehaviorsFor(gd::Project& project,
-                                      gd::Object& object,
-                                      const gd::String& behaviorName);
 
   /**
    * \brief Find every behavior of the object that needs the given behaviors
@@ -332,7 +325,7 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Refactor the project after an object is renamed in a layout
    *
    * This will update the layout, all external layouts associated with it
-   * and all external events associated with it.
+   * and all external events used by the layout.
    */
   static void ObjectOrGroupRenamedInLayout(gd::Project& project,
                                            gd::Layout& layout,
@@ -344,7 +337,7 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Refactor the project after an object is removed in a layout
    *
    * This will update the layout, all external layouts associated with it
-   * and all external events associated with it.
+   * and all external events used by the layout.
    */
   static void ObjectOrGroupRemovedInLayout(gd::Project& project,
                                            gd::Layout& layout,

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -153,8 +153,6 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
         worker.ExposeTileset(newPropertyValue);
       } else if (resourceType == "bitmapFont") {
         worker.ExposeBitmapFont(newPropertyValue);
-      } else if (resourceType == "model3D") {
-        worker.ExposeModel3D(newPropertyValue);
       }
 
       if (newPropertyValue != oldPropertyValue) {

Core/GDCore/Project/EffectsContainer.h

@@ -64,7 +64,7 @@ class GD_CORE_API EffectsContainer {
   std::size_t GetEffectPosition(const gd::String& name) const;
 
   /**
-   * Return the number of effects.
+   * Return the number of effecst.
    */
   std::size_t GetEffectsCount() const;
 

Core/GDCore/Project/EventsBasedBehavior.h

@@ -77,7 +77,7 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
    * \brief Check if the behavior is private - it can't be used outside of its
    * extension.
    */
-  bool IsPrivate() const { return isPrivate; }
+  bool IsPrivate() { return isPrivate; }
 
   /**
    * \brief Set that the behavior is private - it can't be used outside of its

Core/GDCore/Project/EventsFunction.h

@@ -201,7 +201,7 @@ class GD_CORE_API EventsFunction {
   /**
    * \brief Returns true if the function is private.
    */
-  bool IsPrivate() const { return isPrivate; }
+  bool IsPrivate() { return isPrivate; }
 
   /**
    * \brief Sets the privateness of the function.
@@ -217,7 +217,7 @@ class GD_CORE_API EventsFunction {
   bool IsAsync() const { return isAsync; }
 
   /**
-   * \brief Sets the asynchronicity of the function.
+   * \brief Sets the asycronity of the function.
    */
   EventsFunction& SetAsync(bool _isAsync) {
     isAsync = _isAsync;

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -207,13 +207,6 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
     return dependencies;
   };
 
-  /**
-   * \brief Returns the list of dependencies.
-   */
-  const std::vector<gd::DependencyMetadata>& GetAllDependencies() const {
-    return dependencies;
-  };
-
   ///@}
 
   /** \name Serialization

Core/GDCore/Project/InitialInstance.cpp

@@ -9,9 +9,9 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/UUID/UUID.h"
+#include "GDCore/Project/PropertyDescriptor.h"
 
 namespace gd {
 
@@ -21,17 +21,12 @@ InitialInstance::InitialInstance()
     : objectName(""),
       x(0),
       y(0),
-      z(0),
       angle(0),
-      rotationX(0),
-      rotationY(0),
       zOrder(0),
       layer(""),
-      customSize(false),
-      customDepth(false),
+      personalizedSize(false),
       width(0),
       height(0),
-      depth(0),
       locked(false),
       sealed(false),
       persistentUuid(UUID::MakeUuid4()) {}
@@ -40,20 +35,11 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
   SetObjectName(element.GetStringAttribute("name", "", "nom"));
   SetX(element.GetDoubleAttribute("x"));
   SetY(element.GetDoubleAttribute("y"));
-  SetZ(element.GetDoubleAttribute("z", 0));
   SetAngle(element.GetDoubleAttribute("angle"));
-  SetRotationX(element.GetDoubleAttribute("rotationX", 0));
-  SetRotationY(element.GetDoubleAttribute("rotationY", 0));
   SetHasCustomSize(
       element.GetBoolAttribute("customSize", false, "personalizedSize"));
   SetCustomWidth(element.GetDoubleAttribute("width"));
   SetCustomHeight(element.GetDoubleAttribute("height"));
-  if (element.HasChild("depth") || element.HasAttribute("depth")) {
-    SetHasCustomDepth(true);
-    SetCustomDepth(element.GetDoubleAttribute("depth"));
-  } else {
-    SetHasCustomDepth(false);
-  }
   SetZOrder(element.GetIntAttribute("zOrder", 0, "plan"));
   SetLayer(element.GetStringAttribute("layer"));
   SetLocked(element.GetBoolAttribute("locked", false));
@@ -67,26 +53,9 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
       element.GetChild("numberProperties", 0, "floatInfos");
   numberPropertiesElement.ConsiderAsArrayOf("property", "Info");
   for (std::size_t j = 0; j < numberPropertiesElement.GetChildrenCount(); ++j) {
-    gd::String name =
-        numberPropertiesElement.GetChild(j).GetStringAttribute("name");
-    double value =
-        numberPropertiesElement.GetChild(j).GetDoubleAttribute("value");
-
-    // Compatibility with GD <= 5.1.164
-    if (name == "z") {
-      SetZ(value);
-    } else if (name == "rotationX") {
-      SetRotationX(value);
-    } else if (name == "rotationY") {
-      SetRotationY(value);
-    } else if (name == "depth") {
-      SetHasCustomDepth(true);
-      SetCustomDepth(value);
-    }
-    // end of compatibility code
-    else {
-      numberProperties[name] = value;
-    }
+    gd::String name = numberPropertiesElement.GetChild(j).GetStringAttribute("name");
+    double value = numberPropertiesElement.GetChild(j).GetDoubleAttribute("value");
+    numberProperties[name] = value;
   }
 
   stringProperties.clear();
@@ -108,26 +77,21 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetObjectName());
   element.SetAttribute("x", GetX());
   element.SetAttribute("y", GetY());
-  if (GetZ() != 0) element.SetAttribute("z", GetZ());
   element.SetAttribute("zOrder", GetZOrder());
   element.SetAttribute("layer", GetLayer());
   element.SetAttribute("angle", GetAngle());
-  if (GetRotationX() != 0) element.SetAttribute("rotationX", GetRotationX());
-  if (GetRotationY() != 0) element.SetAttribute("rotationY", GetRotationY());
   element.SetAttribute("customSize", HasCustomSize());
   element.SetAttribute("width", GetCustomWidth());
   element.SetAttribute("height", GetCustomHeight());
-  if (HasCustomDepth()) element.SetAttribute("depth", GetCustomDepth());
   if (IsLocked()) element.SetAttribute("locked", IsLocked());
   if (IsSealed()) element.SetAttribute("sealed", IsSealed());
 
   if (persistentUuid.empty()) persistentUuid = UUID::MakeUuid4();
   element.SetStringAttribute("persistentUuid", persistentUuid);
 
-  SerializerElement& numberPropertiesElement =
-      element.AddChild("numberProperties");
+  SerializerElement& numberPropertiesElement = element.AddChild("numberProperties");
   numberPropertiesElement.ConsiderAsArrayOf("property");
-  for (const auto& property : numberProperties) {
+  for (const auto& property: numberProperties) {
     numberPropertiesElement.AddChild("property")
         .SetAttribute("name", property.first)
         .SetAttribute("value", property.second);
@@ -135,7 +99,7 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
 
   SerializerElement& stringPropElement = element.AddChild("stringProperties");
   stringPropElement.ConsiderAsArrayOf("property");
-  for (const auto& property : stringProperties) {
+  for (const auto& property: stringProperties) {
     stringPropElement.AddChild("property")
         .SetAttribute("name", property.first)
         .SetAttribute("value", property.second);
@@ -153,12 +117,10 @@ std::map<gd::String, gd::PropertyDescriptor>
 InitialInstance::GetCustomProperties(gd::Project& project, gd::Layout& layout) {
   // Find an object
   if (layout.HasObjectNamed(GetObjectName()))
-    return layout.GetObject(GetObjectName())
-        .GetConfiguration()
+    return layout.GetObject(GetObjectName()).GetConfiguration()
         .GetInitialInstanceProperties(*this, project, layout);
   else if (project.HasObjectNamed(GetObjectName()))
-    return project.GetObject(GetObjectName())
-        .GetConfiguration()
+    return project.GetObject(GetObjectName()).GetConfiguration()
         .GetInitialInstanceProperties(*this, project, layout);
 
   std::map<gd::String, gd::PropertyDescriptor> nothing;
@@ -170,12 +132,10 @@ bool InitialInstance::UpdateCustomProperty(const gd::String& name,
                                            gd::Project& project,
                                            gd::Layout& layout) {
   if (layout.HasObjectNamed(GetObjectName()))
-    return layout.GetObject(GetObjectName())
-        .GetConfiguration()
+    return layout.GetObject(GetObjectName()).GetConfiguration()
         .UpdateInitialInstanceProperty(*this, name, value, project, layout);
   else if (project.HasObjectNamed(GetObjectName()))
-    return project.GetObject(GetObjectName())
-        .GetConfiguration()
+    return project.GetObject(GetObjectName()).GetConfiguration()
         .UpdateInitialInstanceProperty(*this, name, value, project, layout);
 
   return false;
@@ -194,8 +154,7 @@ const gd::String& InitialInstance::GetRawStringProperty(
   return it != stringProperties.end() ? it->second : *badStringProperyValue;
 }
 
-void InitialInstance::SetRawDoubleProperty(const gd::String& name,
-                                           double value) {
+void InitialInstance::SetRawDoubleProperty(const gd::String& name, double value) {
   numberProperties[name] = value;
 }
 

Core/GDCore/Project/InitialInstance.h

@@ -73,52 +73,22 @@ class GD_CORE_API InitialInstance {
   void SetY(double y_) { y = y_; }
 
   /**
-   * \brief Get the Z position of the instance
-   */
-  double GetZ() const { return z; }
-
-  /**
-   * \brief Set the Z position of the instance
-   */
-  void SetZ(double z_) { z = z_; }
-
-  /**
-   * \brief Get the rotation of the instance on Z axis, in radians.
+   * \brief Get the rotation of the instance, in radians.
    */
   double GetAngle() const { return angle; }
 
   /**
-   * \brief Set the rotation of the instance on Z axis, in radians.
+   * \brief Set the rotation of the instance, in radians.
    */
   void SetAngle(double angle_) { angle = angle_; }
 
   /**
-   * \brief Get the rotation of the instance on X axis, in radians.
-   */
-  double GetRotationX() const { return rotationX; }
-
-  /**
-   * \brief Set the rotation of the instance on X axis, in radians.
-   */
-  void SetRotationX(double rotationX_) { rotationX = rotationX_; }
-
-  /**
-   * \brief Get the rotation of the instance on Y axis, in radians.
-   */
-  double GetRotationY() const { return rotationY; }
-
-  /**
-   * \brief Set the rotation of the instance on Y axis, in radians.
-   */
-  void SetRotationY(double rotationY_) { rotationY = rotationY_; }
-
-  /**
-   * \brief Get the Z order of the instance (for a 2D object).
+   * \brief Get the Z order of the instance.
    */
   int GetZOrder() const { return zOrder; }
 
   /**
-   * \brief Set the Z order of the instance (for a 2D object).
+   * \brief Set the Z order of the instance.
    */
   void SetZOrder(int zOrder_) { zOrder = zOrder_; }
 
@@ -133,51 +103,29 @@ class GD_CORE_API InitialInstance {
   void SetLayer(const gd::String& layer_) { layer = layer_; }
 
   /**
-   * \brief Return true if the instance has a width/height which is different from its
-   * object default width/height. This is independent from `HasCustomDepth`.
+   * \brief Return true if the instance has a size which is different from its
+   * object default size.
    *
    * \see gd::Object
    */
-  bool HasCustomSize() const { return customSize; }
+  bool HasCustomSize() const { return personalizedSize; }
 
   /**
-   * \brief Return true if the instance has a depth which is different from its
-   * object default depth. This is independent from `HasCustomSize`.
+   * \brief Set whether the instance has a size which is different from its
+   * object default size or not.
    *
-   * \see gd::Object
-   */
-  bool HasCustomDepth() const { return customDepth; }
-
-  /**
-   * \brief Set whether the instance has a width/height which is different from its
-   * object default width/height or not.
-   * This is independent from `SetHasCustomDepth`.
-   *
-   * \see gd::Object
+   * \param hasCustomSize true if the size is different from the object's
+   * default size. \see gd::Object
    */
   void SetHasCustomSize(bool hasCustomSize_) {
-    customSize = hasCustomSize_;
-  }
-
-  /**
-   * \brief Set whether the instance has a depth which is different from its
-   * object default depth or not.
-   * This is independent from `SetHasCustomSize`.
-   *
-   * \param hasCustomSize true if the depth is different from the object's
-   * default depth.
-   * \see gd::Object
-   */
-  void SetHasCustomDepth(bool hasCustomDepth_) {
-    customDepth = hasCustomDepth_;
+    personalizedSize = hasCustomSize_;
   }
 
   double GetCustomWidth() const { return width; }
   void SetCustomWidth(double width_) { width = width_; }
+
   double GetCustomHeight() const { return height; }
   void SetCustomHeight(double height_) { height = height_; }
-  double GetCustomDepth() const { return depth; }
-  void SetCustomDepth(double depth_) { depth = depth_; }
 
   /**
    * \brief Return true if the instance is locked and cannot be moved in the
@@ -245,6 +193,7 @@ class GD_CORE_API InitialInstance {
    * \see gd::Object
    */
   ///@{
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Return a map containing the properties names (as keys) and their
    * values.
@@ -264,6 +213,7 @@ class GD_CORE_API InitialInstance {
                             const gd::String& value,
                             gd::Project& project,
                             gd::Layout& layout);
+#endif
 
   /**
    * \brief Get the value of a double property stored in the instance.
@@ -324,19 +274,14 @@ class GD_CORE_API InitialInstance {
       stringProperties;  ///< More data which can be used by the object
 
   gd::String objectName;  ///< Object name
-  double x;               ///< Instance X position
-  double y;               ///< Instance Y position
-  double z;               ///< Instance Z position (for a 3D object)
-  double angle;           ///< Instance angle on Z axis
-  double rotationX;       ///< Instance angle on X axis (for a 3D object)
-  double rotationY;       ///< Instance angle on Y axis (for a 3D object)
-  int zOrder;             ///< Instance Z order (for a 2D object)
-  gd::String layer;       ///< Instance layer
-  bool customSize;        ///< True if object has a custom width and height
-  bool customDepth;       ///< True if object has a custom depth
-  double width;           ///< Instance custom width
-  double height;          ///< Instance custom height
-  double depth;           ///< Instance custom depth
+  double x;               ///< Object initial X position
+  double y;               ///< Object initial Y position
+  double angle;           ///< Object initial angle
+  int zOrder;             ///< Object initial Z order
+  gd::String layer;       ///< Object initial layer
+  bool personalizedSize;  ///< True if object has a custom size
+  double width;           ///< Object custom width
+  double height;          ///< Object custom height
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
   bool sealed;                              ///< True if the instance is sealed

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -68,14 +68,14 @@ gd::InitialInstance& InitialInstancesContainer::InsertNewInitialInstance() {
 }
 
 void InitialInstancesContainer::RemoveInstanceIf(
-    std::function<bool(const gd::InitialInstance&)> predicate) {
+    std::function<bool(const gd::InitialInstance&)> predicat) {
   // Note that we can't use erase–remove idiom here because remove_if would
   // move the instances, and the container must guarantee that
   // iterators/pointers to instances always remain valid.
   for (std::list<gd::InitialInstance>::iterator it = initialInstances.begin(),
                                                 end = initialInstances.end();
        it != end;) {
-    if (predicate(*it))
+    if (predicat(*it))
       it = initialInstances.erase(it);
     else
       ++it;

Core/GDCore/Project/InitialInstancesContainer.h

@@ -178,7 +178,7 @@ class GD_CORE_API InitialInstancesContainer {
 
  private:
   void RemoveInstanceIf(
-      std::function<bool(const gd::InitialInstance &)> predicate);
+      std::function<bool(const gd::InitialInstance &)> predicat);
 
   std::list<gd::InitialInstance> initialInstances;
 

Core/GDCore/Project/Layer.cpp

@@ -14,17 +14,7 @@ namespace gd {
 Camera Layer::badCamera;
 
 Layer::Layer()
-    : renderingType(""),
-      isVisible(true),
-      isLocked(false),
-      isLightingLayer(false),
-      followBaseLayerCamera(false),
-      camera3DNearPlaneDistance(0.1),
-      camera3DFarPlaneDistance(10000),
-      camera3DFieldOfView(45),
-      ambientLightColorR(200),
-      ambientLightColorG(200),
-      ambientLightColorB(200) {}
+    : isVisible(true), isLightingLayer(false), followBaseLayerCamera(false) {}
 
 /**
  * Change cameras count, automatically adding/removing them.
@@ -36,21 +26,15 @@ void Layer::SetCameraCount(std::size_t n) {
     cameras.erase(cameras.begin() + cameras.size() - 1);
 }
 
+#if defined(GD_IDE_ONLY)
 void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
-  element.SetAttribute("renderingType", GetRenderingType());
   element.SetAttribute("visibility", GetVisibility());
-  element.SetAttribute("isLocked", IsLocked());
   element.SetAttribute("isLightingLayer", IsLightingLayer());
   element.SetAttribute("followBaseLayerCamera", IsFollowingBaseLayerCamera());
   element.SetAttribute("ambientLightColorR", (int)GetAmbientLightColorRed());
   element.SetAttribute("ambientLightColorG", (int)GetAmbientLightColorGreen());
   element.SetAttribute("ambientLightColorB", (int)GetAmbientLightColorBlue());
-  element.SetAttribute("camera3DNearPlaneDistance",
-                       GetCamera3DNearPlaneDistance());
-  element.SetAttribute("camera3DFarPlaneDistance",
-                       GetCamera3DFarPlaneDistance());
-  element.SetAttribute("camera3DFieldOfView", GetCamera3DFieldOfView());
 
   SerializerElement& camerasElement = element.AddChild("cameras");
   camerasElement.ConsiderAsArrayOf("camera");
@@ -71,27 +55,20 @@ void Layer::SerializeTo(SerializerElement& element) const {
   SerializerElement& effectsElement = element.AddChild("effects");
   effectsContainer.SerializeTo(effectsElement);
 }
+#endif
 
 /**
  * \brief Unserialize the layer.
  */
 void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
-  SetRenderingType(element.GetStringAttribute("renderingType", ""));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
-  SetLocked(element.GetBoolAttribute("isLocked", false));
   SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));
   SetFollowBaseLayerCamera(
       element.GetBoolAttribute("followBaseLayerCamera", false));
   SetAmbientLightColor(element.GetIntAttribute("ambientLightColorR", 200),
                        element.GetIntAttribute("ambientLightColorG", 200),
                        element.GetIntAttribute("ambientLightColorB", 200));
-  SetCamera3DNearPlaneDistance(element.GetDoubleAttribute(
-      "camera3DNearPlaneDistance", 0.1, "threeDNearPlaneDistance"));
-  SetCamera3DFarPlaneDistance(element.GetDoubleAttribute(
-      "camera3DFarPlaneDistance", 10000, "threeDFarPlaneDistance"));
-  SetCamera3DFieldOfView(element.GetDoubleAttribute(
-      "camera3DFieldOfView", 45, "threeDFieldOfView"));
 
   cameras.clear();
   SerializerElement& camerasElement = element.GetChild("cameras");
@@ -103,22 +80,24 @@ void Layer::UnserializeFrom(const SerializerElement& element) {
     camera.SetUseDefaultSize(
         cameraElement.GetBoolAttribute("defaultSize", true));
     camera.SetSize(cameraElement.GetDoubleAttribute("width"),
-                   cameraElement.GetDoubleAttribute("height"));
+                    cameraElement.GetDoubleAttribute("height"));
     camera.SetUseDefaultViewport(
         cameraElement.GetBoolAttribute("defaultViewport", true));
-    camera.SetViewport(cameraElement.GetDoubleAttribute("viewportLeft"),
-                       cameraElement.GetDoubleAttribute("viewportTop"),
-                       cameraElement.GetDoubleAttribute("viewportRight"),
-                       cameraElement.GetDoubleAttribute("viewportBottom"));
+    camera.SetViewport(
+        cameraElement.GetDoubleAttribute("viewportLeft"),
+        cameraElement.GetDoubleAttribute("viewportTop"),
+        cameraElement.GetDoubleAttribute("viewportRight"),
+        cameraElement.GetDoubleAttribute(
+            "viewportBottom"));
 
     cameras.push_back(camera);
   }
 
   if (camerasElement.GetChildrenCount() > 50) {
-    // Highly unlikely that we want as many cameras, as they were not even
-    // exposed in the editor nor used in the game engine. Must be because of a
-    // bug in the editor that duplicated cameras when cancelling changes on a
-    // layer. Reset to one camera.
+    // Highly unlikely that we want as many cameras, as they were not even exposed in
+    // the editor nor used in the game engine. Must be because of a bug in the editor that
+    // duplicated cameras when cancelling changes on a layer.
+    // Reset to one camera.
     SetCameraCount(1);
   }
 
@@ -126,7 +105,9 @@ void Layer::UnserializeFrom(const SerializerElement& element) {
   effectsContainer.UnserializeFrom(effectsElement);
 }
 
-gd::EffectsContainer& Layer::GetEffects() { return effectsContainer; }
+gd::EffectsContainer& Layer::GetEffects() {
+  return effectsContainer;
+}
 
 const gd::EffectsContainer& Layer::GetEffects() const {
   return effectsContainer;

Core/GDCore/Project/Layer.h

@@ -47,11 +47,6 @@ class GD_CORE_API Layer {
    */
   const gd::String& GetName() const { return name; }
 
-  const gd::String& GetRenderingType() const { return renderingType; }
-  void SetRenderingType(const gd::String& renderingType_) {
-    renderingType = renderingType_;
-  }
-
   /**
    * \brief Change if layer is displayed or not
    */
@@ -63,17 +58,7 @@ class GD_CORE_API Layer {
   bool GetVisibility() const { return isVisible; }
 
   /**
-   * \brief Change if layer can be modified or not.
-   */
-  void SetLocked(bool isLocked_) { isLocked = isLocked_; }
-
-  /**
-   * \brief Return true if layer can't be modified.
-   */
-  bool IsLocked() const { return isLocked; }
-
-  /**
-   * \brief Set if the layer is a lighting layer or not.
+   * \brief Set if the layer is a lightining layer or not.
    */
   void SetLightingLayer(bool isLightingLayer_) {
     isLightingLayer = isLightingLayer_;
@@ -96,25 +81,6 @@ class GD_CORE_API Layer {
    */
   bool IsFollowingBaseLayerCamera() const { return followBaseLayerCamera; }
 
-  /** \name 3D
-   */
-  ///@{
-  double GetCamera3DNearPlaneDistance() const {
-    return camera3DNearPlaneDistance;
-  }
-  void SetCamera3DNearPlaneDistance(double distance) {
-    camera3DNearPlaneDistance = distance;
-  }
-  double GetCamera3DFarPlaneDistance() const {
-    return camera3DFarPlaneDistance;
-  }
-  void SetCamera3DFarPlaneDistance(double distance) {
-    camera3DFarPlaneDistance = distance;
-  }
-  double GetCamera3DFieldOfView() const { return camera3DFieldOfView; }
-  void SetCamera3DFieldOfView(double angle) { camera3DFieldOfView = angle; }
-  ///@}
-
   /** \name Cameras
    */
   ///@{
@@ -198,10 +164,12 @@ class GD_CORE_API Layer {
   const EffectsContainer& GetEffects() const;
   ///@}
 
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Serialize layer.
    */
   void SerializeTo(SerializerElement& element) const;
+#endif
 
   /**
    * \brief Unserialize the layer.
@@ -209,22 +177,16 @@ class GD_CORE_API Layer {
   void UnserializeFrom(const SerializerElement& element);
 
  private:
-  gd::String name;           ///< The name of the layer
-  gd::String renderingType;  ///< The rendering type: "" (empty), "2d", "3d" or
-                             ///< "2d+3d".
-  bool isVisible;            ///< True if the layer is visible
-  bool isLocked;             ///< True if the layer is locked
+  gd::String name;       ///< The name of the layer
+  bool isVisible;        ///< True if the layer is visible
   bool isLightingLayer;  ///< True if the layer is used to display lights and
                          ///< renders an ambient light.
   bool followBaseLayerCamera;  ///< True if the layer automatically follows the
                                ///< base layer
-  double camera3DNearPlaneDistance;  ///< 3D camera frustum near plan distance
-  double camera3DFarPlaneDistance;   ///< 3D camera frustum far plan distance
-  double camera3DFieldOfView;        ///< 3D camera field of view (fov) in degrees
-  unsigned int ambientLightColorR;   ///< Ambient light color Red component
-  unsigned int ambientLightColorG;   ///< Ambient light color Green component
-  unsigned int ambientLightColorB;   ///< Ambient light color Blue component
-  std::vector<gd::Camera> cameras;   ///< The camera displayed by the layer
+  unsigned int ambientLightColorR;  ///< Ambient light color Red component
+  unsigned int ambientLightColorG;  ///< Ambient light color Green component
+  unsigned int ambientLightColorB;  ///< Ambient light color Blue component
+  std::vector<gd::Camera> cameras;  ///< The camera displayed by the layer
   gd::EffectsContainer effectsContainer;  ///< The effects applied to the layer.
 
   static gd::Camera badCamera;

Core/GDCore/Project/Layout.cpp

@@ -507,44 +507,6 @@ gd::String GD_CORE_API GetTypeOfObject(const gd::ObjectsContainer& project,
   return type;
 }
 
-bool GD_CORE_API HasBehaviorInObjectOrGroup(const gd::ObjectsContainer &project,
-                                            const gd::ObjectsContainer &layout,
-                                            const gd::String &objectOrGroupName,
-                                            const gd::String &behaviorName,
-                                            bool searchInGroups) {
-  // Search in objects
-  if (layout.HasObjectNamed(objectOrGroupName)) {
-    return layout.GetObject(objectOrGroupName).HasBehaviorNamed(behaviorName);
-  }
-  if (project.HasObjectNamed(objectOrGroupName)) {
-    return project.GetObject(objectOrGroupName).HasBehaviorNamed(behaviorName);
-  }
-
-  // Search in groups
-  const gd::ObjectsContainer *container;
-  if (layout.GetObjectGroups().Has(objectOrGroupName)) {
-    container = &layout;
-  } else if (project.GetObjectGroups().Has(objectOrGroupName)) {
-    container = &project;
-  } else {
-    return false;
-  }
-  const vector<gd::String> &groupsObjects =
-      container->GetObjectGroups().Get(objectOrGroupName).GetAllObjectsNames();
-  // Empty groups don't contain any behavior.
-  if (groupsObjects.empty()) {
-    return false;
-  }
-  // Check that all objects have the same type.
-  for (auto &&object : groupsObjects) {
-    if (!HasBehaviorInObjectOrGroup(project, layout, object, behaviorName,
-                                    false)) {
-      return false;
-    }
-  }
-  return true;
-}
-
 gd::String GD_CORE_API GetTypeOfBehavior(const gd::ObjectsContainer& project,
                                          const gd::ObjectsContainer& layout,
                                          gd::String name,

Core/GDCore/Project/Layout.h

@@ -442,14 +442,7 @@ gd::String GD_CORE_API GetTypeOfObject(const ObjectsContainer& game,
                                        const ObjectsContainer& layout,
                                        gd::String objectName,
                                        bool searchInGroups = true);
-/**
- * \brief Check if an object or all object of a group has a behavior.
- */
-bool GD_CORE_API HasBehaviorInObjectOrGroup(const gd::ObjectsContainer &project,
-                                            const gd::ObjectsContainer &layout,
-                                            const gd::String &objectOrGroupName,
-                                            const gd::String &behaviorName,
-                                            bool searchInGroups = true);
+
 /**
  * \brief Get a type from a behavior name
  * @return Type of the behavior.

Core/GDCore/Project/Object.h

@@ -5,17 +5,17 @@
  */
 #ifndef GDCORE_OBJECT_H
 #define GDCORE_OBJECT_H
+#include "GDCore/Vector2.h"
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/EffectsContainer.h"
 #include "GDCore/Project/ObjectConfiguration.h"
+#include "GDCore/Project/EffectsContainer.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/MakeUnique.h"
-#include "GDCore/Vector2.h"
 
 namespace gd {
 class PropertyDescriptor;
@@ -45,7 +45,7 @@ class GD_CORE_API Object {
 
   /**
    * Create a new object with the name passed as argument.
-   *
+   * 
    * Object takes the ownership of the configuration.
    */
   Object(const gd::String& name,
@@ -104,9 +104,7 @@ class GD_CORE_API Object {
 
   /** \brief Change the asset store id of the object.
    */
-  void SetAssetStoreId(const gd::String& assetStoreId_) {
-    assetStoreId = assetStoreId_;
-  };
+  void SetAssetStoreId(const gd::String& assetStoreId_) { assetStoreId = assetStoreId_; };
 
   /** \brief Return the asset store id of the object.
    */
@@ -114,11 +112,15 @@ class GD_CORE_API Object {
 
   /** \brief Change the type of the object.
    */
-  void SetType(const gd::String& type_) { configuration->SetType(type_); }
+  void SetType(const gd::String& type_) {
+    configuration->SetType(type_);
+  }
 
   /** \brief Return the type of the object.
    */
-  const gd::String& GetType() const { return configuration->GetType(); }
+  const gd::String& GetType() const {
+    return configuration->GetType();
+  }
 
   /** \brief Change the tags of the object.
    */
@@ -127,10 +129,6 @@ class GD_CORE_API Object {
   /** \brief Return the tags of the object.
    */
   const gd::String& GetTags() const { return tags; }
-
-  /** \brief Shortcut to check if the object is a 3D object.
-   */
-  bool Is3DObject() const { return configuration->Is3DObject(); }
   ///@}
 
   /** \name Behaviors management
@@ -226,12 +224,12 @@ class GD_CORE_API Object {
    * effects.
    */
   gd::EffectsContainer& GetEffects() { return effectsContainer; }
-  ///@}
+///@}
 
-  /** \name Serialization
-   * Members functions related to serialization of the object
-   */
-  ///@{
+/** \name Serialization
+ * Members functions related to serialization of the object
+ */
+///@{
   /**
    * \brief Serialize the object.
    * \see DoSerializeTo
@@ -246,9 +244,8 @@ class GD_CORE_API Object {
   ///@}
 
  protected:
-  gd::String name;          ///< The full name of the object
-  gd::String assetStoreId;  ///< The ID of the asset if the object comes from
-                            ///< the store.
+  gd::String name;  ///< The full name of the object
+  gd::String assetStoreId;  ///< The ID of the asset if the object comes from the store.
   std::unique_ptr<gd::ObjectConfiguration> configuration;
   std::map<gd::String, std::unique_ptr<gd::Behavior>>
       behaviors;  ///< Contains all behaviors and their properties for the
@@ -263,7 +260,7 @@ class GD_CORE_API Object {
   /**
    * Initialize object using another object. Used by copy-ctor and assign-op.
    * Don't forget to update me if members were changed!
-   *
+   * 
    * It's needed because there is no default copy for a map of unique_ptr like
    * behaviors and it must be a deep copy.
    */
@@ -286,4 +283,14 @@ struct ObjectHasName : public std::binary_function<std::unique_ptr<gd::Object>,
 
 }  // namespace gd
 
+/**
+ * An object list is a vector containing (smart) pointers to objects.
+ */
+using ObjList = std::vector<std::unique_ptr<gd::Object>>;
+
+/**
+ * Objects are usually managed thanks to (smart) pointers.
+ */
+using ObjSPtr = std::unique_ptr<gd::Object>;
+
 #endif  // GDCORE_OBJECT_H

Core/GDCore/Project/ObjectConfiguration.cpp

@@ -20,7 +20,7 @@ namespace gd {
 
 ObjectConfiguration::~ObjectConfiguration() {}
 
-ObjectConfiguration::ObjectConfiguration(): is3DObject(false) {}
+ObjectConfiguration::ObjectConfiguration() {}
 
 std::map<gd::String, gd::PropertyDescriptor> ObjectConfiguration::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;

Core/GDCore/Project/ObjectConfiguration.h

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

Core/GDCore/Project/ObjectGroup.cpp

@@ -5,10 +5,8 @@
  */
 
 #include "ObjectGroup.h"
-
 #include <algorithm>
 #include <vector>
-
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 
@@ -43,9 +41,8 @@ void ObjectGroup::SerializeTo(SerializerElement& element) const {
 
   SerializerElement& objectsElement = element.AddChild("objects");
   objectsElement.ConsiderAsArrayOf("object");
-  for (auto& name : GetAllObjectsNames()) {
+  for (auto& name : GetAllObjectsNames())
     objectsElement.AddChild("object").SetAttribute("name", name);
-  }
 }
 
 void ObjectGroup::UnserializeFrom(const SerializerElement& element) {

Core/GDCore/Project/ObjectGroup.h

@@ -8,9 +8,7 @@
 #define GDCORE_OBJECTGROUP_H
 #include <utility>
 #include <vector>
-
 #include "GDCore/String.h"
-
 namespace gd {
 class SerializerElement;
 }

Core/GDCore/Project/ObjectGroupsContainer.cpp

@@ -4,113 +4,79 @@
  * reserved. This project is released under the MIT License.
  */
 
-#include "ObjectGroupsContainer.h"
-
-#include <memory>
-
+#include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectGroup.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
-#include "GDCore/Tools/MakeUnique.h"
 
 namespace gd {
-gd::ObjectGroup ObjectGroupsContainer::badGroup;
 
-ObjectGroupsContainer::ObjectGroupsContainer() {}
-
-ObjectGroupsContainer::ObjectGroupsContainer(
-    const ObjectGroupsContainer& other) {
-  Init(other);
-}
-
-ObjectGroupsContainer& ObjectGroupsContainer::operator=(
-    const ObjectGroupsContainer& other) {
-  if (this != &other) Init(other);
-
-  return *this;
-}
-
-void ObjectGroupsContainer::Init(const ObjectGroupsContainer& other) {
-  objectGroups.clear();
-  for (auto& it : other.objectGroups) {
-    objectGroups.push_back(gd::make_unique<gd::ObjectGroup>(*it));
-  }
-}
-
-void ObjectGroupsContainer::SerializeTo(SerializerElement& element) const {
-  element.ConsiderAsArrayOf("group");
-  for (std::size_t i = 0; i < objectGroups.size(); ++i) {
-    objectGroups[i]->SerializeTo(element.AddChild("group"));
-  }
-}
-
-void ObjectGroupsContainer::UnserializeFrom(const SerializerElement& element) {
-  objectGroups.clear();
-  element.ConsiderAsArrayOf("group", "Groupe");
-  for (std::size_t i = 0; i < element.GetChildrenCount(); ++i) {
-    const SerializerElement& groupElement = element.GetChild(i);
-    gd::ObjectGroup& objectGroup =
-        InsertNew(element.GetStringAttribute("name", "", "nom"), -1);
-    objectGroup.UnserializeFrom(groupElement);
-  }
-}
+ObjectGroup ObjectGroupsContainer::badGroup;
 
 bool ObjectGroupsContainer::Has(const gd::String& name) const {
-  auto i = std::find_if(objectGroups.begin(),
-                        objectGroups.end(),
-                        [&name](const std::unique_ptr<gd::ObjectGroup>& group) {
-                          return group->GetName() == name;
-                        });
+  auto i = std::find_if(
+      objectGroups.begin(),
+      objectGroups.end(),
+      [&name](const ObjectGroup& group) { return group.GetName() == name; });
   return (i != objectGroups.end());
 }
 
 ObjectGroup& ObjectGroupsContainer::Get(std::size_t index) {
-  if (index < objectGroups.size()) return *objectGroups[index];
+  if (index < objectGroups.size()) return objectGroups[index];
 
   return badGroup;
 }
 
 const ObjectGroup& ObjectGroupsContainer::Get(std::size_t index) const {
-  if (index < objectGroups.size()) return *objectGroups[index];
+  if (index < objectGroups.size()) return objectGroups[index];
 
   return badGroup;
 }
 
 ObjectGroup& ObjectGroupsContainer::Get(const gd::String& name) {
-  auto i = std::find_if(objectGroups.begin(),
-                        objectGroups.end(),
-                        [&name](const std::unique_ptr<gd::ObjectGroup>& group) {
-                          return group->GetName() == name;
-                        });
-  if (i != objectGroups.end()) return **i;
+  auto i = std::find_if(
+      objectGroups.begin(),
+      objectGroups.end(),
+      [&name](const ObjectGroup& group) { return group.GetName() == name; });
+  if (i != objectGroups.end()) return *i;
 
   return badGroup;
 }
 
 const ObjectGroup& ObjectGroupsContainer::Get(const gd::String& name) const {
-  auto i = std::find_if(objectGroups.begin(),
-                        objectGroups.end(),
-                        [&name](const std::unique_ptr<gd::ObjectGroup>& group) {
-                          return group->GetName() == name;
-                        });
-  if (i != objectGroups.end()) return **i;
+  auto i = std::find_if(
+      objectGroups.begin(),
+      objectGroups.end(),
+      [&name](const ObjectGroup& group) { return group.GetName() == name; });
+  if (i != objectGroups.end()) return *i;
 
   return badGroup;
 }
 
+ObjectGroup& ObjectGroupsContainer::Insert(const gd::ObjectGroup& group,
+                                           std::size_t position) {
+  if (position < objectGroups.size()) {
+    objectGroups.insert(objectGroups.begin() + position, group);
+    return objectGroups[position];
+  } else {
+    objectGroups.push_back(group);
+    return objectGroups.back();
+  }
+}
+
+#if defined(GD_IDE_ONLY)
 void ObjectGroupsContainer::Remove(const gd::String& name) {
-  objectGroups.erase(
-      std::remove_if(objectGroups.begin(),
-                     objectGroups.end(),
-                     [&name](const std::unique_ptr<gd::ObjectGroup>& group) {
-                       return group->GetName() == name;
-                     }),
-      objectGroups.end());
+  objectGroups.erase(std::remove_if(objectGroups.begin(),
+                                    objectGroups.end(),
+                                    [&name](const ObjectGroup& group) {
+                                      return group.GetName() == name;
+                                    }),
+                     objectGroups.end());
 }
 
 std::size_t ObjectGroupsContainer::GetPosition(const gd::String& name) const {
   for (std::size_t i = 0; i < objectGroups.size(); ++i) {
-    if (objectGroups[i]->GetName() == name) return i;
+    if (objectGroups[i].GetName() == name) return i;
   }
 
   return gd::String::npos;
@@ -118,36 +84,21 @@ std::size_t ObjectGroupsContainer::GetPosition(const gd::String& name) const {
 
 ObjectGroup& ObjectGroupsContainer::InsertNew(const gd::String& name,
                                               std::size_t position) {
-  gd::ObjectGroup& newlyInsertedGroup = *(*(objectGroups.insert(
-      position < objectGroups.size() ? objectGroups.begin() + position
-                                     : objectGroups.end(),
-      gd::make_unique<gd::ObjectGroup>())));
-  newlyInsertedGroup.SetName(name);
-  return newlyInsertedGroup;
-}
-
-ObjectGroup& ObjectGroupsContainer::Insert(const gd::ObjectGroup& group,
-                                           std::size_t position) {
-  gd::ObjectGroup& newlyInsertedGroup = *(*(objectGroups.insert(
-      position < objectGroups.size() ? objectGroups.begin() + position
-                                     : objectGroups.end(),
-      gd::make_unique<gd::ObjectGroup>(group))));
-  return newlyInsertedGroup;
+  ObjectGroup newGroup;
+  newGroup.SetName(name);
+  return Insert(newGroup, position);
 }
 
 bool ObjectGroupsContainer::Rename(const gd::String& oldName,
                                    const gd::String& newName) {
   if (Has(newName)) return false;
 
-  auto i =
-      std::find_if(objectGroups.begin(),
-                   objectGroups.end(),
-                   [&oldName](const std::unique_ptr<gd::ObjectGroup>& group) {
-                     return group->GetName() == oldName;
-                   });
-  if (i != objectGroups.end()) {
-    (*i)->SetName(newName);
-  }
+  auto i = std::find_if(objectGroups.begin(),
+                        objectGroups.end(),
+                        [&oldName](const ObjectGroup& group) {
+                          return group.GetName() == oldName;
+                        });
+  if (i != objectGroups.end()) i->SetName(newName);
 
   return true;
 }
@@ -156,10 +107,30 @@ void ObjectGroupsContainer::Move(std::size_t oldIndex, std::size_t newIndex) {
   if (oldIndex >= objectGroups.size() || newIndex >= objectGroups.size())
     return;
 
-  std::unique_ptr<gd::ObjectGroup> objectGroup =
-      std::move(objectGroups[oldIndex]);
+  auto group = objectGroups[oldIndex];
   objectGroups.erase(objectGroups.begin() + oldIndex);
-  objectGroups.insert(objectGroups.begin() + newIndex, std::move(objectGroup));
+  Insert(group, newIndex);
+}
+#endif
+
+void ObjectGroupsContainer::SerializeTo(SerializerElement& element) const {
+  element.ConsiderAsArrayOf("group");
+  for (auto& group : objectGroups) {
+    SerializerElement& groupElement = element.AddChild("group");
+    group.SerializeTo(groupElement);
+  }
+}
+
+void ObjectGroupsContainer::UnserializeFrom(const SerializerElement& element) {
+  objectGroups.clear();
+  element.ConsiderAsArrayOf("group", "Groupe");
+  for (std::size_t i = 0; i < element.GetChildrenCount(); ++i) {
+    SerializerElement& groupElement = element.GetChild(i);
+    gd::ObjectGroup objectGroup;
+
+    objectGroup.UnserializeFrom(groupElement);
+    objectGroups.push_back(objectGroup);
+  }
 }
 
 }  // namespace gd

Core/GDCore/Project/ObjectGroupsContainer.h

@@ -6,10 +6,8 @@
 
 #ifndef GDCORE_OBJECTGROUPSCONTAINER_H
 #define GDCORE_OBJECTGROUPSCONTAINER_H
-#include <algorithm>
-#include <memory>
 #include <vector>
-
+#include <algorithm>
 #include "GDCore/Project/ObjectGroup.h"
 #include "GDCore/String.h"
 namespace gd {
@@ -28,10 +26,8 @@ namespace gd {
  */
 class GD_CORE_API ObjectGroupsContainer {
  public:
-  ObjectGroupsContainer();
-  ObjectGroupsContainer(const ObjectGroupsContainer&);
+  ObjectGroupsContainer(){};
   virtual ~ObjectGroupsContainer(){};
-  ObjectGroupsContainer& operator=(const ObjectGroupsContainer& rhs);
 
   /**
    * \brief Return true if the specified group is in the container
@@ -175,14 +171,8 @@ class GD_CORE_API ObjectGroupsContainer {
   const ObjectGroup& at(size_t index) const { return Get(index); };
   ///@}
 
-  /**
-   * Initialize from another object groups container. Used by copy-ctor and
-   * assign-op. Don't forget to update me if members were changed!
-   */
-  void Init(const gd::ObjectGroupsContainer& other);
-
  private:
-  std::vector<std::unique_ptr<gd::ObjectGroup>> objectGroups;
+  std::vector<ObjectGroup> objectGroups;
   static ObjectGroup badGroup;
 };
 

Core/GDCore/Project/ObjectsContainer.cpp

@@ -4,9 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Project/ObjectsContainer.h"
-
 #include <algorithm>
-
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -18,12 +16,14 @@ ObjectsContainer::ObjectsContainer() {}
 
 ObjectsContainer::~ObjectsContainer() {}
 
+#if defined(GD_IDE_ONLY)
 void ObjectsContainer::SerializeObjectsTo(SerializerElement& element) const {
   element.ConsiderAsArrayOf("object");
   for (std::size_t j = 0; j < initialObjects.size(); j++) {
     initialObjects[j]->SerializeTo(element.AddChild("object"));
   }
 }
+#endif
 
 void ObjectsContainer::UnserializeObjectsFrom(
     gd::Project& project, const SerializerElement& element) {
@@ -75,6 +75,7 @@ std::size_t ObjectsContainer::GetObjectPosition(const gd::String& name) const {
 std::size_t ObjectsContainer::GetObjectsCount() const {
   return initialObjects.size();
 }
+#if defined(GD_IDE_ONLY)
 gd::Object& ObjectsContainer::InsertNewObject(const gd::Project& project,
                                               const gd::String& objectType,
                                               const gd::String& name,
@@ -86,6 +87,7 @@ gd::Object& ObjectsContainer::InsertNewObject(const gd::Project& project,
 
   return newlyCreatedObject;
 }
+#endif
 
 gd::Object& ObjectsContainer::InsertObject(const gd::Object& object,
                                            std::size_t position) {
@@ -117,7 +119,7 @@ void ObjectsContainer::MoveObject(std::size_t oldIndex, std::size_t newIndex) {
 }
 
 void ObjectsContainer::RemoveObject(const gd::String& name) {
-  std::vector<std::unique_ptr<gd::Object>>::iterator objectIt =
+  std::vector<std::unique_ptr<gd::Object> >::iterator objectIt =
       find_if(initialObjects.begin(),
               initialObjects.end(),
               bind2nd(ObjectHasName(), name));
@@ -130,7 +132,7 @@ void ObjectsContainer::MoveObjectToAnotherContainer(
     const gd::String& name,
     gd::ObjectsContainer& newContainer,
     std::size_t newPosition) {
-  std::vector<std::unique_ptr<gd::Object>>::iterator objectIt =
+  std::vector<std::unique_ptr<gd::Object> >::iterator objectIt =
       find_if(initialObjects.begin(),
               initialObjects.end(),
               bind2nd(ObjectHasName(), name));

Core/GDCore/Project/Project.cpp

@@ -65,8 +65,6 @@ Project::Project()
       pixelsRounding(false),
       adaptGameResolutionAtRuntime(true),
       sizeOnStartupMode("adaptWidth"),
-      antialiasingMode("MSAA"),
-      isAntialisingEnabledOnMobile(false),
       projectUuid(""),
       useDeprecatedZeroAsDefaultZOrder(false),
       useExternalSourceFiles(false),
@@ -83,23 +81,24 @@ Project::~Project() {}
 void Project::ResetProjectUuid() { projectUuid = UUID::MakeUuid4(); }
 
 std::unique_ptr<gd::Object> Project::CreateObject(
-    const gd::String& type, const gd::String& name) const {
-  return gd::make_unique<Object>(name, type, CreateObjectConfiguration(type));
+  const gd::String& type,
+  const gd::String& name) const {
+    return gd::make_unique<Object>(name, type, CreateObjectConfiguration(type));
 }
 
 std::unique_ptr<gd::ObjectConfiguration> Project::CreateObjectConfiguration(
-    const gd::String& type) const {
+  const gd::String& type) const {
   if (Project::HasEventsBasedObject(type)) {
     return gd::make_unique<CustomObjectConfiguration>(*this, type);
-  } else {
+  }
+  else {
     // Create a base object if the type can't be found in the platform.
     return currentPlatform->CreateObjectConfiguration(type);
   }
 }
 
 bool Project::HasEventsBasedObject(const gd::String& type) const {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
+  const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
   if (separatorIndex == std::string::npos) {
     return false;
   }
@@ -107,67 +106,59 @@ bool Project::HasEventsBasedObject(const gd::String& type) const {
   if (!Project::HasEventsFunctionsExtensionNamed(extensionName)) {
     return false;
   }
-  auto& extension = Project::GetEventsFunctionsExtension(extensionName);
+  auto &extension = Project::GetEventsFunctionsExtension(extensionName);
   gd::String objectTypeName = type.substr(separatorIndex + 2);
   return extension.GetEventsBasedObjects().Has(objectTypeName);
 }
 
 gd::EventsBasedObject& Project::GetEventsBasedObject(const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
+  const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
   gd::String extensionName = type.substr(0, separatorIndex);
   gd::String objectTypeName = type.substr(separatorIndex + 2);
 
-  auto& extension = Project::GetEventsFunctionsExtension(extensionName);
+  auto &extension = Project::GetEventsFunctionsExtension(extensionName);
   return extension.GetEventsBasedObjects().Get(objectTypeName);
 }
 
-const gd::EventsBasedObject& Project::GetEventsBasedObject(
-    const gd::String& type) const {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
+const gd::EventsBasedObject& Project::GetEventsBasedObject(const gd::String& type) const {
+  const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
   gd::String extensionName = type.substr(0, separatorIndex);
   gd::String objectTypeName = type.substr(separatorIndex + 2);
 
-  const auto& extension = Project::GetEventsFunctionsExtension(extensionName);
+  const auto &extension = Project::GetEventsFunctionsExtension(extensionName);
   return extension.GetEventsBasedObjects().Get(objectTypeName);
 }
 
 bool Project::HasEventsBasedBehavior(const gd::String& type) const {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return false;
-  }
-  gd::String extensionName = type.substr(0, separatorIndex);
-  if (!Project::HasEventsFunctionsExtensionNamed(extensionName)) {
-    return false;
-  }
-  auto& extension = Project::GetEventsFunctionsExtension(extensionName);
-  gd::String behaviorTypeName = type.substr(separatorIndex + 2);
-  return extension.GetEventsBasedBehaviors().Has(behaviorTypeName);
+    const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+    if (separatorIndex == std::string::npos) {
+      return false;
+    }
+    gd::String extensionName = type.substr(0, separatorIndex);
+    if (!Project::HasEventsFunctionsExtensionNamed(extensionName)) {
+      return false;
+    }
+    auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+    gd::String behaviorTypeName = type.substr(separatorIndex + 2);
+    return extension.GetEventsBasedBehaviors().Has(behaviorTypeName);
 }
 
-gd::EventsBasedBehavior& Project::GetEventsBasedBehavior(
-    const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  gd::String extensionName = type.substr(0, separatorIndex);
-  gd::String behaviorTypeName = type.substr(separatorIndex + 2);
+gd::EventsBasedBehavior& Project::GetEventsBasedBehavior(const gd::String& type) {
+    const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+    gd::String extensionName = type.substr(0, separatorIndex);
+    gd::String behaviorTypeName = type.substr(separatorIndex + 2);
 
-  auto& extension = Project::GetEventsFunctionsExtension(extensionName);
-  return extension.GetEventsBasedBehaviors().Get(behaviorTypeName);
+    auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+    return extension.GetEventsBasedBehaviors().Get(behaviorTypeName);
 }
 
-const gd::EventsBasedBehavior& Project::GetEventsBasedBehavior(
-    const gd::String& type) const {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  gd::String extensionName = type.substr(0, separatorIndex);
-  gd::String behaviorTypeName = type.substr(separatorIndex + 2);
+const gd::EventsBasedBehavior& Project::GetEventsBasedBehavior(const gd::String& type) const {
+    const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+    gd::String extensionName = type.substr(0, separatorIndex);
+    gd::String behaviorTypeName = type.substr(separatorIndex + 2);
 
-  auto& extension = Project::GetEventsFunctionsExtension(extensionName);
-  return extension.GetEventsBasedBehaviors().Get(behaviorTypeName);
+    auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+    return extension.GetEventsBasedBehaviors().Get(behaviorTypeName);
 }
 
 std::shared_ptr<gd::BaseEvent> Project::CreateEvent(
@@ -387,7 +378,7 @@ void Project::MoveExternalLayout(std::size_t oldIndex, std::size_t newIndex) {
 };
 
 void Project::MoveEventsFunctionsExtension(std::size_t oldIndex,
-                                           std::size_t newIndex) {
+                                          std::size_t newIndex) {
   if (oldIndex >= eventsFunctionsExtensions.size() ||
       newIndex >= eventsFunctionsExtensions.size())
     return;
@@ -630,8 +621,6 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   SetAdaptGameResolutionAtRuntime(
       propElement.GetBoolAttribute("adaptGameResolutionAtRuntime", false));
   SetSizeOnStartupMode(propElement.GetStringAttribute("sizeOnStartupMode", ""));
-  SetAntialiasingMode(propElement.GetStringAttribute("antialiasingMode", "MSAA"));
-  SetAntialisingEnabledOnMobile(propElement.GetBoolAttribute("antialisingEnabledOnMobile", false));
   SetProjectUuid(propElement.GetStringAttribute("projectUuid", ""));
   SetAuthor(propElement.GetChild("author", 0, "Auteur").GetValue().GetString());
   SetPackageName(propElement.GetStringAttribute("packageName"));
@@ -886,8 +875,6 @@ void Project::SerializeTo(SerializerElement& element) const {
   propElement.SetAttribute("adaptGameResolutionAtRuntime",
                            adaptGameResolutionAtRuntime);
   propElement.SetAttribute("sizeOnStartupMode", sizeOnStartupMode);
-  propElement.SetAttribute("antialiasingMode", antialiasingMode);
-  propElement.SetAttribute("antialisingEnabledOnMobile", isAntialisingEnabledOnMobile);
   propElement.SetAttribute("projectUuid", projectUuid);
   propElement.SetAttribute("folderProject", folderProject);
   propElement.SetAttribute("packageName", packageName);
@@ -1018,7 +1005,7 @@ void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   // Add layouts resources
   for (std::size_t s = 0; s < GetLayoutsCount(); s++) {
     for (std::size_t j = 0; j < GetLayout(s).GetObjectsCount();
-         ++j) {  // Add objects resources
+         ++j) { // Add objects resources
       GetLayout(s).GetObject(j).GetConfiguration().ExposeResources(worker);
     }
 
@@ -1119,8 +1106,6 @@ void Project::Init(const gd::Project& game) {
   pixelsRounding = game.pixelsRounding;
   adaptGameResolutionAtRuntime = game.adaptGameResolutionAtRuntime;
   sizeOnStartupMode = game.sizeOnStartupMode;
-  antialiasingMode = game.antialiasingMode;
-  isAntialisingEnabledOnMobile = game.isAntialisingEnabledOnMobile;
   projectUuid = game.projectUuid;
   useDeprecatedZeroAsDefaultZOrder = game.useDeprecatedZeroAsDefaultZOrder;
 

Core/GDCore/Project/Project.h

@@ -383,26 +383,6 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   void SetPixelsRounding(bool enable) { pixelsRounding = enable; }
 
-  /**
-   * Return the antialiasing mode used by the game ("none" or "MSAA").
-   */
-  const gd::String& GetAntialiasingMode() const { return antialiasingMode; }
-
-  /**
-   * Set the antialiasing mode used by the game ("none" or "MSAA").
-   */
-  void SetAntialiasingMode(const gd::String& antialiasingMode_) { antialiasingMode = antialiasingMode_; }
-
-  /**
-   * Return true if antialising is enabled on mobiles.
-   */
-  bool IsAntialisingEnabledOnMobile() const { return isAntialisingEnabledOnMobile; }
-
-  /**
-   * Set whether antialising is enabled on mobiles or not.
-   */
-  void SetAntialisingEnabledOnMobile(bool enable) { isAntialisingEnabledOnMobile = enable; }
-
   /**
    * \brief Return if the project should set 0 as Z-order for objects created
    * from events (which is deprecated) - instead of the highest Z order that was
@@ -1060,8 +1040,6 @@ class GD_CORE_API Project : public ObjectsContainer {
   gd::String
       sizeOnStartupMode;   ///< How to adapt the game size to the screen. Can be
                            ///< "adaptWidth", "adaptHeight" or empty
-  gd::String antialiasingMode;
-  bool isAntialisingEnabledOnMobile;
   gd::String projectUuid;  ///< UUID useful to identify the game in online
                            ///< services or database that would require it.
   bool useDeprecatedZeroAsDefaultZOrder;  ///< If true, objects created from

Core/GDCore/Project/ResourcesManager.cpp

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

Core/GDCore/Project/ResourcesManager.h

@@ -142,7 +142,7 @@ class GD_CORE_API Resource {
   virtual void SerializeTo(SerializerElement& element) const {};
 
   /**
-   * \brief Unserialize the object.
+   * \brief Unserialize the objectt.
    */
   virtual void UnserializeFrom(const SerializerElement& element){};
 
@@ -195,7 +195,7 @@ class GD_CORE_API ImageResource : public Resource {
   void SerializeTo(SerializerElement& element) const override;
 
   /**
-   * \brief Unserialize the object.
+   * \brief Unserialize the objectt.
    */
   void UnserializeFrom(const SerializerElement& element) override;
 
@@ -481,32 +481,6 @@ class GD_CORE_API BitmapFontResource : public Resource {
   gd::String file;
 };
 
-/**
- * \brief Describe a 3D model file used by a project.
- *
- * \see Resource
- * \ingroup ResourcesManagement
- */
-class GD_CORE_API Model3DResource : public Resource {
- public:
-  Model3DResource() : Resource() { SetKind("model3D"); };
-  virtual ~Model3DResource(){};
-  virtual Model3DResource* Clone() const override {
-    return new Model3DResource(*this);
-  }
-
-  virtual const gd::String& GetFile() const override { return file; };
-  virtual void SetFile(const gd::String& newFile) override;
-
-  virtual bool UseFile() const override { return true; }
-  void SerializeTo(SerializerElement& element) const override;
-
-  void UnserializeFrom(const SerializerElement& element) override;
-
- private:
-  gd::String file;
-};
-
 /**
  * \brief Inventory all resources used by a project
  *
@@ -663,7 +637,7 @@ class GD_CORE_API ResourcesManager {
   void SerializeTo(SerializerElement& element) const;
 
   /**
-   * \brief Unserialize the object.
+   * \brief Unserialize the objectt.
    */
   void UnserializeFrom(const SerializerElement& element);
 
@@ -740,7 +714,7 @@ class GD_CORE_API ResourceFolder {
   void SerializeTo(SerializerElement& element) const;
 
   /**
-   * \brief Unserialize the object.
+   * \brief Unserialize the objectt.
    */
   void UnserializeFrom(const SerializerElement& element,
                        gd::ResourcesManager& parentManager);

Core/GDCore/Serialization/rapidjson/document.h

@@ -2280,7 +2280,7 @@ public:
     //!@name Handling parse errors
     //!@{
 
-    //! Whether a parse error has occurred in the last parsing.
+    //! Whether a parse error has occured in the last parsing.
     bool HasParseError() const { return parseResult_.IsError(); }
 
     //! Get the \ref ParseErrorCode of last parsing.

Core/GDCore/Serialization/rapidjson/reader.h

@@ -527,7 +527,7 @@ public:
         return Parse<kParseDefaultFlags>(is, handler);
     }
 
-    //! Whether a parse error has occurred in the last parsing.
+    //! Whether a parse error has occured in the last parsing.
     bool HasParseError() const { return parseResult_.IsError(); }
 
     //! Get the \ref ParseErrorCode of last parsing.

Core/GDCore/String.cpp

@@ -686,16 +686,6 @@ String GD_CORE_API operator+(const char *lhs, const String &rhs)
     return str;
 }
 
-const String& GD_CORE_API operator||(const String& lhs, const String &rhs)
-{
-    return lhs.empty() ? rhs : lhs;
-}
-
-String GD_CORE_API operator||(String lhs, const char *rhs)
-{
-    return lhs.empty() ? rhs : lhs;
-}
-
 bool GD_CORE_API operator==( const String &lhs, const String &rhs )
 {
     return (lhs.compare(rhs) == 0);

Core/GDCore/String.h

@@ -584,32 +584,32 @@ public:
     String substr( size_type start = 0, size_type length = npos ) const;
 
     /**
-     * \return the position of the first occurrence of **search** starting from **pos**.
+     * \return the position of the first occurence of **search** starting from **pos**.
      */
     size_type find( const String &search, size_type pos = 0 ) const;
 
     /**
-     * \return the position of the first occurrence of **search** starting from **pos**.
+     * \return the position of the first occurence of **search** starting from **pos**.
      */
     size_type find( const char *search, size_type pos = 0 ) const;
 
     /**
-     * \return the position of the first occurrence of **search** starting from **pos**.
+     * \return the position of the first occurence of **search** starting from **pos**.
      */
     size_type find( const value_type search, size_type pos = 0 ) const;
 
     /**
-     * \return the position of the last occurrence of **search** starting before **pos**.
+     * \return the position of the last occurence of **search** starting before **pos**.
      */
     size_type rfind( const String &search, size_type pos = npos ) const;
 
     /**
-     * \return the position of the last occurrence of **search** starting before **pos**.
+     * \return the position of the last occurence of **search** starting before **pos**.
      */
     size_type rfind( const char *search, size_type pos = npos ) const;
 
     /**
-     * \return the position of the last occurrence of **search** starting before **pos**.
+     * \return the position of the last occurence of **search** starting before **pos**.
      */
     size_type rfind( const value_type &search, size_type pos = npos ) const;
 
@@ -658,7 +658,7 @@ public:
 
     /**
      * \brief Do a case-insensitive search
-     * \return the position of the first occurrence of **search** starting from **pos**.
+     * \return the position of the first occurence of **search** starting from **pos**.
      *
      * \note This method isn't very efficient as it is linear on the string size times the
      * search string size
@@ -699,10 +699,6 @@ String GD_CORE_API operator+(String lhs, const char *rhs);
  */
 String GD_CORE_API operator+(const char *lhs, const String &rhs);
 
-const String& GD_CORE_API operator||(const String &lhs, const String &rhs);
-
-String GD_CORE_API operator||(String lhs, const char *rhs);
-
 /**
  * \}
  */

Core/GDCore/TinyXml/tinyxml.h

@@ -577,7 +577,7 @@ public:
 	#endif
 
 	/** Add a new node related to this. Adds a child past the LastChild.
-		Returns a pointer to the new object or NULL if an error occurred.
+		Returns a pointer to the new object or NULL if an error occured.
 	*/
 	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
 
@@ -594,17 +594,17 @@ public:
 	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
 
 	/** Add a new node related to this. Adds a child before the specified child.
-		Returns a pointer to the new object or NULL if an error occurred.
+		Returns a pointer to the new object or NULL if an error occured.
 	*/
 	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
 
 	/** Add a new node related to this. Adds a child after the specified child.
-		Returns a pointer to the new object or NULL if an error occurred.
+		Returns a pointer to the new object or NULL if an error occured.
 	*/
 	TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
 
 	/** Replace a child of this node.
-		Returns a pointer to the new object or NULL if an error occurred.
+		Returns a pointer to the new object or NULL if an error occured.
 	*/
 	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
 
@@ -1471,7 +1471,7 @@ public:
 		@sa SetTabSize, Row, Column
 	*/
 	int ErrorRow() const	{ return errorLocation.row+1; }
-	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occurred. See ErrorRow()
+	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
 
 	/** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
 		to report the correct values for row and column. It does not change the output

Core/GDevelop-Architecture-Overview.md

@@ -99,7 +99,7 @@ Everything in GDevelop.js is meant to create a "bridge" allowing us to run and u
 
 ### I want all the gory details about GDevelop.js 🧐
 
-All the required C++ files are imported into this huge list: <https://github.com/4ian/GDevelop/blob/master/GDevelop.js/Bindings/Wrapper.cpp#L1-L79>. C++ compilation is done with a "build system" called CMake, which is using [this file](https://github.com/4ian/GDevelop/blob/master/GDevelop.js/CMakeLists.txt#L82-L101) to see what to compile.
+All the required C++ files are imported into this huge list: https://github.com/4ian/GDevelop/blob/master/GDevelop.js/Bindings/Wrapper.cpp#L1-L79. C++ compilation is done with a "build system" called CMake, which is using [this file](https://github.com/4ian/GDevelop/blob/master/GDevelop.js/CMakeLists.txt#L82-L101) to see what to compile.
 
 > In an ideal world, there would be something to do this automatically, so the GDevelop.js folder would not even exist 😉
 > If you're interested and want to know more about GDevelop.js bridging between C++ and JavaScript, look at [this talk from GDevelop original author](https://www.youtube.com/watch?v=6La7jSCnYyk).

Core/README.md

@@ -6,7 +6,7 @@ GDevelop Core is a portable C++ library, compiled to be used in JavaScript in th
 
 ## 1) Getting started 🤓
 
-First, take a look at the _[README.md](../README.md)_ at the root of the repository and the [developer documentation](https://docs.gdevelop.io/).
+First, take a look at the _Readme.md_ at the root of the repository and the [developer documentation](https://docs.gdevelop.io/).
 
 ## 2) How to contribute 😎
 
@@ -21,5 +21,5 @@ or any pull request so as to add a nice feature, do not hesitate to get in touch
 
 ## License
 
-GDevelop Core is distributed under the MIT license: see [LICENSE.md](LICENSE.md) for
+GDevelop Core is distributed under the MIT license: see license.txt for
 more information.

Core/license.txt

@@ -12,16 +12,16 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 
 External libraries used by GDevelop Core

Core/tests/DummyPlatform.cpp

@@ -124,14 +124,6 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
       .AddParameter("expression", _("Number parameter"))
       .SetRequiresBaseObjectCapability("effect")
       .SetFunctionName("getSomethingRequiringEffectCapability");
-  baseObject
-      .AddExpression("GetFromBaseExpression",
-                     "This works on any object.",
-                     "",
-                     "",
-                     "")
-      .AddParameter("object", _("Object"), "")
-      .SetFunctionName("getFromBaseExpression");
 
   // Create an extension with various stuff inside.
   std::shared_ptr<gd::PlatformExtension> extension =