Attempt to remove modal window frame to hide close button on linux

.github/ISSUE_TEMPLATE/--asset-store-submission.md

@@ -1,19 +0,0 @@
----
-name: "📦 Asset Store submission"
-about: Submit a free asset pack for the GDevelop Asset Store.
-title: ''
-labels: "📦 Asset Store submission" 
-assignees: ''
-
----
-
-BEFORE opening a new submission, please make sure that you:
-
-- You have packaged the asset pack according [these rules](https://wiki.gdevelop.io/gdevelop5/community/contribute-to-the-assets-store). Otherwise, your package may be rejected or we will ask you to do the changes.
-
-## Description
-
-- License:
-- Author:
-- Link to the original website:
-- Zip file:

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -43,7 +43,7 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
   std::size_t relationalOperatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "relationalOperator")
+    if (instrInfos.parameters[i].type == "relationalOperator")
       relationalOperatorIndex = i;
   }
   // Ensure that there is at least one parameter after the relational operator
@@ -95,7 +95,7 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -164,7 +164,7 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -215,7 +215,7 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
   std::size_t operatorIndex = instrInfos.parameters.size();
   for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
@@ -293,7 +293,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   // 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())) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
@@ -303,11 +303,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
+      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+                     instrInfos.parameters[pNb].supplementaryInformation) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -485,7 +485,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
 
   // 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())) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
       if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
           !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
@@ -493,11 +493,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
               objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
+      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+                     instrInfos.parameters[pNb].supplementaryInformation) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -670,18 +670,6 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
-    if (operatorString == "=") {
-        return "==";
-    }
-    if (operatorString != "<" && operatorString != ">" &&
-        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      return "==";
-    }
-    return operatorString;
-}
-
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -691,24 +679,31 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
         supplementaryParametersTypes) {
   gd::String argOutput;
 
-  if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
+  if (ParameterMetadata::IsExpression("number", metadata.type)) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "number", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
+  } else if (ParameterMetadata::IsExpression("string", metadata.type)) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
         *this, context, "string", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
+  } else if (ParameterMetadata::IsExpression("variable", metadata.type)) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.GetType(), parameter, lastObjectName);
-  } else if (ParameterMetadata::IsObject(metadata.GetType())) {
+        *this, context, metadata.type, parameter, lastObjectName);
+  } else if (ParameterMetadata::IsObject(metadata.type)) {
     // It would be possible to run a gd::ExpressionCodeGenerator if later
     // objects can have nested objects, or function returning objects.
     argOutput =
-        GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
-  } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
+        GenerateObject(parameter.GetPlainString(), metadata.type, context);
+  } else if (metadata.type == "relationalOperator") {
+    auto parameterString = parameter.GetPlainString();
+    argOutput += parameterString == "=" ? "==" : parameterString;
+    if (argOutput != "==" && argOutput != "<" && argOutput != ">" &&
+        argOutput != "<=" && argOutput != ">=" && argOutput != "!=") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      argOutput = "==";
+    }
+
     argOutput = "\"" + argOutput + "\"";
-  } else if (metadata.GetType() == "operator") {
+  } else if (metadata.type == "operator") {
     argOutput += parameter.GetPlainString();
     if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
         argOutput != "/" && argOutput != "*") {
@@ -717,28 +712,28 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     }
 
     argOutput = "\"" + argOutput + "\"";
-  } else if (ParameterMetadata::IsBehavior(metadata.GetType())) {
+  } else if (ParameterMetadata::IsBehavior(metadata.type)) {
     argOutput = GenerateGetBehaviorNameCode(parameter.GetPlainString());
-  } else if (metadata.GetType() == "key") {
+  } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "audioResource" ||
-             metadata.GetType() == "bitmapFontResource" ||
-             metadata.GetType() == "fontResource" ||
-             metadata.GetType() == "imageResource" ||
-             metadata.GetType() == "jsonResource" ||
-             metadata.GetType() == "videoResource" ||
+  } else if (metadata.type == "audioResource" ||
+             metadata.type == "bitmapFontResource" ||
+             metadata.type == "fontResource" ||
+             metadata.type == "imageResource" ||
+             metadata.type == "jsonResource" ||
+             metadata.type == "videoResource" ||
              // Deprecated, old parameter names:
-             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
-             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
+             metadata.type == "password" || metadata.type == "musicfile" ||
+             metadata.type == "soundfile" || metadata.type == "police") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "mouse") {
+  } else if (metadata.type == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "yesorno") {
+  } else if (metadata.type == "yesorno") {
     auto parameterString = parameter.GetPlainString();
     argOutput += (parameterString == "yes" || parameterString == "oui")
                      ? GenerateTrue()
                      : GenerateFalse();
-  } else if (metadata.GetType() == "trueorfalse") {
+  } else if (metadata.type == "trueorfalse") {
     auto parameterString = parameter.GetPlainString();
     // This is duplicated in AdvancedExtension.cpp for GDJS
     argOutput += (parameterString == "True" || parameterString == "Vrai")
@@ -746,21 +741,21 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
                      : GenerateFalse();
   }
   // Code only parameter type
-  else if (metadata.GetType() == "inlineCode") {
-    argOutput += metadata.GetExtraInfo();
+  else if (metadata.type == "inlineCode") {
+    argOutput += metadata.supplementaryInformation;
   } else {
     // Try supplementary types if provided
     if (supplementaryParametersTypes) {
       for (std::size_t i = 0; i < supplementaryParametersTypes->size(); ++i) {
-        if ((*supplementaryParametersTypes)[i].first == metadata.GetType())
+        if ((*supplementaryParametersTypes)[i].first == metadata.type)
           argOutput += (*supplementaryParametersTypes)[i].second;
       }
     }
 
     // Type unknown
     if (argOutput.empty()) {
-      if (!metadata.GetType().empty())
-        cout << "Warning: Unknown type of parameter \"" << metadata.GetType()
+      if (!metadata.type.empty())
+        cout << "Warning: Unknown type of parameter \"" << metadata.type
              << "\"." << std::endl;
       argOutput += "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
     }
@@ -1035,7 +1030,7 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
   for (std::size_t i = 0; i < instrInfos.parameters.size();
        ++i)  // Some conditions already have a "conditionInverted" parameter
   {
-    if (instrInfos.parameters[i].GetType() == "conditionInverted")
+    if (instrInfos.parameters[i].type == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -1056,7 +1051,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters[0].GetExtraInfo().empty())
+      (!instrInfos.parameters[0].supplementaryInformation.empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -481,9 +481,6 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
-  virtual const gd::String GenerateRelationalOperatorCodes(
-      const gd::String& operatorString);
-
  protected:
   /**
    * \brief Generate the code for a single parameter.

Core/GDCore/Events/Instruction.cpp

@@ -55,10 +55,6 @@ void Instruction::SetParameter(std::size_t nb, const gd::Expression& val) {
   parameters[nb] = val;
 }
 
-void Instruction::AddParameter(const gd::Expression& val) {
-  parameters.push_back(val);
-}
-
 std::shared_ptr<Instruction> GD_CORE_API
 CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction) {
   std::shared_ptr<Instruction> copy =

Core/GDCore/Events/Instruction.h

@@ -123,11 +123,6 @@ class GD_CORE_API Instruction {
    */
   void SetParameter(std::size_t nb, const gd::Expression& val);
 
-  /** Add a parameter at the end
-   * \param val The new value of the parameter
-   */
-  void AddParameter(const gd::Expression& val);
-
   /** \brief Get a reference to the std::vector containing the parameters.
    * \return A std::vector containing the parameters
    */

Core/GDCore/Events/Serialization.cpp

@@ -184,8 +184,8 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     for (std::size_t j = 0;
          j < parameters.size() && j < metadata.parameters.size();
          ++j) {
-      if (metadata.parameters[j].GetType() == "relationalOperator" ||
-          metadata.parameters[j].GetType() == "operator") {
+      if (metadata.parameters[j].type == "relationalOperator" ||
+          metadata.parameters[j].type == "operator") {
         if (j == parameters.size() - 1) {
           std::cout << "ERROR: No more parameters after a [relational]operator "
                        "when trying to update an instruction from GD2.x";

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -81,7 +81,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value."),
+          _("Get function parameter (also called \"argument\") value"),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", "Parameter name");
@@ -90,36 +90,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text."),
+          _("Get function parameter (also called \"argument\") text "),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", "Parameter name");
-
-  extension
-      .AddCondition(
-          "CompareArgumentAsNumber",
-          _("Compare function parameter value"),
-          _("Compare function parameter (also called \"argument\") value."),
-          _("Parameter _PARAM0_"),
-          "",
-          "res/function32.png",
-          "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions());
-
-  extension
-      .AddCondition(
-          "CompareArgumentAsString",
-          _("Compare function parameter text"),
-          _("Compare function parameter (also called \"argument\") text."),
-          _("Parameter _PARAM0_"),
-          "",
-          "res/function32.png",
-          "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name")
-      .UseStandardRelationalOperatorParameters(
-          "string", gd::ParameterOptions::MakeNewOptions());
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -146,83 +146,69 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddAction("ModVolumeSoundCanal",
                  _("Volume of the sound on a channel"),
                  _("This action modifies the volume of the sound on the "
-                   "specified channel."),
+                   "specified channel. The volume is between 0 and 100."),
                  _("the volume of the sound on channel _PARAM1_"),
                  _("Sounds on channels"),
                  "res/actions/sonVolume24.png",
                  "res/actions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVolumeMusicCanal",
                  _("Volume of the music on a channel"),
                  _("This action modifies the volume of the music on the "
-                   "specified channel."),
+                   "specified channel. The volume is between 0 and 100."),
                  _("the volume of the music on channel _PARAM1_"),
                  _("Music on channels"),
                  "res/actions/musicVolume24.png",
                  "res/actions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
-                 _("This action modifies the global volume of the game."),
+                 _("This action modifies the global volume of the game. The "
+                   "volume is between 0 and 100."),
                  _("the global sound level"),
                  "",
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   extension
       .AddAction("ModPitchSoundChannel",
                  _("Pitch of the sound of a channel"),
                  _("This action modifies the pitch (speed) of the sound on a "
-                   "channel."),
+                   "channel.\n1 is the default pitch."),
                  _("the pitch of the sound on channel _PARAM1_"),
                  _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModPitchMusicChannel",
                  _("Pitch of the music on a channel"),
                  _("This action modifies the pitch of the music on the "
-                   "specified channel."),
+                   "specified channel. 1 is the default pitch"),
                  _("the pitch of the music on channel _PARAM1_"),
                  _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -236,10 +222,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -253,10 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -468,17 +448,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddCondition(
           "SoundCanalVolume",
           _("Volume of the sound on a channel"),
-          _("Test the volume of the sound on the specified channel."),
+          _("Test the volume of the sound on the specified channel. The volume "
+            "is between 0 and 100."),
           _("the volume of the sound on channel _PARAM1_"),
           _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -493,10 +471,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -509,10 +484,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")));
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition(
@@ -526,27 +498,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MusicChannelPitch",
           _("Pitch of the music on a channel"),
-          _("Test the pitch (speed) of the music on a specified channel."),
+          _("Test the pitch (speed) of the music on a specified channel. 1 is "
+            "the default pitch."),
           _("the pitch of the music on channel _PARAM1_"),
           _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -560,10 +527,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -577,10 +541,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -28,7 +28,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
       .SetIcon("res/actions/force24.png");
 
-  gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
+  gd::ObjectMetadata& obj = extension.AddObject<gd::Object>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
 
   obj.AddCondition("PosX",
@@ -36,12 +36,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the X position of the object."),
                    _("the X position"),
                    _("Position"),
-                   "res/conditions/position24_black.png",
-                   "res/conditions/position_black.png")
+                   "res/conditions/position24.png",
+                   "res/conditions/position.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("MettreX",
@@ -49,12 +48,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the X position of an object."),
                 _("the X position"),
                 _("Position"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddCondition("PosY",
@@ -62,12 +60,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the Y position of an object."),
                    _("the Y position"),
                    _("Position"),
-                   "res/conditions/position24_black.png",
-                   "res/conditions/position_black.png")
+                   "res/conditions/position24.png",
+                   "res/conditions/position.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("MettreY",
@@ -75,12 +72,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the Y position of an object."),
                 _("the Y position"),
                 _("Position"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("MettreXY",
@@ -89,8 +85,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"), "number")
@@ -106,8 +102,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "_PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
                 _("Position/Center"),
-                "res/actions/position24_black.png",
-                "res/actions/position_black.png")
+                "res/actions/position24.png",
+                "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"), "number")
       .AddParameter("expression", _("X position"))
@@ -122,9 +118,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("the X position of the center of rotation"),
          _("the X position of the center"),
          _("Position/Center"),
-         "res/actions/position24_black.png")
+         "res/actions/position24.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndConditionAndAction(
          "number",
@@ -133,9 +129,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("the Y position of the center of rotation"),
          _("the Y position of the center"),
          _("Position/Center"),
-         "res/actions/position24_black.png")
+         "res/actions/position24.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxLeft",
@@ -144,9 +140,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) left position"),
                                 _("the bounding box left position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-left_black.svg")
+                                "res/conditions/bounding-box-left.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition(
          "number",
@@ -155,9 +151,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("the bounding box (the area encapsulating the object) top position"),
          _("the bounding box top position"),
          _("Position/Bounding Box"),
-         "res/conditions/bounding-box-top_black.svg")
+         "res/conditions/bounding-box-top.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxRight",
@@ -166,9 +162,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) right position"),
                                 _("the bounding box right position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-right_black.svg")
+                                "res/conditions/bounding-box-right.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxBottom",
@@ -177,9 +173,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) bottom position"),
                                 _("the bounding box bottom position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-bottom_black.svg")
+                                "res/conditions/bounding-box-bottom.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterX",
@@ -188,9 +184,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) center X position"),
                                 _("the bounding box center X position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center_black.svg")
+                                "res/conditions/bounding-box-center.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterY",
@@ -199,9 +195,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                   "the object) center Y position"),
                                 _("the bounding box center Y position"),
                                 _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center_black.svg")
+                                "res/conditions/bounding-box-center.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
+      .UseStandardParameters("number");
 
   obj.AddAction("MettreAutourPos",
                 _("Put around a position"),
@@ -226,14 +222,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the angle of rotation of an object (in degrees)."),
                 _("the angle"),
                 _("Angle"),
-                "res/actions/direction24_black.png",
-                "res/actions/direction_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Angle (in degrees)")));
+      .UseStandardOperatorParameters("number");
 
   obj.AddAction("Rotate",
                 _("Rotate"),
@@ -241,8 +234,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "counterclockwise otherwise."),
                 _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
                 _("Angle"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -255,8 +248,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Rotate an object towards an angle with the specified speed."),
          _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_ deg/second"),
          _("Angle"),
-         "res/actions/rotate24_black.png",
-         "res/actions/rotate_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
@@ -271,8 +264,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_ at speed "
            "_PARAM3_ deg/second"),
          _("Angle"),
-         "res/actions/rotate24_black.png",
-         "res/actions/rotate_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
@@ -389,8 +382,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");
 
   obj.AddAction("ChangeLayer",
                 _("Layer"),
@@ -415,8 +407,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");
 
   obj.AddAction("ModVarObjetTxt",
                 _("Text of an object variable"),
@@ -428,8 +419,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("string");
 
   obj.AddAction("SetObjectVariableAsBoolean",
                 _("Boolean value of an object variable"),
@@ -522,14 +512,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Compare the angle of the specified object."),
                    _("the angle (in degrees)"),
                    _("Angle"),
-                   "res/conditions/direction24_black.png",
-                   "res/conditions/direction_black.png")
+                   "res/conditions/direction24.png",
+                   "res/conditions/direction.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Angle to compare to (in degrees)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Plan",
@@ -541,8 +528,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Layer",
@@ -599,8 +585,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/vitesse.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("AngleOfDisplacement",
@@ -628,8 +613,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");
 
   obj.AddCondition("VarObjetTxt",
                    _("Text of an object variable"),
@@ -641,8 +625,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("string");
 
   obj.AddCondition("ObjectVariableAsBoolean",
                    _("Boolean value of an object variable"),
@@ -903,7 +886,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .AddParameter("expression", _("Time in seconds"))
       .SetHidden();
 
@@ -917,7 +900,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/conditions/timer24.png",
          "res/conditions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
       .SetManipulatedType("number");
@@ -930,7 +913,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/timerPaused24.png",
                    "res/conditions/timerPaused.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -943,7 +926,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("string", _("Timer's name"));
 
   obj.AddAction("PauseObjectTimer",
                 _("Pause an object timer"),
@@ -953,7 +936,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/pauseTimer24.png",
                 "res/actions/pauseTimer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("UnPauseObjectTimer",
@@ -964,7 +947,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/unPauseTimer24.png",
                 "res/actions/unPauseTimer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("RemoveObjectTimer",
@@ -975,28 +958,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/timer24.png",
                 "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   obj.AddExpression("X",
                     _("X position"),
                     _("X position of the object"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Y",
                     _("Y position"),
                     _("Y position of the object"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Angle",
                     _("Angle"),
                     _("Current angle, in degrees, of the object"),
                     _("Angle"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("ForceX",
@@ -1039,14 +1022,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Width"),
                     _("Width of the object"),
                     _("Size"),
-                    "res/actions/scaleWidth_black.png")
+                    "res/actions/scaleWidth.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Largeur",
                     _("Width"),
                     _("Width of the object"),
                     _("Size"),
-                    "res/actions/scaleWidth_black.png")
+                    "res/actions/scaleWidth.png")
       .AddParameter("object", _("Object"))
       .SetHidden();
 
@@ -1054,14 +1037,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Height"),
                     _("Height of the object"),
                     _("Size"),
-                    "res/actions/scaleHeight_black.png")
+                    "res/actions/scaleHeight.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Hauteur",
                     _("Height"),
                     _("Height of the object"),
                     _("Size"),
-                    "res/actions/scaleHeight_black.png")
+                    "res/actions/scaleHeight.png")
       .AddParameter("object", _("Object"))
       .SetHidden();
 
@@ -1144,7 +1127,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Object timers"),
                     "res/actions/time.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("string", _("Timer's name"));
 
   obj.AddExpression("AngleToObject",
                     _("Angle between two objects"),
@@ -1152,7 +1135,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "If you need the angle to an arbitrary position, "
                       "use AngleToPosition."),
                     _("Angle"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Object"));
 
@@ -1163,7 +1146,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -1175,7 +1158,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "getting the cartesian coordinates of a 2D vector, using "
                       "its polar coordinates."),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
@@ -1186,7 +1169,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "\"target\" position (in degrees). If you need the angle "
                       "between two objects, use AngleToObject."),
                     _("Angle"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Target X position"))
       .AddParameter("expression", _("Target Y position"));
@@ -1440,39 +1423,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "res/conditions/nbObjet24.png",
           "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple()
       .SetHidden();
 
-  extension
-      .AddExpressionAndCondition(
-          "number",
-          "SceneInstancesCount",
-          _("Number of object instances on the scene"),
-          _("the number of instances of the specified objects living on the "
-            "scene"),
-          _("the number of _PARAM1_ living on the scene"),
-          _("Objects"),
-          "res/conditions/nbObjet24.png")
-      .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsSimple();
+  extension.AddExpressionAndCondition(
+      "number",
+      "SceneInstancesCount",
+      _("Number of object instances on the scene"),
+      _("the number of instances of the specified objects living on the scene"),
+      _("the number of _PARAM1_ living on the scene"),
+      _("Objects"),
+      "res/conditions/nbObjet24.png")
+    .AddCodeOnlyParameter("objectsContext", "")
+    .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
+    .UseStandardParameters("number")
+    .MarkAsSimple();
 
-  extension
-      .AddExpressionAndCondition(
-          "number",
-          "PickedInstancesCount",
-          _("Number of object instances currently picked"),
-          _("the number of instances picked by the previous conditions (or "
-            "actions)"),
-          _("the number of _PARAM0_ currently picked"),
-          _("Objects"),
-          "res/conditions/nbObjet24.png")
-      .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsSimple();
+  extension.AddExpressionAndCondition(
+      "number",
+      "PickedInstancesCount",
+      _("Number of object instances currently picked"),
+      _("the number of instances picked by the previous conditions (or actions)"),
+      _("the number of _PARAM0_ currently picked"),
+      _("Objects"),
+      "res/conditions/nbObjet24.png")
+    .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
+    .UseStandardParameters("number")
+    .MarkAsSimple();
 
   extension
       .AddCondition(
@@ -1581,13 +1559,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "",
                      "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .SetHidden();  // Deprecated
+      .SetHidden(); // Deprecated
 
   obj.AddStrExpression("ObjectName",
                        _("Object name"),
                        _("Return the name of the object"),
                        "",
-                       "res/conditions/text_black.png")
+                       "res/conditions/text.png")
       .AddParameter("object", _("Object"));
 
   obj.AddStrExpression("Layer",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -22,7 +22,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "object or a position.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetCategory("Camera")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
@@ -37,7 +36,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -69,7 +68,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -104,7 +103,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -120,7 +119,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -137,7 +136,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -154,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -171,7 +170,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -188,7 +187,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -201,7 +200,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -542,10 +541,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -575,8 +571,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -21,14 +21,14 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
   extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
-      .SetIcon("res/conditions/toujours24_black.png");
+      .SetIcon("res/conditions/toujours24.png");
 
   extension
       .AddExpression("ToNumber",
                      _("Text > Number"),
                      _("Convert the text to a number"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
       .AddParameter("string", _("Text to convert to a number"));
 
   extension
@@ -36,7 +36,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Number > Text"),
                         _("Convert the result of the expression to text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -45,7 +45,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -54,7 +54,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           _("Degrees > Radians"),
           _("Converts the angle, expressed in degrees, into radians"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in degrees"));
 
   extension
@@ -63,7 +63,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           _("Radians > Degrees"),
           _("Converts the angle, expressed in radians, into degrees"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in radians"));
 
   extension
@@ -71,7 +71,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert scene variable to JSON"),
                         _("Convert a scene variable to JSON"),
                         _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("scenevar", _("Scene variable to be stringified"));
 
   extension
@@ -79,7 +79,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert global variable to JSON"),
                         _("Convert a global variable to JSON"),
                         _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("globalvar", _("The global variable to be stringified"));
 
   extension
@@ -87,7 +87,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert object variable to JSON"),
                         _("Convert an object variable to JSON"),
                         _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
       .AddParameter("objectPtr", _("The object with the variable"))
       .AddParameter("objectvar", _("The object variable to be stringified"));
 
@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "JSONToVariableStructure",
           _("Convert JSON to a scene variable"),
           _("Parse a JSON object and store it into a scene variable"),
-          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
           "",
           "res/actions/net24.png",
           "res/actions/net.png")
@@ -108,7 +108,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddAction("JSONToGlobalVariableStructure",
                  _("Convert JSON to global variable"),
                  _("Parse a JSON object and store it into a global variable"),
-                 _("Convert JSON string _PARAM0_ and store it into global "
+                 _("Parse JSON string _PARAM0_ and store it into global "
                    "variable _PARAM1_"),
                  "",
                  "res/actions/net24.png",

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -33,7 +33,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       .SetExtensionHelpPath("/all-features/advanced-conditions");
   extension
       .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
-      .SetIcon("res/conditions/toujours24_black.png");
+      .SetIcon("res/conditions/toujours24.png");
 
   extension
       .AddCondition("Always",
@@ -42,8 +42,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                       "the condition is inverted)."),
                     _("Always"),
                     "",
-                    "res/conditions/toujours24_black.png",
-                    "res/conditions/toujours_black.png")
+                    "res/conditions/toujours24.png",
+                    "res/conditions/toujours.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddCodeOnlyParameter("conditionInverted", "")
       .MarkAsAdvanced();
@@ -61,8 +61,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Check if one of the sub conditions is true"),
                     _("If one of these conditions is true:"),
                     "",
-                    "res/conditions/or24_black.png",
-                    "res/conditions/or_black.png")
+                    "res/conditions/or24.png",
+                    "res/conditions/or.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -72,8 +72,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Check if all sub conditions are true"),
                     _("If all of these conditions are true:"),
                     "",
-                    "res/conditions/and24_black.png",
-                    "res/conditions/and_black.png")
+                    "res/conditions/and24.png",
+                    "res/conditions/and.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -84,8 +84,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
           _("Return the contrary of the result of the sub conditions"),
           _("Invert the logical result of these conditions:"),
           "",
-          "res/conditions/not24_black.png",
-          "res/conditions/not_black.png")
+          "res/conditions/not24.png",
+          "res/conditions/not.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -104,8 +104,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Compare the two numbers."),
                     _("_PARAM0_ _PARAM1_ _PARAM2_"),
                     "",
-                    "res/conditions/egal24_black.png",
-                    "res/conditions/egal_black.png")
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddParameter("expression", _("First expression"))
       .AddParameter("relationalOperator", _("Sign of the test"), "number")
@@ -125,8 +125,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     _("Compare the two strings."),
                     _("_PARAM0_ _PARAM1_ _PARAM2_"),
                     "",
-                    "res/conditions/egal24_black.png",
-                    "res/conditions/egal_black.png")
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddParameter("string", _("First string expression"))
       .AddParameter("relationalOperator", _("Sign of the test"), "string")

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/storage")
-      .SetCategory("Advanced");
+      .SetCategory("Device");
   extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
       .SetIcon("res/conditions/fichier24.png");
 

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -485,23 +485,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
-  extension
-      .AddExpression("Pi",
-                     _("Number Pi (3.1415...)"),
-                     _("The number Pi (3.1415...)"),
-                     "",
-                     "res/mathfunction.png")
-      .SetHelpPath("/all-features/expressions");
-
-  extension
-      .AddExpression("lerpAngle",
-                     _("Lerp (Linear interpolation) between two angles"),
-                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
-                     "",
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Starting angle, in degrees"))
-      .AddParameter("expression", _("Destination angle, in degrees"))
-      .AddParameter("expression", _("Interpolation value between 0 and 1."));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -160,7 +160,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           "",
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -180,7 +180,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           "",
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -276,7 +276,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -292,7 +292,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)

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

@@ -31,7 +31,7 @@ class GD_CORE_API Point {
   /**
    * Change point position.
    */
-  void SetXY(double x_, double y_) {
+  void SetXY(float x_, float y_) {
     x = x_;
     y = y_;
   }
@@ -39,27 +39,27 @@ class GD_CORE_API Point {
   /**
    * Change point X position.
    */
-  void SetX(double x_) { x = x_; }
+  void SetX(float x_) { x = x_; }
 
   /**
    * Change point Y position.
    */
-  void SetY(double y_) { y = y_; }
+  void SetY(float y_) { y = y_; }
 
   /**
    * Get point X position.
    */
-  double GetX() const { return x; }
+  float GetX() const { return x; }
 
   /**
    * Get point Y position.
    */
-  double GetY() const { return y; }
+  float GetY() const { return y; }
 
  private:
   gd::String name;
-  double x;
-  double y;
+  float x;
+  float y;
 };
 
 #endif  // GDCORE_POINT_H

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

@@ -4,15 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 #include "Polygon2d.h"
-
+#include "GDCore/Vector2.h"
 #include <cmath>
 #include <iostream>
 
-#include "GDCore/Vector2.h"
-
-void Polygon2d::Rotate(double angle) {
-  double t, cosa = cos(-angle),
-            sina = sin(-angle);  // We want a clockwise rotation
+void Polygon2d::Rotate(float angle) {
+  float t, cosa = cos(-angle),
+           sina = sin(-angle);  // We want a clockwise rotation
 
   for (std::size_t i = 0; i < vertices.size(); ++i) {
     t = vertices[i].x;
@@ -21,7 +19,7 @@ void Polygon2d::Rotate(double angle) {
   }
 }
 
-void Polygon2d::Move(double x, double y) {
+void Polygon2d::Move(float x, float y) {
   for (std::size_t i = 0; i < vertices.size(); i++) {
     vertices[i].x += x;
     vertices[i].y += y;
@@ -52,13 +50,13 @@ bool Polygon2d::IsConvex() const {
       (edges[0].x * edges[0 + 1].y - edges[0].y * edges[0 + 1].x) > 0;
 
   for (std::size_t i = 1; i < edges.size() - 1; ++i) {
-    double zCrossProduct =
+    float zCrossProduct =
         edges[i].x * edges[i + 1].y - edges[i].y * edges[i + 1].x;
     if ((zCrossProduct > 0) != zProductIsPositive) return false;
   }
 
-  double lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
-                             edges[edges.size() - 1].y * edges[0].x;
+  float lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
+                            edges[edges.size() - 1].y * edges[0].x;
   if ((lastZCrossProduct > 0) != zProductIsPositive) return false;
 
   return true;
@@ -77,7 +75,7 @@ gd::Vector2f Polygon2d::ComputeCenter() const {
   return center;
 }
 
-Polygon2d Polygon2d::CreateRectangle(double width, double height) {
+Polygon2d Polygon2d::CreateRectangle(float width, float height) {
   Polygon2d rect;
   rect.vertices.push_back(gd::Vector2f(-width / 2.0f, -height / 2.0f));
   rect.vertices.push_back(gd::Vector2f(+width / 2.0f, -height / 2.0f));

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

@@ -5,9 +5,8 @@
  */
 #ifndef GDCORE_POLYGON_H
 #define GDCORE_POLYGON_H
-#include <vector>
-
 #include "GDCore/Vector2.h"
+#include <vector>
 
 /**
  * \brief Represents a polygon. Usually used for collisions masks.
@@ -43,7 +42,7 @@ class GD_CORE_API Polygon2d {
    * \note Edges are updated, there is no need to call ComputeEdges after
    * calling Move.
    */
-  void Move(double x, double y);
+  void Move(float x, float y);
 
   /**
    * \brief Rotate the polygon.
@@ -53,7 +52,7 @@ class GD_CORE_API Polygon2d {
    * \warning edges vector is not updated, you have to call ComputeEdges if
    * needed.
    */
-  void Rotate(double angle);
+  void Rotate(float angle);
 
   /**
    * \brief Automatically fill edges vector using vertices.
@@ -78,7 +77,7 @@ class GD_CORE_API Polygon2d {
   /**
    * \brief Create a rectangle
    */
-  static Polygon2d CreateRectangle(double width, double height);
+  static Polygon2d CreateRectangle(float width, float height);
   ///@}
 };
 

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

@@ -22,8 +22,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/sprite");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
-      .SetIcon("CppPlatform/Extensions/spriteicon.png");
 
   gd::ObjectMetadata& obj =
       extension
@@ -44,10 +42,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity (0-255)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("ChangeAnimation",
@@ -60,8 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("SetAnimationName",
@@ -85,13 +79,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
            "is in 8 directions mode, the valid directions are 0..7"),
          _("the direction"),
          _("Direction"),
-         "res/actions/direction24_black.png",
-         "res/actions/direction_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeSprite",
@@ -103,8 +96,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("PauseAnimation",
@@ -140,9 +132,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Speed scale")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddAction("TourneVersPos",
@@ -150,8 +140,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "Rotate an object towards a position.",
                 "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
                 _("Direction"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object to be rotated"), "Sprite")
       .AddParameter("expression", _("X position"))
@@ -166,14 +156,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the specified object."),
                 _("the scale"),
                 _("Size"),
-                "res/actions/scale24_black.png",
-                "res/actions/scale_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleWidth",
@@ -181,14 +168,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the width of an object."),
                 _("the width's scale"),
                 _("Size"),
-                "res/actions/scaleWidth24_black.png",
-                "res/actions/scaleWidth_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleHeight",
@@ -196,14 +180,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Modify the scale of the height of an object."),
                 _("the height's scale"),
                 _("Size"),
-                "res/actions/scaleHeight24_black.png",
-                "res/actions/scaleHeight_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeWidth",
@@ -211,12 +192,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the width of a Sprite object."),
                 _("the width"),
                 _("Size"),
-                "res/actions/scaleWidth24_black.png",
-                "res/actions/scaleWidth_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Width",
@@ -224,12 +204,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the width of a Sprite object."),
                    _("the width"),
                    _("Size"),
-                   "res/conditions/scaleWidth24_black.png",
-                   "res/conditions/scaleWidth_black.png")
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeHeight",
@@ -237,12 +216,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the height of a Sprite object."),
                 _("the height"),
                 _("Size"),
-                "res/actions/scaleHeight24_black.png",
-                "res/actions/scaleHeight_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Height",
@@ -250,12 +228,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the height of a Sprite object."),
                    _("the height"),
                    _("Size"),
-                   "res/conditions/scaleHeight24_black.png",
-                   "res/conditions/scaleHeight_black.png")
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("SetSize",
@@ -263,8 +240,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 _("Change the size of an object."),
                 _("Change the size of _PARAM0_: set to _PARAM1_x_PARAM2_"),
                 _("Size"),
-                "res/actions/scale24_black.png",
-                "res/actions/scale_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Width"))
@@ -281,8 +258,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("AnimationName",
@@ -305,13 +281,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
            "from 0 to 7. Otherwise, the direction is in degrees."),
          _("the direction"),
          _("Direction"),
-         "res/conditions/direction24_black.png",
-         "res/conditions/direction_black.png")
+         "res/conditions/direction24.png",
+         "res/conditions/direction.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");
 
   obj.AddCondition("Sprite",
                    _("Current frame"),
@@ -324,8 +299,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("AnimStopped",
@@ -348,19 +322,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/animation24.png",
                    "res/conditions/animation.png")
 
-      .AddParameter("object", _("Object"), "Sprite")
-      .MarkAsSimple()
-      .SetHidden();
-
-  obj.AddCondition("AnimationEnded2",
-                   _("Animation finished"),
-                   _("Check if the animation being played by the Sprite object "
-                     "is finished."),
-                   _("The animation of _PARAM0_ is finished"),
-                   _("Animations and images"),
-                   "res/conditions/animation24.png",
-                   "res/conditions/animation.png")
-
       .AddParameter("object", _("Object"), "Sprite")
       .MarkAsSimple();
 
@@ -369,14 +330,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the scale of the width of an object."),
                    _("the width's scale"),
                    _("Size"),
-                   "res/conditions/scaleWidth24_black.png",
-                   "res/conditions/scaleWidth_black.png")
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("ScaleHeight",
@@ -384,14 +342,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Compare the scale of the height of an object."),
                    _("the height's scale"),
                    _("Size"),
-                   "res/conditions/scaleHeight24_black.png",
-                   "res/conditions/scaleHeight_black.png")
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddCondition("Opacity",
@@ -404,10 +359,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity to compare to (0-255)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsSimple();
 
   obj.AddCondition(
@@ -420,8 +372,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeColor",
@@ -498,8 +449,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "Rotate an object towards another.",
                 "Rotate _PARAM0_ towards _PARAM1_",
                 _("Direction"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPtr", "Rotate toward this object")
@@ -510,7 +461,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("X position of a point"),
                     _("X position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -519,7 +470,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Y position of a point"),
                     _("Y position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -528,7 +479,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("X position of a point"),
                     _("X position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"));
@@ -537,7 +488,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Y position of a point"),
                     _("Y position of a point"),
                     _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("objectPointName", _("Name of the point"));
@@ -546,7 +497,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction"),
                     _("Direction of the object"),
                     _("Direction"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite");
 
@@ -554,7 +505,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Direction"),
                     _("Direction of the object"),
                     _("Direction"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
       .SetHidden()  // Hide as 8 direction is not supported officially in the
                     // interface.
       .AddParameter("object", _("Object"), "Sprite");
@@ -583,14 +534,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddExpression("Sprite",
                     _("Image"),
-                    _("Current frame of the animation of the object"),
-                    _("Animations and images"),
-                    "res/actions/sprite.png")
-      .AddParameter("object", _("Object"), "Sprite");
-
-  obj.AddExpression("AnimationFrameCount",
-                    _("Number of frames"),
-                    _("Number of frames in the current animation of the object"),
+                    _("Animation frame of the object"),
                     _("Animations and images"),
                     "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");
@@ -606,14 +550,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     _("Scale of the width of an object"),
                     _("Scale of the width of an object"),
                     _("Size"),
-                    "res/actions/scaleWidth_black.png")
+                    "res/actions/scaleWidth.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddExpression("ScaleY",
                     _("Scale of the height of an object"),
                     _("Scale of the height of an object"),
                     _("Size"),
-                    "res/actions/scaleHeight_black.png")
+                    "res/actions/scaleHeight.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddExpression("Opacity",

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

@@ -25,7 +25,8 @@ namespace gd {
 
 Animation SpriteObject::badAnimation;
 
-SpriteObject::SpriteObject() : updateIfNotVisible(false) {}
+SpriteObject::SpriteObject(gd::String name_)
+    : Object(name_), updateIfNotVisible(false) {}
 
 SpriteObject::~SpriteObject(){};
 

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

@@ -36,11 +36,11 @@ namespace gd {
  * \see gd::BuiltinExtensionsImplementer::ImplementsSpriteExtension
  * \ingroup SpriteObjectExtension
  */
-class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
+class GD_CORE_API SpriteObject : public gd::Object {
  public:
-  SpriteObject();
+  SpriteObject(gd::String name_);
   virtual ~SpriteObject();
-  std::unique_ptr<gd::ObjectConfiguration> Clone() const override {
+  std::unique_ptr<gd::Object> Clone() const override {
     return gd::make_unique<SpriteObject>(*this);
   }
 

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -21,20 +21,20 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
   extension.AddInstructionOrExpressionGroupMetadata(_("Text manipulation"))
-      .SetIcon("res/actions/text24_black.png");
+      .SetIcon("res/actions/text24.png");
 
   extension.AddStrExpression("NewLine",
                              _("Insert a new line"),
                              _("Insert a new line"),
                              "",
-                             "res/conditions/toujours24_black.png");
+                             "res/conditions/toujours24.png");
 
   extension
       .AddStrExpression("FromCodePoint",
                         _("Get character from code point"),
                         _("Get character from code point"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("expression", _("Code point"));
 
@@ -43,7 +43,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Uppercase a text"),
                         _("Uppercase a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
 
@@ -52,7 +52,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Lowercase a text"),
                         _("Lowercase a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
 
@@ -61,7 +61,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Get a portion of a text"),
                         _("Get a portion of a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("expression",
@@ -74,7 +74,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Get a character from a text"),
                         _("Get a character from a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter(
@@ -86,7 +86,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Repeat a text"),
                         _("Repeat a text"),
                         "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text to repeat"))
       .AddParameter("expression", _("Repetition count"));
@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Length of a text"),
                      _("Length of a text"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"));
 
@@ -106,7 +106,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Search in a text (return the position of the result or "
                        "-1 if not found)"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
@@ -117,7 +117,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      "Search in a text from the end (return the position of "
                      "the result or -1 if not found)",
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -131,7 +131,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
@@ -142,7 +142,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Search in a text, starting from a position (return the "
                        "position of the result or -1 if not found)"),
                      "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -157,7 +157,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           "Search in a text from the end, starting from a position (return "
           "the position of the result or -1 if not found)",
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
@@ -175,7 +175,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
             " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),
           "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -36,7 +36,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Time in seconds"))
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .SetHidden();
 
   extension
@@ -50,7 +50,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timer24.png",
                     "res/conditions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
       .SetManipulatedType("number");
@@ -65,10 +65,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/time24.png",
                     "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -81,7 +78,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "res/conditions/timerPaused24.png",
                     "res/conditions/timerPaused.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -96,7 +93,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
           "res/actions/timer24.png",
           "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
+      .AddParameter("string", _("Timer's name"));
 
   extension
       .AddAction("PauseTimer",
@@ -108,7 +105,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/pauseTimer24.png",
                  "res/actions/pauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -121,7 +118,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/unPauseTimer24.png",
                  "res/actions/unPauseTimer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -134,7 +131,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                  "res/actions/timer24.png",
                  "res/actions/timer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
       .MarkAsAdvanced();
 
   extension
@@ -156,9 +153,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "the next actions (and sub-events)."),
                  _("Wait _PARAM0_ seconds"),
                  "",
-                 "res/timer_black.svg",
-                 "res/timer_black.svg")
-      .AddParameter("expression", _("Time to wait in seconds"))
+                 "res/timer.svg",
+                 "res/timer.svg")
+      .AddParameter("expression", "Time to wait in seconds")
       .SetHelpPath("/all-features/timers-and-time/wait-action");
 
   extension
@@ -194,7 +191,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
+      .AddParameter("string", _("Timer's name"));
 
   extension
       .AddExpression("TimeFromStart",

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -34,8 +34,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition("VarSceneTxt",
@@ -46,8 +45,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("string");
 
   extension
       .AddCondition(
@@ -109,8 +107,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -122,8 +119,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("string")
       .MarkAsAdvanced();
 
   extension
@@ -161,8 +157,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");
 
   extension
       .AddAction("ModVarSceneTxt",
@@ -173,8 +168,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("string");
 
   extension
       .AddAction(
@@ -209,8 +203,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -222,8 +215,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("string")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -20,7 +20,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
           "these features can be applied.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetCategory("User interface")
       .SetExtensionHelpPath("/all-features/window");
   extension
       .AddInstructionOrExpressionGroupMetadata(

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -21,7 +21,7 @@ namespace gd {
 
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace_,
-    const gd::String& nameWithNamespace,
+    const gd::String& name_,
     const gd::String& fullname_,
     const gd::String& defaultName_,
     const gd::String& description_,
@@ -45,32 +45,32 @@ BehaviorMetadata::BehaviorMetadata(
     gd::LogFatalError(
         "Trying to create a BehaviorMetadata that has no "
         "behavior. This will crash - please double check that the "
-        "BehaviorMetadata is valid for: " + nameWithNamespace);
+        "BehaviorMetadata is valid for: " + name_);
   }
 
-  if (instance) instance->SetTypeName(nameWithNamespace);
-  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
+  if (instance) instance->SetTypeName(name_);
+  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(name_);
 }
 
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace,
-    const gd::String& nameWithNamespace,
+    const gd::String& name_,
     const gd::String& fullname_,
-    const gd::String& defaultName_,
     const gd::String& description_,
     const gd::String& group_,
     const gd::String& icon24x24_): BehaviorMetadata(
         extensionNamespace,
-        nameWithNamespace,
+        name_,
         fullname_,
-        defaultName_,
+        // Default name is the name
+        name_,
         description_,
         group_,
         icon24x24_,
         // Class name is the name, actually unused
-        defaultName_,
+        name_,
         // It is only used to get the name for GetName.
-        gd::make_unique<gd::Behavior>("", nameWithNamespace),
+        gd::make_unique<gd::Behavior>("", name_),
         nullptr){
   isEventBased = true;
 };

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -29,7 +29,7 @@ class GD_CORE_API BehaviorMetadata {
  public:
   BehaviorMetadata(
       const gd::String& extensionNamespace,
-      const gd::String& nameWithNamespace,
+      const gd::String& name_,
       const gd::String& fullname_,
       const gd::String& defaultName_,
       const gd::String& description_,
@@ -46,9 +46,8 @@ class GD_CORE_API BehaviorMetadata {
    */
   BehaviorMetadata(
       const gd::String& extensionNamespace,
-      const gd::String& nameWithNamespace,
+      const gd::String& name_,
       const gd::String& fullname_,
-      const gd::String& defaultName_,
       const gd::String& description_,
       const gd::String& group_,
       const gd::String& icon24x24_);
@@ -236,6 +235,7 @@ class GD_CORE_API BehaviorMetadata {
   }
 
   const gd::String& GetName() const;
+#if defined(GD_IDE_ONLY)
   const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetDefaultName() const { return defaultName; }
   const gd::String& GetDescription() const { return description; }
@@ -256,21 +256,7 @@ class GD_CORE_API BehaviorMetadata {
    * \note An empty string means the base object, so any object.
    */
   const gd::String& GetObjectType() const { return objectType; }
-
-  /**
-   * Check if the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  bool IsPrivate() const { return isPrivate; }
-
-  /**
-   * Set that the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  BehaviorMetadata &SetPrivate() {
-    isPrivate = true;
-    return *this;
-  }
+#endif
 
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
@@ -328,7 +314,6 @@ class GD_CORE_API BehaviorMetadata {
   gd::String group;
   gd::String iconFilename;
   gd::String objectType;
-  bool isPrivate = false;
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -37,24 +37,22 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   gd::ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.description = description;
   info.codeOnly = false;
-  info.SetOptional(parameterIsOptional);
-  info.SetExtraInfo(
+  info.optional = parameterIsOptional;
+  info.supplementaryInformation =
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
-      ((gd::ParameterMetadata::IsObject(type) ||
+      (gd::ParameterMetadata::IsObject(type) ||
        gd::ParameterMetadata::IsBehavior(type))
-       // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
           ? (supplementaryInformation.empty()
                  ? ""
                  : extensionNamespace +
                        supplementaryInformation  //... so prefix it with the extension
                                            // namespace.
              )
-          : supplementaryInformation);  // Otherwise don't change anything
+          : supplementaryInformation;  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -66,9 +64,9 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
 gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
     const gd::String& type, const gd::String& supplementaryInformation) {
   gd::ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.codeOnly = true;
-  info.SetExtraInfo(supplementaryInformation);
+  info.supplementaryInformation = supplementaryInformation;
 
   parameters.push_back(info);
   return *this;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -222,18 +222,6 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   };
 
-  /**
-   * \brief Set the additional information, used for some parameters
-   * with special type (for example, it can contains the type of object accepted
-   * by the parameter), for the last added parameter.
-   *
-   * \see AddParameter
-   */
-  ExpressionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
-    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
-    return *this;
-  }
-
   /**
    * \brief Mark this (object) expression as requiring the specified capability,
    * offered by the base object.
@@ -268,30 +256,7 @@ class GD_CORE_API ExpressionMetadata {
    */
   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;
 

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -55,17 +55,15 @@ InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
   ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.description = description;
   info.codeOnly = false;
-  info.SetOptional(parameterIsOptional);
-  info.SetExtraInfo(
+  info.optional = parameterIsOptional;
+  info.supplementaryInformation =
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
-      ((gd::ParameterMetadata::IsObject(type) ||
+      (gd::ParameterMetadata::IsObject(type) ||
        gd::ParameterMetadata::IsBehavior(type))
-       // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
           ? (supplementaryInformation.empty()
                  ? ""
                  : extensionNamespace +
@@ -73,7 +71,7 @@ InstructionMetadata& InstructionMetadata::AddParameter(
                                                  // extension
                                                  // namespace.
              )
-          : supplementaryInformation);  // Otherwise don't change anything
+          : supplementaryInformation;  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -85,24 +83,20 @@ InstructionMetadata& InstructionMetadata::AddParameter(
 InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
     const gd::String& type, const gd::String& supplementaryInformation) {
   ParameterMetadata info;
-  info.SetType(type);
+  info.type = type;
   info.codeOnly = true;
-  info.SetExtraInfo(supplementaryInformation);
+  info.supplementaryInformation = supplementaryInformation;
 
   parameters.push_back(info);
   return *this;
 }
 
 InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
-    const gd::String& type, const ParameterOptions &options) {
-  const gd::String& expressionValueType =
-      gd::ValueTypeMetadata::GetPrimitiveValueType(type);
-  SetManipulatedType(expressionValueType);
+    const gd::String& type) {
+  SetManipulatedType(type);
 
   if (type == "boolean") {
-    AddParameter(
-        "yesorno",
-        options.description.empty() ? _("New value") : options.description);
+    AddParameter("yesorno", _("New value"));
     size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
@@ -123,10 +117,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
                               "_PARAM" + gd::String::From(valueParamIndex) + "_");
     }
   } else {
-    AddParameter("operator", _("Modification's sign"), expressionValueType);
-    AddParameter(type,
-                 options.description.empty() ? _("Value") : options.description,
-                 options.typeExtraInfo);
+    AddParameter("operator", _("Modification's sign"), type);
+    AddParameter(type == "number" ? "expression" : type, _("Value"));
 
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
@@ -159,10 +151,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
 
 InstructionMetadata&
 InstructionMetadata::UseStandardRelationalOperatorParameters(
-    const gd::String& type, const ParameterOptions &options) {
-  const gd::String& expressionValueType =
-      gd::ValueTypeMetadata::GetPrimitiveValueType(type);
-  SetManipulatedType(expressionValueType);
+    const gd::String& type) {
+  SetManipulatedType(type);
 
   if (type == "boolean") {
     if (isObjectInstruction || isBehaviorInstruction) {
@@ -178,10 +168,8 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
           templateSentence.FindAndReplace("<subject>", sentence);
     }
   } else {
-    AddParameter("relationalOperator", _("Sign of the test"), expressionValueType);
-    AddParameter(type,
-                 options.description.empty() ? _("Value to compare") : options.description,
-                 options.typeExtraInfo);
+    AddParameter("relationalOperator", _("Sign of the test"), type);
+    AddParameter(type == "number" ? "expression" : type, _("Value to compare"));
     size_t operatorParamIndex = parameters.size() - 2;
     size_t valueParamIndex = parameters.size() - 1;
 

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -14,8 +14,6 @@
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
-#include "ParameterOptions.h"
-
 namespace gd {
 class Project;
 class Layout;
@@ -111,8 +109,8 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Check if the instruction asynchronicity is optional. If it is, it can
-   * either be used synchronously or asynchronously, with one function for each.
+   * Check if the instruction asynchronicity is optional. If it is, it can either
+   * be used synchronously or asynchronously, with one function for each.
    */
   bool IsOptionallyAsync() const {
     return IsAsync() && !codeExtraInformation.functionCallName.empty();
@@ -208,7 +206,7 @@ class GD_CORE_API InstructionMetadata {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
-  }
+  };
 
   /**
    * \brief Set the additional information, used for some parameters
@@ -220,27 +218,20 @@ class GD_CORE_API InstructionMetadata {
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
-  }
+  };
 
   /**
    * \brief Add the default parameters for an instruction manipulating the
    * specified type ("string", "number") with the default operators.
-   *
-   * \note The type "string" can be declined in several subtypes.
-   * \see ParameterMetadata
    */
-  InstructionMetadata &UseStandardOperatorParameters(
-      const gd::String &type, const ParameterOptions &options);
+  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type);
 
   /**
    * \brief Add the default parameters for an instruction comparing the
    * specified type ("string", "number") with the default relational operators.
-   *
-   * \note The type "string" can be declined in several subtypes.
-   * \see ParameterMetadata
    */
   InstructionMetadata &UseStandardRelationalOperatorParameters(
-      const gd::String &type, const ParameterOptions &options);
+      const gd::String &type);
 
   /**
    * \brief Mark the instruction as an object instruction. Automatically called
@@ -285,7 +276,7 @@ class GD_CORE_API InstructionMetadata {
    */
   const gd::String &GetRequiredBaseObjectCapability() const {
     return requiredBaseObjectCapability;
-  }
+  };
 
   /**
    * \brief Consider that the instruction is easy for a user to understand.
@@ -337,12 +328,11 @@ class GD_CORE_API InstructionMetadata {
     }
 
     /**
-     * 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.
+     * \param functionName the name of the function doing asynchronous work to call.
      */
     ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
       asyncFunctionCallName = functionName_;
@@ -371,7 +361,7 @@ class GD_CORE_API InstructionMetadata {
      *                 _("the string"),
      *                 _("Text"),
      *                 "CppPlatform/Extensions/text24.png",
-     *                 "CppPlatform/Extensions/text_black.png");
+     *                 "CppPlatform/Extensions/text.png");
      *
      *      .AddParameter("object", _("Object"), "Text", false)
      *      .AddParameter("operator", _("Modification operator"), "string")
@@ -486,40 +476,17 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Set the name of the function, doing asynchronous work, which will be called
-   * in the generated code. This function should return an asynchronous task
+   * 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. \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
+   * \param functionName the name of the function doing asynchronous work to call.
+   * \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
    */
   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) {
-    codeExtraInformation.SetIncludeFile(includeFile);
-    return *this;
-  }
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  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 {
-    return codeExtraInformation.GetIncludeFiles();
-  };
-
   std::vector<ParameterMetadata> parameters;
 
  private:

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -8,8 +8,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
-#include "ParameterOptions.h"
-
 namespace gd {}  // namespace gd
 
 namespace gd {
@@ -34,7 +32,8 @@ class GD_CORE_API MultipleInstructionMetadata {
     return MultipleInstructionMetadata(expression, condition, action);
   }
   static MultipleInstructionMetadata WithConditionAndAction(
-      gd::InstructionMetadata &condition, gd::InstructionMetadata &action) {
+      gd::InstructionMetadata &condition,
+      gd::InstructionMetadata &action) {
     return MultipleInstructionMetadata(condition, action);
   }
 
@@ -81,17 +80,6 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   };
 
-  /**
-   * \see gd::InstructionMetadata::SetParameterExtraInfo
-   */
-  MultipleInstructionMetadata &SetParameterExtraInfo(
-      const gd::String &defaultValue) {
-    if (expression) expression->SetParameterExtraInfo(defaultValue);
-    if (condition) condition->SetParameterExtraInfo(defaultValue);
-    if (action) action->SetParameterExtraInfo(defaultValue);
-    return *this;
-  };
-
   /**
    * \see gd::InstructionMetadata::SetParameterLongDescription
    */
@@ -128,11 +116,9 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
-  MultipleInstructionMetadata &UseStandardParameters(
-      const gd::String &type, const ParameterOptions &options) {
-    if (condition)
-      condition->UseStandardRelationalOperatorParameters(type, options);
-    if (action) action->UseStandardOperatorParameters(type, options);
+  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type) {
+    if (condition) condition->UseStandardRelationalOperatorParameters(type);
+    if (action) action->UseStandardOperatorParameters(type);
     return *this;
   }
 
@@ -168,29 +154,6 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   }
 
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  const std::vector<gd::String> &GetIncludeFiles() const {
-    if (expression)
-      return expression->GetCodeExtraInformation().GetIncludeFiles();
-    if (condition)
-      return condition->GetCodeExtraInformation().GetIncludeFiles();
-    if (action) return action->GetCodeExtraInformation().GetIncludeFiles();
-    // It can't actually happen.
-    throw std::logic_error("no instruction metadata");
-  }
-
-  /**
-   * \see gd::InstructionMetadata::SetPrivate
-   */
-  MultipleInstructionMetadata &SetPrivate() {
-    if (expression) expression->SetPrivate();
-    if (condition) condition->SetPrivate();
-    if (action) action->SetPrivate();
-    return *this;
-  }
-
   /**
    * \see gd::InstructionMetadata::MarkAsSimple
    */

Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp

@@ -23,20 +23,23 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon24x24,
-                               std::shared_ptr<gd::ObjectConfiguration> blueprintObject_)
+                               std::shared_ptr<gd::Object> blueprintObject_)
     : ObjectMetadata(extensionNamespace_,
                      name_,
                      fullname_,
                      description_,
                      icon24x24,
-                     [blueprintObject_]() -> std::unique_ptr<gd::ObjectConfiguration> {
-    if (blueprintObject_ == std::shared_ptr<gd::ObjectConfiguration>()) {
+                     [blueprintObject_](gd::String name) -> std::unique_ptr<gd::Object> {
+    if (blueprintObject_ == std::shared_ptr<gd::Object>()) {
       gd::LogFatalError(
           "Error: Unable to create object. Have you declared an extension "
           "(or ObjectMetadata) without specifying an object as blueprint?");
       return nullptr;
     }
-    return blueprintObject_->Clone();
+
+    std::unique_ptr<gd::Object> newObject = blueprintObject_->Clone();
+    newObject->SetName(name);
+    return newObject;
   }) {
   blueprintObject = blueprintObject_;
 }
@@ -51,7 +54,7 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                      fullname_,
                      description_,
                      icon24x24,
-                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
+                     [](gd::String name) -> std::unique_ptr<gd::Object> {
       gd::LogFatalError(
           "Error: Event-based objects don't have blueprint. "
           "This method should not never be called.");

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -13,7 +13,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/String.h"
 namespace gd {
 class InstructionMetadata;
@@ -21,7 +20,7 @@ class MultipleInstructionMetadata;
 class ExpressionMetadata;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
     CreateFunPtr;
 
 namespace gd {
@@ -43,7 +42,7 @@ class GD_CORE_API ObjectMetadata {
                  const gd::String& fullname_,
                  const gd::String& description_,
                  const gd::String& icon24x24_,
-                 std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
+                 std::shared_ptr<gd::Object> blueprintObject_);
   /**
    * \brief Construct an object metadata, without "blueprint" object
    * 
@@ -315,7 +314,7 @@ class GD_CORE_API ObjectMetadata {
   gd::String categoryFullName;
   std::set<gd::String> unsupportedBaseObjectCapabilities;
 
-  std::shared_ptr<gd::ObjectConfiguration>
+  std::shared_ptr<gd::Object>
       blueprintObject;  ///< The "blueprint" object to be copied when a new
                         ///< object is asked. Can be null in case a creation
                         ///< function is passed or for events based objects

Core/GDCore/Extensions/Metadata/ParameterMetadata.cpp

@@ -10,26 +10,43 @@
 
 namespace gd {
 
-ParameterMetadata::ParameterMetadata() : codeOnly(false) {}
+ParameterMetadata::ParameterMetadata() : optional(false), codeOnly(false) {}
 
 void ParameterMetadata::SerializeTo(SerializerElement& element) const {
-  valueTypeMetadata.SerializeTo(element);
+  element.SetAttribute("type", type);
+  element.SetAttribute("supplementaryInformation", supplementaryInformation);
+  element.SetAttribute("optional", optional);
   element.SetAttribute("description", description);
-  if (!longDescription.empty()) {
-    element.SetAttribute("longDescription", longDescription);
-  }
-  if (codeOnly) {
-   element.SetAttribute("codeOnly", codeOnly);
-  }
+  element.SetAttribute("longDescription", longDescription);
+  element.SetAttribute("codeOnly", codeOnly);
+  element.SetAttribute("defaultValue", defaultValue);
   element.SetAttribute("name", name);
 }
 
 void ParameterMetadata::UnserializeFrom(const SerializerElement& element) {
-  valueTypeMetadata.UnserializeFrom(element);
+  type = element.GetStringAttribute("type");
+  supplementaryInformation =
+      element.GetStringAttribute("supplementaryInformation");
+  optional = element.GetBoolAttribute("optional");
   description = element.GetStringAttribute("description");
   longDescription = element.GetStringAttribute("longDescription");
   codeOnly = element.GetBoolAttribute("codeOnly");
+  defaultValue = element.GetStringAttribute("defaultValue");
   name = element.GetStringAttribute("name");
 }
 
+  // TODO factorize in a file with an enum and helpers?
+  const gd::String ParameterMetadata::numberType = "number";
+  const gd::String ParameterMetadata::stringType = "string";
+
+  const gd::String &ParameterMetadata::GetExpressionValueType(const gd::String &parameterType) {
+    if (parameterType == "number" || gd::ParameterMetadata::IsExpression("number", parameterType)) {
+      return ParameterMetadata::numberType;
+    }
+    if (parameterType == "string" || gd::ParameterMetadata::IsExpression("string", parameterType)) {
+      return ParameterMetadata::stringType;
+    }
+    return parameterType;
+  }
+
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -6,13 +6,16 @@
 
 #ifndef PARAMETER_METADATA_H
 #define PARAMETER_METADATA_H
+#if defined(GD_IDE_ONLY)
 #include <map>
 #include <memory>
 
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
-
 namespace gd {
+class Project;
+class Layout;
+class EventsCodeGenerator;
+class EventsCodeGenerationContext;
 class SerializerElement;
 }  // namespace gd
 
@@ -29,32 +32,17 @@ class GD_CORE_API ParameterMetadata {
   ParameterMetadata();
   virtual ~ParameterMetadata(){};
 
-  /**
-   * \brief Return the metadata of the parameter type.
-   */
-  gd::ValueTypeMetadata &GetValueTypeMetadata() { return valueTypeMetadata; }
-
-  /**
-   * \brief Set the metadata of the parameter type.
-   */
-  ParameterMetadata &SetValueTypeMetadata(const gd::ValueTypeMetadata &valueTypeMetadata_) {
-    valueTypeMetadata = valueTypeMetadata_;
-    return *this;
-  }
-
   /**
    * \brief Return the type of the parameter.
    * \see gd::ParameterMetadata::IsObject
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  const gd::String &GetType() const { return valueTypeMetadata.GetName(); }
+  const gd::String &GetType() const { return type; }
 
   /**
    * \brief Set the type of the parameter.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetType(const gd::String &type_) {
-    valueTypeMetadata.SetName(type_);
+    type = type_;
     return *this;
   }
 
@@ -83,33 +71,29 @@ class GD_CORE_API ParameterMetadata {
    * \brief Return an optional additional information, used for some parameters
    * with special type (for example, it can contains the type of object accepted
    * by the parameter).
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  const gd::String &GetExtraInfo() const { return valueTypeMetadata.GetExtraInfo(); }
+  const gd::String &GetExtraInfo() const { return supplementaryInformation; }
 
   /**
    * \brief Set an optional additional information, used for some parameters
    * with special type (for example, it can contains the type of object accepted
    * by the parameter).
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetExtraInfo(const gd::String &supplementaryInformation_) {
-    valueTypeMetadata.SetExtraInfo(supplementaryInformation_);
+    supplementaryInformation = supplementaryInformation_;
     return *this;
   }
 
   /**
    * \brief Return true if the parameter is optional.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
-  bool IsOptional() const { return valueTypeMetadata.IsOptional(); }
+  bool IsOptional() const { return optional; }
 
   /**
    * \brief Set if the parameter is optional.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   ParameterMetadata &SetOptional(bool optional_ = true) {
-    valueTypeMetadata.SetOptional(optional_);
+    optional = optional_;
     return *this;
   }
 
@@ -144,15 +128,13 @@ class GD_CORE_API ParameterMetadata {
   /**
    * \brief Get the default value for the parameter.
    */
-  const gd::String &GetDefaultValue() const {
-    return valueTypeMetadata.GetDefaultValue();
-  }
+  const gd::String &GetDefaultValue() const { return defaultValue; }
 
   /**
    * \brief Set the default value, if the parameter is optional.
    */
   ParameterMetadata &SetDefaultValue(const gd::String &defaultValue_) {
-    valueTypeMetadata.SetDefaultValue(defaultValue_);
+    defaultValue = defaultValue_;
     return *this;
   }
 
@@ -169,27 +151,26 @@ class GD_CORE_API ParameterMetadata {
     return *this;
   }
 
-  // TODO Remove these deprecated functions.
-
   /**
    * \brief Return true if the type of the parameter is representing one object
    * (or more, i.e: an object group).
    *
    * \see gd::ParameterMetadata::GetType
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static bool IsObject(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::IsTypeObject(parameterType);
+    return parameterType == "object" || parameterType == "objectPtr" ||
+           parameterType == "objectList" ||
+           parameterType == "objectListOrEmptyIfJustDeclared" ||
+           parameterType == "objectListOrEmptyWithoutPicking";
   }
 
   /**
    * \brief Return true if the type of the parameter is "behavior".
    *
    * \see gd::ParameterMetadata::GetType
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static bool IsBehavior(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::IsTypeBehavior(parameterType);
+    return parameterType == "behavior";
   }
 
   /**
@@ -198,22 +179,42 @@ class GD_CORE_API ParameterMetadata {
    * \note If you had a new type of parameter, also add it in the IDE (
    * see EventsFunctionParametersEditor, ParameterRenderingService
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
-   * \deprecated Use gd::ValueTypeMetadata instead.
    */
   static bool IsExpression(const gd::String &type,
                            const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::IsTypeExpression(type, parameterType);
+    if (type == "number") {
+      return parameterType == "expression" || parameterType == "camera" ||
+             parameterType == "forceMultiplier";
+    } else if (type == "string") {
+      return parameterType == "string" || parameterType == "layer" ||
+             parameterType == "color" || parameterType == "file" ||
+             parameterType == "joyaxis" ||
+             parameterType == "stringWithSelector" ||
+             parameterType == "sceneName" ||
+             parameterType == "layerEffectName" ||
+             parameterType == "layerEffectParameterName" ||
+             parameterType == "objectEffectName" ||
+             parameterType == "objectEffectParameterName" ||
+             parameterType == "objectPointName" ||
+             parameterType == "objectAnimationName" ||
+             parameterType == "functionParameterName" ||
+             parameterType == "externalLayoutName" ||
+             parameterType == "leaderboardId";
+    } else if (type == "variable") {
+      return parameterType == "objectvar" || parameterType == "globalvar" ||
+             parameterType == "scenevar";
+    }
+    return false;
   }
 
   /**
    * \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 instead.
    */
-  static const gd::String &GetExpressionValueType(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(parameterType);
-  }
+  static const gd::String &GetExpressionValueType(const gd::String &parameterType);
+  static const gd::String numberType;
+  static const gd::String stringType;
 
   /** \name Serialization
    */
@@ -231,17 +232,22 @@ class GD_CORE_API ParameterMetadata {
 
   // TODO: Deprecated public fields. Any direct usage should be moved to
   // getter/setter.
+  gd::String type;                      ///< Parameter type
+  gd::String supplementaryInformation;  ///< Used if needed
+  bool optional;                        ///< True if the parameter is optional
 
   gd::String description;  ///< Description shown in editor
   bool codeOnly;  ///< True if parameter is relative to code generation only,
                   ///< i.e. must not be shown in editor
  private:
-  gd::ValueTypeMetadata valueTypeMetadata; ///< Parameter type
   gd::String longDescription;  ///< Long description shown in the editor.
+  gd::String defaultValue;     ///< Used as a default value in editor or if an
+                               ///< optional parameter is empty.
   gd::String name;             ///< The name of the parameter to be used in code
                                ///< generation. Optional.
 };
 
 }  // namespace gd
 
+#endif
 #endif  // PARAMETER_METADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -85,7 +85,7 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
     const gd::Expression& parameterValue =
         pNb < parameters.size() ? parameters[pNb].GetPlainString() : "";
     const gd::Expression& parameterValueOrDefault =
-        parameterValue.GetPlainString().empty() && parameterMetadata.IsOptional()
+        parameterValue.GetPlainString().empty() && parameterMetadata.optional
             ? Expression(parameterMetadata.GetDefaultValue())
             : parameterValue;
 

Core/GDCore/Extensions/Metadata/ParameterOptions.h

@@ -1,35 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef PARAMETEROPTIONS_H
-#define PARAMETEROPTIONS_H
-#include "GDCore/String.h"
-#include "ParameterMetadata.h"
-
-namespace gd {}  // namespace gd
-
-namespace gd {
-struct GD_CORE_API ParameterOptions {
-  gd::String description;
-  gd::String typeExtraInfo;
-
-  ParameterOptions &SetDescription(const gd::String &description_) {
-    description = description_;
-    return *this;
-  }
-  ParameterOptions &SetTypeExtraInfo(const gd::String &typeExtraInfo_) {
-    typeExtraInfo = typeExtraInfo_;
-    return *this;
-  }
-
-  static ParameterOptions MakeNewOptions() {
-    ParameterOptions emptyOptions;
-    return emptyOptions;
-  }
-};
-}
-
-#endif  // PARAMETEROPTIONS_H

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -1,70 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "ValueTypeMetadata.h"
-
-#include "GDCore/CommonTools.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-
-ValueTypeMetadata::ValueTypeMetadata() : optional(false) {}
-
-void ValueTypeMetadata::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("type", name);
-  if (!supplementaryInformation.empty()) {
-    element.SetAttribute("supplementaryInformation", supplementaryInformation);
-  }
-  if (optional) {
-    element.SetAttribute("optional", optional);
-  }
-  if (!defaultValue.empty()) {
-    element.SetAttribute("defaultValue", defaultValue);
-  }
-}
-
-void ValueTypeMetadata::UnserializeFrom(const SerializerElement& element) {
-  name = element.GetStringAttribute("type");
-  supplementaryInformation =
-      element.GetStringAttribute("supplementaryInformation");
-  optional = element.GetBoolAttribute("optional");
-  defaultValue = element.GetStringAttribute("defaultValue");
-}
-
-const gd::String ValueTypeMetadata::numberType = "number";
-const gd::String ValueTypeMetadata::stringType = "string";
-
-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)) {
-    return ValueTypeMetadata::stringType;
-  }
-  return parameterType;
-}
-
-const gd::String ValueTypeMetadata::numberValueType = "number";
-const gd::String ValueTypeMetadata::booleanValueType = "boolean";
-const gd::String ValueTypeMetadata::colorValueType = "color";
-const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
-const gd::String ValueTypeMetadata::stringValueType = "string";
-
-const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
-    const gd::String &propertyType) {
-  if (propertyType == "Number") {
-    return numberValueType;
-  } else if (propertyType == "Boolean") {
-    return booleanValueType;
-  } else if (propertyType == "Color") {
-    return colorValueType;
-  } else if (propertyType == "Choice") {
-    return choiceValueType;
-  }
-  // For "String" or default
-  return stringValueType;
-};
-
-}  // namespace gd

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -1,231 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef VALUE_TYPE_METADATA_H
-#define VALUE_TYPE_METADATA_H
-#include <map>
-#include <memory>
-
-#include "GDCore/String.h"
-namespace gd {
-class SerializerElement;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Define a type for parameters of a function (action, condition or
- * expression) or the returned value of an expression.
- *
- * \see gd::EventsFunction
- * \ingroup Events
- */
-class GD_CORE_API ValueTypeMetadata {
- public:
-  ValueTypeMetadata();
-  virtual ~ValueTypeMetadata(){};
-
-  /**
-   * \brief Return the string representation of the type.
-   */
-  const gd::String &GetName() const { return name; }
-
-  /**
-   * \brief Set the string representation of the type.
-   */
-  ValueTypeMetadata &SetName(const gd::String &name_) {
-    name = name_;
-    return *this;
-  }
-
-  /**
-   * \brief Return an optional additional information, used for some parameters
-   * with special type (for example, it can contains the type of object accepted
-   * by the parameter).
-   */
-  const gd::String &GetExtraInfo() const { return supplementaryInformation; }
-
-  /**
-   * \brief Set an optional additional information, used for some parameters
-   * with special type (for example, it can contains the type of object accepted
-   * by the parameter).
-   */
-  ValueTypeMetadata &SetExtraInfo(const gd::String &supplementaryInformation_) {
-    supplementaryInformation = supplementaryInformation_;
-    return *this;
-  }
-
-  /**
-   * \brief Return true if the parameter is optional.
-   */
-  bool IsOptional() const { return optional; }
-
-  /**
-   * \brief Set if the parameter is optional.
-   */
-  ValueTypeMetadata &SetOptional(bool optional_ = true) {
-    optional = optional_;
-    return *this;
-  }
-
-  /**
-   * \brief Get the default value for the parameter.
-   */
-  const gd::String &GetDefaultValue() const { return defaultValue; }
-
-  /**
-   * \brief Set the default value, if the parameter is optional.
-   */
-  ValueTypeMetadata &SetDefaultValue(const gd::String &defaultValue_) {
-    defaultValue = defaultValue_;
-    return *this;
-  }
-
-  /**
-   * \brief Return true if the type is defined.
-   */
-  bool IsDefined() const {
-    return !name.empty();
-  }
-
-  /**
-   * \brief Return true if the type is representing one object
-   * (or more, i.e: an object group).
-   */
-  bool IsObject() const {
-    return gd::ValueTypeMetadata::IsTypeObject(name);
-  }
-
-  /**
-   * \brief Return true if the type is "behavior".
-   */
-  bool IsBehavior() const {
-    return gd::ValueTypeMetadata::IsTypeBehavior(name);
-  }
-
-  /**
-   * \brief Return true if the type is an expression of the
-   * given type.
-   */
-  bool IsNumber() const {
-    return gd::ValueTypeMetadata::IsTypeExpression("number", name);
-  }
-
-  /**
-   * \brief Return true if the type is a string.
-   */
-  bool IsString() const {
-    return gd::ValueTypeMetadata::IsTypeExpression("string", name);
-  }
-
-  /**
-   * \brief Return true if the type of the parameter is a number.
-   * \note If you had a new type of parameter, also add it in the IDE (
-   * see EventsFunctionParametersEditor, ParameterRenderingService
-   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
-   */
-  bool IsVariable() const {
-    return gd::ValueTypeMetadata::IsTypeExpression("variable", name);
-  }
-
-  /**
-   * \brief Return true if the type is representing one object
-   * (or more, i.e: an object group).
-   */
-  static bool IsTypeObject(const gd::String &parameterType) {
-    return parameterType == "object" || parameterType == "objectPtr" ||
-           parameterType == "objectList" ||
-           parameterType == "objectListOrEmptyIfJustDeclared" ||
-           parameterType == "objectListOrEmptyWithoutPicking";
-  }
-
-  /**
-   * \brief Return true if the type is "behavior".
-   */
-  static bool IsTypeBehavior(const gd::String &parameterType) {
-    return parameterType == "behavior";
-  }
-
-  /**
-   * \brief Return true if the type is an expression of the given type.
-   * \note If you are adding a new type of parameter, also add it in the IDE (
-   * see EventsFunctionParametersEditor, ParameterRenderingService
-   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
-   */
-  static bool IsTypeExpression(const gd::String &type,
-                           const gd::String &parameterType) {
-    if (type == "number") {
-      return parameterType == "number" || parameterType == "expression" ||
-             parameterType == "camera" || parameterType == "forceMultiplier";
-    } else if (type == "string") {
-      return parameterType == "string" || parameterType == "layer" ||
-             parameterType == "color" || parameterType == "file" ||
-             parameterType == "joyaxis" ||
-             parameterType == "stringWithSelector" ||
-             parameterType == "sceneName" ||
-             parameterType == "layerEffectName" ||
-             parameterType == "layerEffectParameterName" ||
-             parameterType == "objectEffectName" ||
-             parameterType == "objectEffectParameterName" ||
-             parameterType == "objectPointName" ||
-             parameterType == "objectAnimationName" ||
-             parameterType == "functionParameterName" ||
-             parameterType == "externalLayoutName" ||
-             parameterType == "leaderboardId" ||
-             parameterType == "identifier";
-    } else if (type == "variable") {
-      return parameterType == "objectvar" || parameterType == "globalvar" ||
-             parameterType == "scenevar";
-    }
-    return false;
-  }
-
-  /**
-   * \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".
-   */
-  static const gd::String &GetPrimitiveValueType(const gd::String &parameterType);
-  static const gd::String numberType;
-  static const gd::String stringType;
-
-  /**
-   * \brief Return the ValueTypeMetadata name for a property type.
-   * \see gd::PropertyDescriptor
-   */
-  static const gd::String &ConvertPropertyTypeToValueType(const gd::String &propertyType);
-
-  /** \name Serialization
-   */
-  ///@{
-  /**
-   * \brief Serialize the ParameterMetadata to the specified element
-   */
-  void SerializeTo(gd::SerializerElement &element) const;
-
-  /**
-   * \brief Load the ParameterMetadata from the specified element
-   */
-  void UnserializeFrom(const gd::SerializerElement &element);
-  ///@}
-
- private:
-  gd::String name;                      ///< Parameter type
-  gd::String supplementaryInformation;  ///< Used if needed
-  bool optional;                        ///< True if the parameter is optional
-  gd::String defaultValue;     ///< Used as a default value in editor or if an
-                               ///< optional parameter is empty.
-
-  static const gd::String numberValueType;
-  static const gd::String booleanValueType;
-  static const gd::String colorValueType;
-  static const gd::String choiceValueType;
-  static const gd::String stringValueType;
-};
-
-}  // namespace gd
-
-#endif  // VALUE_TYPE_METADATA_H

Core/GDCore/Extensions/Platform.cpp

@@ -7,7 +7,6 @@
 
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/Log.h"
 
@@ -93,8 +92,8 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
   return std::shared_ptr<gd::PlatformExtension>();
 }
 
-std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
-    gd::String type) const {
+std::unique_ptr<gd::Object> Platform::CreateObject(
+    gd::String type, const gd::String& name) const {
   if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
     gd::LogWarning("Tried to create an object with an unknown type: " + type
               + " for platform " + GetName() + "!");
@@ -106,9 +105,11 @@ std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
   }
 
   // Create a new object with the type we want.
-  auto objectConfiguration = (creationFunctionTable.find(type)->second)();
-  objectConfiguration->SetType(type);
-  return objectConfiguration;
+  std::unique_ptr<gd::Object> object =
+      (creationFunctionTable.find(type)->second)(name);
+  object->SetType(type);
+
+  return std::unique_ptr<gd::Object>(std::move(object));
 }
 
 #if defined(GD_IDE_ONLY)

Core/GDCore/Extensions/Platform.h

@@ -16,7 +16,6 @@ namespace gd {
 class InstructionsMetadataHolder;
 class Project;
 class Object;
-class ObjectConfiguration;
 class Behavior;
 class BehaviorMetadata;
 class ObjectMetadata;
@@ -27,7 +26,7 @@ class LayoutEditorCanvas;
 class ProjectExporter;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
     CreateFunPtr;
 
 #undef CreateEvent
@@ -147,8 +146,8 @@ class GD_CORE_API Platform {
   /**
    * \brief Create an object of given type with the specified name.
    */
-  std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
-      gd::String type) const;
+  std::unique_ptr<gd::Object> CreateObject(gd::String type,
+                                           const gd::String& name) const;
 
   /**
    * \brief Create an event of given type

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -18,18 +18,19 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"
 
 namespace gd {
 
+#if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badConditionsMetadata;
 std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badActionsMetadata;
 std::map<gd::String, gd::ExpressionMetadata>
     PlatformExtension::badExpressionsMetadata;
+#endif
 
 gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& name,
@@ -39,6 +40,7 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                            nameWithNamespace,
@@ -50,6 +52,7 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
                                                            smallicon)
                                            .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::InstructionMetadata& PlatformExtension::AddAction(
@@ -60,6 +63,7 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
     const gd::String& group,
     const gd::String& icon,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                         nameWithNamespace,
@@ -71,6 +75,7 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
                                                         smallicon)
                                         .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddExpression(
@@ -79,6 +84,7 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   expressionsInfos[nameWithNamespace] = ExpressionMetadata("number",
                                                            GetNameSpace(),
@@ -89,6 +95,7 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
                                                            smallicon)
                                             .SetHelpPath(GetHelpPath());
   return expressionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
@@ -97,6 +104,7 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
     const gd::String& description,
     const gd::String& group,
     const gd::String& smallicon) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name;
   strExpressionsInfos[nameWithNamespace] = ExpressionMetadata("string",
                                                               GetNameSpace(),
@@ -107,6 +115,7 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
                                                               smallicon)
                                                .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[nameWithNamespace];
+#endif
 }
 
 gd::MultipleInstructionMetadata PlatformExtension::AddExpressionAndCondition(
@@ -210,17 +219,19 @@ PlatformExtension::AddExpressionAndConditionAndAction(
       expression, condition, action);
 }
 
+#if defined(GD_IDE_ONLY)
 gd::DependencyMetadata& PlatformExtension::AddDependency() {
   extensionDependenciesMetadata.push_back(DependencyMetadata());
   return extensionDependenciesMetadata.back();
 }
+#endif
 
 gd::ObjectMetadata& PlatformExtension::AddObject(
     const gd::String& name,
     const gd::String& fullname,
     const gd::String& description,
     const gd::String& icon24x24,
-    std::shared_ptr<gd::ObjectConfiguration> instance) {
+    std::shared_ptr<gd::Object> instance) {
   gd::String nameWithNamespace = GetNameSpace() + name;
   objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
                                                    nameWithNamespace,
@@ -283,8 +294,6 @@ gd::BehaviorMetadata& PlatformExtension::AddEventsBasedBehavior(
   behaviorsInfo[nameWithNamespace] = BehaviorMetadata(GetNameSpace(),
                                                       nameWithNamespace,
                                                       fullname,
-                                                      // Default name is the name
-                                                      name,
                                                       description,
                                                       group,
                                                       icon24x24)
@@ -305,6 +314,7 @@ gd::EventMetadata& PlatformExtension::AddEvent(
     const gd::String& group_,
     const gd::String& smallicon_,
     std::shared_ptr<gd::BaseEvent> instance_) {
+#if defined(GD_IDE_ONLY)
   gd::String nameWithNamespace = GetNameSpace() + name_;
   eventsInfos[nameWithNamespace] = gd::EventMetadata(nameWithNamespace,
                                                      fullname_,
@@ -313,6 +323,7 @@ gd::EventMetadata& PlatformExtension::AddEvent(
                                                      smallicon_,
                                                      instance_);
   return eventsInfos[nameWithNamespace];
+#endif
 }
 
 PlatformExtension& PlatformExtension::SetExtensionInformation(
@@ -392,6 +403,8 @@ std::vector<gd::String> PlatformExtension::GetBehaviorsTypes() const {
   return behaviors;
 }
 
+#if defined(GD_IDE_ONLY)
+
 gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
     const gd::String& newActionName, const gd::String& copiedActionName) {
   gd::String newNameWithNamespace = GetNameSpace() + newActionName;
@@ -570,6 +583,7 @@ gd::BaseEventSPtr PlatformExtension::CreateEvent(
 
   return std::shared_ptr<gd::BaseEvent>();
 }
+#endif
 
 CreateFunPtr PlatformExtension::GetObjectCreationFunctionPtr(
     const gd::String& objectType) const {
@@ -648,6 +662,7 @@ bool PlatformExtension::IsBuiltin() const {
          builtinExtensions.end();
 }
 
+#if defined(GD_IDE_ONLY)
 void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
            GetAllActions().begin();
@@ -792,40 +807,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
       ++it;
   }
 }
-
-gd::String
-PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
-                                             const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + functionName;
-}
-
-gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
-    const gd::String &extensionName, const gd::String &behaviorName,
-    const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + behaviorName + separator + functionName;
-}
-
-gd::String
-PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
-                                       const gd::String &behaviorName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + behaviorName;
-}
-
-gd::String PlatformExtension::GetObjectEventsFunctionFullType(
-    const gd::String &extensionName, const gd::String &objectName,
-    const gd::String &functionName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + objectName + separator + functionName;
-}
-
-gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
-                                                const gd::String &objectName) {
-  const auto &separator = GetNamespaceSeparator();
-  return extensionName + separator + objectName;
-}
+#endif
 
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}

Core/GDCore/Extensions/PlatformExtension.h

@@ -37,10 +37,9 @@ class ArbitraryResourceWorker;
 class BehaviorsSharedData;
 class Behavior;
 class Object;
-class ObjectConfiguration;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
     CreateFunPtr;
 
 namespace gd {
@@ -243,7 +242,7 @@ class GD_CORE_API PlatformExtension {
                                 const gd::String& fullname_,
                                 const gd::String& description_,
                                 const gd::String& icon_,
-                                std::shared_ptr<gd::ObjectConfiguration> instance);
+                                std::shared_ptr<gd::Object> instance);
 
   /**
    * \brief Declare a new events based object as being part of the extension.
@@ -620,26 +619,7 @@ class GD_CORE_API PlatformExtension {
    */
   static gd::String GetNamespaceSeparator() { return "::"; }
 
-  static gd::String GetEventsFunctionFullType(const gd::String &extensionName,
-                                              const gd::String &functionName);
-
-  static gd::String
-  GetBehaviorEventsFunctionFullType(const gd::String &extensionName,
-                                    const gd::String &behaviorName,
-                                    const gd::String &functionName);
-
-  static gd::String GetBehaviorFullType(const gd::String &extensionName,
-                                        const gd::String &behaviorName);
-
-  static gd::String
-  GetObjectEventsFunctionFullType(const gd::String &extensionName,
-                                  const gd::String &objectName,
-                                  const gd::String &functionName);
-
-  static gd::String GetObjectFullType(const gd::String &extensionName,
-                                      const gd::String &objectName);
-
-private:
+ private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start
    * with).

Core/GDCore/Extensions/PlatformExtension.inl

@@ -25,8 +25,8 @@ gd::ObjectMetadata& PlatformExtension::AddObject(const gd::String& name,
                      fullname,
                      description,
                      icon24x24,
-                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
-                       return gd::make_unique<T>();
+                     [](gd::String name) -> std::unique_ptr<gd::Object> {
+                       return gd::make_unique<T>(name);
                      })
           .SetHelpPath(GetHelpPath());
 

Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h

@@ -3,6 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
+#if defined(GD_IDE_ONLY)
 #ifndef SCENECANVASSETTINGS_H
 #define SCENECANVASSETTINGS_H
 #include "GDCore/String.h"
@@ -42,3 +43,4 @@ private:
 }  // namespace gd
 
 #endif  // SCENECANVASSETTINGS_H
+#endif

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -73,54 +73,4 @@ bool ArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
 
 ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
 
-
-ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
-
-void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
-  DoVisitEventList(events);
-
-  for (std::size_t i = 0; i < events.size(); ++i) {
-    VisitEvent(events[i]);
-
-    if (events[i].CanHaveSubEvents()) {
-      VisitEventList(events[i].GetSubEvents());
-    }
-  }
-}
-
-void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
-  DoVisitEvent(event);
-
-  const vector<const gd::InstructionsList*> conditionsVectors =
-      event.GetAllConditionsVectors();
-  for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
-    VisitInstructionList(*conditionsVectors[j], true);
-  }
-
-  const vector<const gd::InstructionsList*> actionsVectors = event.GetAllActionsVectors();
-  for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
-    VisitInstructionList(*actionsVectors[j], false);
-  }
-}
-
-void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
-    const gd::InstructionsList& instructions, bool areConditions) {
-  DoVisitInstructionList(instructions, areConditions);
-
-  for (std::size_t i = 0; i < instructions.size(); ++i) {
-    VisitInstruction(instructions[i], areConditions);
-    if (!instructions[i].GetSubInstructions().empty()) {
-      VisitInstructionList(instructions[i].GetSubInstructions(),
-                            areConditions);
-    }
-  }
-}
-
-void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
-                                             bool isCondition) {
-  DoVisitInstruction(instruction, isCondition);
-}
-
-ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
-
 }  // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -121,101 +121,6 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
   const gd::ObjectsContainer* currentObjectsContainer;
 };
 
-/**
- * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions). It can be used to implement autocompletion for example.
- *
- * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
- *
- * \ingroup IDE
- */
-class GD_CORE_API ReadOnlyArbitraryEventsWorker {
- public:
-  ReadOnlyArbitraryEventsWorker(){};
-  virtual ~ReadOnlyArbitraryEventsWorker();
-
-  /**
-   * \brief Launch the worker on the specified events list.
-   */
-  void Launch(const gd::EventsList& events) { VisitEventList(events); };
-
- private:
-  void VisitEventList(const gd::EventsList& events);
-  void VisitEvent(const gd::BaseEvent& event);
-  void VisitInstructionList(const gd::InstructionsList& instructions,
-                            bool areConditions);
-  void VisitInstruction(const gd::Instruction& instruction, bool isCondition);
-
-  /**
-   * Called to do some work on an event list.
-   */
-  virtual void DoVisitEventList(const gd::EventsList& events){};
-
-  /**
-   * Called to do some work on an event
-   */
-  virtual void DoVisitEvent(const gd::BaseEvent& event) {};
-
-  /**
-   * Called to do some work on an instruction list
-   */
-  virtual void DoVisitInstructionList(const gd::InstructionsList& instructions,
-                                      bool areConditions){};
-
-  /**
-   * Called to do some work on an instruction.
-   */
-  virtual void DoVisitInstruction(const gd::Instruction& instruction,
-                                  bool isCondition) {};
-};
-
-/**
- * \brief An events worker that will know about the context (the objects
- * container). Useful for workers working on expressions notably.
- *
- * \see gd::ReadOnlyArbitraryEventsWorker
- *
- * \ingroup IDE
- */
-class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
-    : public ReadOnlyArbitraryEventsWorker {
- public:
-  ReadOnlyArbitraryEventsWorkerWithContext()
-      : currentGlobalObjectsContainer(nullptr),
-        currentObjectsContainer(nullptr){};
-  virtual ~ReadOnlyArbitraryEventsWorkerWithContext();
-
-  /**
-   * \brief Launch the worker on the specified events list,
-   * giving the objects container on which the events are applying to.
-   */
-  void Launch(const gd::EventsList& events,
-              const gd::ObjectsContainer& globalObjectsContainer_,
-              const gd::ObjectsContainer& objectsContainer_) {
-    currentGlobalObjectsContainer = &globalObjectsContainer_;
-    currentObjectsContainer = &objectsContainer_;
-    ReadOnlyArbitraryEventsWorker::Launch(events);
-  };
-
-  void Launch(gd::EventsList& events) = delete;
-
- protected:
-  const gd::ObjectsContainer& GetGlobalObjectsContainer() {
-    // Pointers are guaranteed to be not nullptr after
-    // Launch was called.
-    return *currentGlobalObjectsContainer;
-  };
-  const gd::ObjectsContainer& GetObjectsContainer() {
-    // Pointers are guaranteed to be not nullptr after
-    // Launch was called.
-    return *currentObjectsContainer;
-  };
-
- private:
-  const gd::ObjectsContainer* currentGlobalObjectsContainer;
-  const gd::ObjectsContainer* currentObjectsContainer;
-};
-
 }  // namespace gd
 
 #endif  // GDCORE_ARBITRARYEVENTSWORKER_H

Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp

@@ -120,7 +120,7 @@ bool EventsBehaviorRenamer::DoVisitInstruction(gd::Instruction& instruction,
           const gd::Expression& parameterValue,
           size_t parameterIndex,
           const gd::String& lastObjectName) {
-        const gd::String& type = parameterMetadata.GetType();
+        const gd::String& type = parameterMetadata.type;
 
         if (gd::ParameterMetadata::IsBehavior(type)) {
           if (lastObjectName == objectName) {

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -1,254 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "EventsIdentifiersFinder.h"
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ExternalEvents.h"
-#include "GDCore/IDE/DependenciesAnalyzer.h"
-
-using namespace std;
-
-namespace gd {
-namespace {
-/**
- * \brief Go through the nodes to search for identifier occurrences.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API IdentifierFinderExpressionNodeWorker
-    : public ExpressionParser2NodeWorker {
- public:
-  IdentifierFinderExpressionNodeWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
-                              const gd::ObjectsContainer &globalObjectsContainer_,
-                              const gd::ObjectsContainer &objectsContainer_,
-                              const gd::String& identifierType_,
-                              const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
-        identifierType(identifierType_),
-        objectName(objectName_){};
-  virtual ~IdentifierFinderExpressionNodeWorker(){};
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode& node) override {
-    node.leftHandSide->Visit(*this);
-    node.rightHandSide->Visit(*this);
-  }
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    node.expression->Visit(*this);
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
-    bool considerFunction = objectName.empty() || node.objectName == objectName;
-
-    const bool isObjectFunction = !node.objectName.empty();
-    const gd::ExpressionMetadata &metadata = isObjectFunction ?
-            MetadataProvider::GetObjectAnyExpressionMetadata(
-                platform,
-                GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
-                node.functionName):
-          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
-
-    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
-      return;
-    }
-    
-    size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
-      && parameterIndex < node.parameters.size(); ++metadataIndex) {
-      auto& parameterMetadata = metadata.parameters[metadataIndex];
-      if (parameterMetadata.IsCodeOnly()) {
-        continue;
-      }
-      auto& parameterNode = node.parameters[parameterIndex];
-      ++parameterIndex;
-
-      if (considerFunction && parameterMetadata.GetType() == "identifier"
-       && parameterMetadata.GetExtraInfo() == identifierType) {
-        // Store the value of the parameter
-        results.insert(
-            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
-      } else {
-        parameterNode->Visit(*this);
-      }
-    }
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-
- private:
-  const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
-
-  std::set<gd::String>& results;  ///< Reference to the std::set where argument
-                                  ///< values must be stored.
-  gd::String identifierType;  ///< The type of the parameters to be searched for.
-  gd::String objectName;     ///< If not empty, parameters will be taken into
-                             ///< account only if related to this object.
-};
-
-/**
- * \brief Go through the events to search for identifier occurrences.
- */
-class GD_CORE_API IdentifierFinderEventWorker
-    : public ReadOnlyArbitraryEventsWorkerWithContext {
- public:
-  IdentifierFinderEventWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
-                              const gd::String& identifierType_,
-                              const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
-        identifierType(identifierType_),
-        objectName(objectName_){};
-  virtual ~IdentifierFinderEventWorker(){};
-
-  void DoVisitInstructionList(const gd::InstructionsList& instructions,
-                                      bool areConditions) override {
-    for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
-      auto& instruction = instructions[aId];
-      gd::String lastObjectParameter = "";
-      const gd::InstructionMetadata& instrInfos =
-          areConditions ? MetadataProvider::GetConditionMetadata(
-                              platform, instruction.GetType())
-                        : MetadataProvider::GetActionMetadata(
-                              platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-        // The parameter has the searched type...
-      if (instrInfos.parameters[pNb].GetType() == "identifier"
-       && instrInfos.parameters[pNb].GetExtraInfo() == identifierType) {
-          //...remember the value of the parameter.
-          if (objectName.empty() || lastObjectParameter == objectName) {
-            results.insert(instruction.GetParameter(pNb).GetPlainString());
-          }
-        }
-        // Search in expressions
-        else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].GetType()) ||
-                ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].GetType())) {
-          auto node = instruction.GetParameter(pNb).GetRootNode();
-
-          IdentifierFinderExpressionNodeWorker searcher(
-              results,
-              platform,
-              GetGlobalObjectsContainer(),
-              GetObjectsContainer(),
-              identifierType,
-              objectName);
-          node->Visit(searcher);
-        }
-        // Remember the value of the last "object" parameter.
-        else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].GetType())) {
-          lastObjectParameter =
-              instruction.GetParameter(pNb).GetPlainString();
-        }
-      }
-    }
-  };
-
- private:
-  const gd::Platform &platform;
-
-  std::set<gd::String>& results;  ///< Reference to the std::set where argument
-                                  ///< values must be stored.
-  gd::String identifierType;  ///< The type of the parameters to be searched for.
-  gd::String objectName;     ///< If not empty, parameters will be taken into
-                             ///< account only if related to this object.
-};
-} // namespace
-
-std::set<gd::String> EventsIdentifiersFinder::FindAllIdentifierExpressions(
-    const gd::Platform& platform,
-    const gd::Project& project,
-    const gd::Layout& layout,
-    const gd::String& identifierType,
-    const gd::String& contextObjectName) {
-  std::set<gd::String> results;
-
-  const bool isObjectIdentifier = identifierType.find("object") == 0;
-  // The object from the context is only relevent for object identifiers.
-  auto& actualObjectName = isObjectIdentifier ? contextObjectName : "";
-
-  FindArgumentsInEventsAndDependencies(
-      results,
-      platform,
-      project,
-      layout,
-      identifierType,
-      actualObjectName);
-
-  return results;
-}
-
-void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
-    std::set<gd::String>& results,
-    const gd::Platform& platform,
-    const gd::Project& project,
-    const gd::Layout& layout,
-    const gd::String& identifierType,
-    const gd::String& objectName) {
-  IdentifierFinderEventWorker eventWorker(results,
-                                        platform,
-                                        identifierType,
-                                        objectName);
-  eventWorker.Launch(layout.GetEvents(), project, layout);
-
-  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
-  dependenciesAnalyzer.Analyze();
-  for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
-    const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
-
-    IdentifierFinderEventWorker eventWorker(results,
-                                          platform,
-                                          identifierType,
-                                          objectName);
-    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
-  }
-  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
-    const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
-
-    IdentifierFinderEventWorker eventWorker(results,
-                                          platform,
-                                          identifierType,
-                                          objectName);
-    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
-  }
-}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsIdentifiersFinder.h

@@ -1,81 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef EVENTSIDENTIFIERSFINDER_H
-#define EVENTSIDENTIFIERSFINDER_H
-#include <set>
-#include <vector>
-#include "GDCore/Events/Event.h"
-#include "GDCore/String.h"
-namespace gd {
-class Instruction;
-class Platform;
-class Object;
-class Project;
-class Layout;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Perform a search over a layout, searching for layout or object custom
- * identifiers.
- *
- * \todo Refactor this class using ArbitraryEventsWorker
- *
- * \ingroup IDE
- */
-class EventsIdentifiersFinder {
- public:
-  EventsIdentifiersFinder(){};
-  virtual ~EventsIdentifiersFinder(){};
-
-  /**
-   * Construct a list containing all the expressions for a given identifier used
-   * in the layout.
-   *
-   * \param project The project to use.
-   * \param layout The layout to use.
-   * \param  identifierType The identifier type to be analyzed.
-   * \param  objectName If not empty, parameters will be taken into account
-   * only if the last object parameter is filled with
-   * this value.
-   * \return A std::set containing the names of all identifiers used.
-   */
-  static std::set<gd::String> FindAllIdentifierExpressions(
-      const gd::Platform& platform,
-      const gd::Project& project,
-      const gd::Layout& layout,
-      const gd::String& identifierType,
-      const gd::String& objectName = "");
-
- private:
-  /**
-   * Construct a list containing all the expressions for a given identifier used
-   * in the layout. It searches in events dependencies.
-   *
-   * \param results A std::set to fill with the expressions used for all parameters of the
-   * specified identifier type
-   * \param platform The platform of the project
-   * \param project The project to use.
-   * \param layout The layout to use.
-   * \param events The events to be analyzed
-   * \param identifierType The identifier type to be analyzed
-   * \param objectName If not empty, parameters will be taken into account
-   * only if the last object parameter is filled with
-   * this value.
-   */
-  static void FindArgumentsInEventsAndDependencies(
-      std::set<gd::String>& results,
-      const gd::Platform& platform,
-      const gd::Project& project,
-      const gd::Layout& layout,
-      const gd::String& identifierType,
-      const gd::String& objectName = "");
-};
-
-}  // namespace gd
-
-#endif  // EVENTSIDENTIFIERSFINDER_H

Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp

@@ -30,7 +30,7 @@ bool EventsLeaderboardsLister::DoVisitInstruction(gd::Instruction& instruction,
   for (int i = 0; i < instruction.GetParametersCount() &&
                   i < instrInfo.GetParametersCount();
        ++i)
-    if (instrInfo.GetParameter(i).GetType() == "leaderboardId") {
+    if (instrInfo.GetParameter(i).type == "leaderboardId") {
       leaderboardIds.insert(instruction.GetParameter(i).GetPlainString());
     }
   return false;

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp

@@ -32,7 +32,7 @@ bool EventsLeaderboardsRenamer::DoVisitInstruction(gd::Instruction& instruction,
        ++i) {
     const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
 
-    if (parameter.GetType() == "leaderboardId") {
+    if (parameter.type == "leaderboardId") {
       const gd::String leaderboardId =
           instruction.GetParameter(i).GetPlainString();
 

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -237,12 +237,12 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           actions[aId].GetParameter(pNb).GetPlainString() == oldName)
         actions[aId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -252,7 +252,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -291,12 +291,12 @@ bool EventsRefactorer::RenameObjectInConditions(
                                                conditions[cId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
         conditions[cId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
@@ -306,7 +306,7 @@ bool EventsRefactorer::RenameObjectInConditions(
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
@@ -425,14 +425,14 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
@@ -442,7 +442,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
@@ -485,14 +485,14 @@ bool EventsRefactorer::RemoveObjectInConditions(
                                                conditions[cId].GetType());
     for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].type) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
@@ -502,7 +502,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters[pNb].type)) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
@@ -773,18 +773,15 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   const gd::String& ignored_characters =
       EventsRefactorer::searchIgnoredCharacters;
 
-  if (inEventSentences) {
-    // Remove ignored characters only when searching in event sentences.
-    search.replace_if(
-        search.begin(),
-        search.end(),
-        [ignored_characters](const char& c) {
-          return ignored_characters.find(c) != gd::String::npos;
-        },
-        "");
-    search = search.LeftTrim().RightTrim();
-    search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
-  }
+  search.replace_if(
+      search.begin(),
+      search.end(),
+      [ignored_characters](const char& c) {
+        return ignored_characters.find(c) != gd::String::npos;
+      },
+      "");
+  search = search.LeftTrim().RightTrim();
+  search.RemoveConsecutiveOccurrences(search.begin(), search.end(), ' ');
 
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -13,7 +13,6 @@
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -23,28 +22,28 @@
 using namespace std;
 
 namespace gd {
-namespace {
+
 /**
- * \brief Go through the nodes to search for variable occurrences.
+ * \brief Go through the nodes and change the given object name to a new one.
  *
  * \see gd::ExpressionParser2
  */
-class GD_CORE_API VariableFinderExpressionNodeWorker
+class GD_CORE_API ExpressionParameterSearcher
     : public ExpressionParser2NodeWorker {
  public:
-  VariableFinderExpressionNodeWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
+  ExpressionParameterSearcher(const gd::Platform &platform_,
                               const gd::ObjectsContainer &globalObjectsContainer_,
                               const gd::ObjectsContainer &objectsContainer_,
+                              std::set<gd::String>& results_,
                               const gd::String& parameterType_,
                               const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
+      : platform(platform_),
         globalObjectsContainer(globalObjectsContainer_),
         objectsContainer(objectsContainer_),
+        results(results_),
         parameterType(parameterType_),
         objectName(objectName_){};
-  virtual ~VariableFinderExpressionNodeWorker(){};
+  virtual ~ExpressionParameterSearcher(){};
 
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
@@ -75,34 +74,27 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     bool considerFunction = objectName.empty() || node.objectName == objectName;
 
-    const bool isObjectFunction = !node.objectName.empty();
-    const gd::ExpressionMetadata &metadata = isObjectFunction ?
+    const gd::ExpressionMetadata &metadata = node.objectName.empty() ?
+          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName) :
             MetadataProvider::GetObjectAnyExpressionMetadata(
                 platform,
                 GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
-                node.functionName):
-            MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
+                node.functionName);
 
     if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
       return;
     }
-
-    size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
-      && parameterIndex < node.parameters.size(); ++metadataIndex) {
-      auto& parameterMetadata = metadata.parameters[metadataIndex];
-      if (parameterMetadata.IsCodeOnly()) {
-        continue;
-      }
-      auto& parameterNode = node.parameters[parameterIndex];
-      ++parameterIndex;
-
+    
+    for (size_t i = 0; i < node.parameters.size() &&
+                       i < metadata.parameters.size();
+         ++i) {
+      auto& parameterMetadata = metadata.parameters[i];
       if (considerFunction && parameterMetadata.GetType() == parameterType) {
         // Store the value of the parameter
         results.insert(
-            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
+            gd::ExpressionParser2NodePrinter::PrintNode(*node.parameters[i]));
       } else {
-        parameterNode->Visit(*this);
+        node.parameters[i]->Visit(*this);
       }
     }
   }
@@ -120,87 +112,18 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
                              ///< account only if related to this object.
 };
 
-/**
- * \brief Go through the events to search for variable occurrences.
- */
-class GD_CORE_API VariableFinderEventWorker
-    : public ReadOnlyArbitraryEventsWorkerWithContext {
- public:
-  VariableFinderEventWorker(std::set<gd::String>& results_,
-                              const gd::Platform &platform_,
-                              const gd::String& parameterType_,
-                              const gd::String& objectName_ = "")
-      : results(results_),
-        platform(platform_),
-        parameterType(parameterType_),
-        objectName(objectName_){};
-  virtual ~VariableFinderEventWorker(){};
-
-  void DoVisitInstructionList(const gd::InstructionsList& instructions,
-                                      bool areConditions) override {
-    for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
-      auto& instruction = instructions[aId];
-      gd::String lastObjectParameter = "";
-      const gd::InstructionMetadata& instrInfos =
-          areConditions ? MetadataProvider::GetConditionMetadata(
-                              platform, instruction.GetType())
-                        : MetadataProvider::GetActionMetadata(
-                              platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-        // The parameter has the searched type...
-        if (instrInfos.parameters[pNb].GetType() == parameterType) {
-          //...remember the value of the parameter.
-          if (objectName.empty() || lastObjectParameter == objectName)
-            results.insert(instruction.GetParameter(pNb).GetPlainString());
-        }
-        // Search in expressions
-        else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].GetType()) ||
-                ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].GetType())) {
-          auto node = instruction.GetParameter(pNb).GetRootNode();
-
-          VariableFinderExpressionNodeWorker searcher(
-              results,
-              platform,
-              GetGlobalObjectsContainer(),
-              GetObjectsContainer(),
-              parameterType,
-              objectName);
-          node->Visit(searcher);
-        }
-        // Remember the value of the last "object" parameter.
-        else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].GetType())) {
-          lastObjectParameter =
-              instruction.GetParameter(pNb).GetPlainString();
-        }
-      }
-    }
-  };
-
- private:
-  const gd::Platform &platform;
-
-  std::set<gd::String>& results;  ///< Reference to the std::set where argument
-                                  ///< values must be stored.
-  gd::String parameterType;  ///< The type of the parameters to be searched for.
-  gd::String objectName;     ///< If not empty, parameters will be taken into
-                             ///< account only if related to this object.
-};
-} // namespace
-
 std::set<gd::String> EventsVariablesFinder::FindAllGlobalVariables(
     const gd::Platform& platform, const gd::Project& project) {
   std::set<gd::String> results;
 
   for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
-    FindArgumentsInEventsAndDependencies(
-            results,
+    std::set<gd::String> results2 =
+        FindArgumentsInEventsAndDependencies(
             platform,
             project,
             project.GetLayout(i),
             "globalvar");
+    results.insert(results2.begin(), results2.end());
   }
 
   return results;
@@ -212,12 +135,9 @@ std::set<gd::String> EventsVariablesFinder::FindAllLayoutVariables(
     const gd::Layout& layout) {
   std::set<gd::String> results;
 
-  FindArgumentsInEventsAndDependencies(
-      results,
-      platform,
-      project,
-      layout,
-      "scenevar");
+  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
+      platform, project, layout, "scenevar");
+  results.insert(results2.begin(), results2.end());
 
   return results;
 }
@@ -229,51 +149,159 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
     const gd::Object& object) {
   std::set<gd::String> results;
 
-  FindArgumentsInEventsAndDependencies(
-      results,
+  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
       platform,
       project,
       layout,
       "objectvar",
       object.GetName());
+  results.insert(results2.begin(), results2.end());
 
   return results;
 }
 
-void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
-    std::set<gd::String>& results,
+std::set<gd::String> EventsVariablesFinder::FindArgumentsInInstructions(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    const gd::Layout& layout,
+    const gd::InstructionsList& instructions,
+    bool instructionsAreConditions,
+    const gd::String& parameterType,
+    const gd::String& objectName) {
+  std::set<gd::String> results;
+
+  for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
+    gd::String lastObjectParameter = "";
+    const gd::InstructionMetadata& instrInfos =
+        instructionsAreConditions ? MetadataProvider::GetConditionMetadata(
+                                        platform, instructions[aId].GetType())
+                                  : MetadataProvider::GetActionMetadata(
+                                        platform, instructions[aId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      // The parameter has the searched type...
+      if (instrInfos.parameters[pNb].type == parameterType) {
+        //...remember the value of the parameter.
+        if (objectName.empty() || lastObjectParameter == objectName)
+          results.insert(instructions[aId].GetParameter(pNb).GetPlainString());
+      }
+      // Search in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters[pNb].type) ||
+               ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters[pNb].type)) {
+        auto node = instructions[aId].GetParameter(pNb).GetRootNode();
+
+        ExpressionParameterSearcher searcher(
+            platform,
+            project,
+            layout,
+            results,
+            parameterType,
+            objectName);
+        node->Visit(searcher);
+      }
+      // Remember the value of the last "object" parameter.
+      else if (gd::ParameterMetadata::IsObject(
+                   instrInfos.parameters[pNb].type)) {
+        lastObjectParameter =
+            instructions[aId].GetParameter(pNb).GetPlainString();
+      }
+    }
+
+    if (!instructions[aId].GetSubInstructions().empty())
+      FindArgumentsInInstructions(platform,
+                                  project,
+                                  layout,
+                                  instructions[aId].GetSubInstructions(),
+                                  instructionsAreConditions,
+                                  parameterType);
+  }
+
+  return results;
+}
+
+std::set<gd::String> EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
     const gd::Platform& platform,
     const gd::Project& project,
     const gd::Layout& layout,
     const gd::String& parameterType,
     const gd::String& objectName) {
+  std::set<gd::String> results;
 
-  VariableFinderEventWorker eventWorker(results,
-                                        platform,
-                                        parameterType,
-                                        objectName);
-  eventWorker.Launch(layout.GetEvents(), project, layout);
+  std::set<gd::String> results2 = FindArgumentsInEvents(
+      platform, project, layout, layout.GetEvents(), parameterType, objectName);
+  results.insert(results2.begin(), results2.end());
 
   DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
 
-    VariableFinderEventWorker eventWorker(results,
-                                          platform,
-                                          parameterType,
-                                          objectName);
-    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
+    std::set<gd::String> results3 = FindArgumentsInEvents(
+        platform, project, layout, externalEvents.GetEvents(), parameterType, objectName);
+    results.insert(results3.begin(), results3.end());
   }
   for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
     const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
 
-    VariableFinderEventWorker eventWorker(results,
-                                          platform,
-                                          parameterType,
-                                          objectName);
-    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
+    std::set<gd::String> results3 = FindArgumentsInEvents(
+        platform, project, dependencyLayout, dependencyLayout.GetEvents(), parameterType, objectName);
+    results.insert(results3.begin(), results3.end());
   }
+
+  return results;
+}
+
+std::set<gd::String> EventsVariablesFinder::FindArgumentsInEvents(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    const gd::Layout& layout,
+    const gd::EventsList& events,
+    const gd::String& parameterType,
+    const gd::String& objectName) {
+  std::set<gd::String> results;
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    vector<const gd::InstructionsList*> conditionsVectors =
+        events[i].GetAllConditionsVectors();
+    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+      std::set<gd::String> results2 =
+          FindArgumentsInInstructions(platform,
+                                      project,
+                                      layout,
+                                      *conditionsVectors[j],
+                                      /*conditions=*/true,
+                                      parameterType,
+                                      objectName);
+      results.insert(results2.begin(), results2.end());
+    }
+
+    vector<const gd::InstructionsList*> actionsVectors =
+        events[i].GetAllActionsVectors();
+    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+      std::set<gd::String> results2 =
+          FindArgumentsInInstructions(platform,
+                                      project,
+                                      layout,
+                                      *actionsVectors[j],
+                                      /*conditions=*/false,
+                                      parameterType,
+                                      objectName);
+      results.insert(results2.begin(), results2.end());
+    }
+
+    if (events[i].CanHaveSubEvents()) {
+      std::set<gd::String> results2 =
+          FindArgumentsInEvents(platform,
+                                project,
+                                layout,
+                                events[i].GetSubEvents(),
+                                parameterType,
+                                objectName);
+      results.insert(results2.begin(), results2.end());
+    }
+  }
+
+  return results;
 }
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsVariablesFinder.h

@@ -23,6 +23,7 @@ namespace gd {
  * \brief Perform a search over a project or a layout, searching for layout,
  * global or object variables.
  *
+ * \todo Refactor this class using ArbitraryEventsWorker
  * \todo Rework this class to return the shapes (maybe even types?) of the
  * variables (in particular for structures and arrays), so we can use this
  * for better autocompletions in the variables dialogs in the IDE.
@@ -73,13 +74,34 @@ class EventsVariablesFinder {
       const gd::Object& object);
 
  private:
+  /**
+   * Construct a list of the value of the arguments for parameters of type @
+   * parameterType
+   *
+   * \param project The project used
+   * \param project The layout used
+   * \param instructions The instructions to be analyzed
+   * \param instructionsAreConditions True if the instructions are conditions.
+   * \param parameterType The parameters type to be analyzed
+   * \param objectName If not empty, parameters will be taken into account only
+   * if the last object parameter is filled with this value.
+   *
+   * \return A std::set filled with the values used for all parameters of the
+   * specified type
+   */
+  static std::set<gd::String> FindArgumentsInInstructions(
+      const gd::Platform& platform,
+      const gd::Project& project,
+      const gd::Layout& layout,
+      const gd::InstructionsList& instructions,
+      bool instructionsAreConditions,
+      const gd::String& parameterType,
+      const gd::String& objectName = "");
 
   /**
    * Construct a list of the value of the arguments for parameters of type @
-   * parameterType. It searches in events dependencies.
+   * parameterType. It searchs in events dependencies.
    *
-   * \param results A std::set to fill with the values used for all parameters of the
-   * specified type
    * \param platform The platform of the project
    * \param project The project used
    * \param layout The layout used
@@ -88,14 +110,40 @@ class EventsVariablesFinder {
    * \param objectName If not empty, parameters will be taken into account
    * only if the last object parameter is filled with
    * this value.
+   *
+   * \return A std::set filled with the values used for all parameters of the
+   * specified type
    */
-  static void FindArgumentsInEventsAndDependencies(
-      std::set<gd::String>& results,
+  static std::set<gd::String> FindArgumentsInEventsAndDependencies(
       const gd::Platform& platform,
       const gd::Project& project,
       const gd::Layout& layout,
       const gd::String& parameterType,
       const gd::String& objectName = "");
+
+  /**
+   * Construct a list of the value of the arguments for parameters of type @
+   * parameterType. It doesn't search in events dependencies.
+   *
+   * \param platform The platform of the project
+   * \param project The project used
+   * \param layout The layout used
+   * \param events The events to be analyzed
+   * \param parameterType The parameters type to be analyzed
+   * \param objectName If not empty, parameters will be taken into account
+   * only if the last object parameter is filled with
+   * this value.
+   *
+   * \return A std::set filled with the values used for all parameters of the
+   * specified type
+   */
+  static std::set<gd::String> FindArgumentsInEvents(
+      const gd::Platform& platform,
+      const gd::Project& project,
+      const gd::Layout& layout,
+      const gd::EventsList& events,
+      const gd::String& parameterType,
+      const gd::String& objectName);
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -36,7 +36,7 @@ size_t GetMinimumParametersNumber(
     size_t initialParameterIndex) {
   size_t nb = 0;
   for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
-    if (!parameters[i].IsOptional() && !parameters[i].codeOnly) nb++;
+    if (!parameters[i].optional && !parameters[i].codeOnly) nb++;
   }
 
   return nb;

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -150,7 +150,7 @@ bool ExpressionsParameterMover::DoVisitInstruction(gd::Instruction& instruction,
   for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
-    const gd::String& type = metadata.parameters[pNb].GetType();
+    const gd::String& type = metadata.parameters[pNb].type;
     const gd::Expression& expression = instruction.GetParameter(pNb);
 
     auto node = expression.GetRootNode();

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -20,7 +20,6 @@ namespace gd {
 
 void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::Project& project,
-    const gd::EventsFunctionsContainer functionContainer,
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputGlobalObjectsContainer,
     gd::ObjectsContainer& outputObjectsContainer) {
@@ -32,12 +31,8 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
   // to parameters
   outputObjectsContainer.GetObjects().clear();
   outputObjectsContainer.GetObjectGroups().Clear();
-
-  auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
   gd::ParameterMetadataTools::ParametersToObjectsContainer(
-      project,
-      parameters,
-      outputObjectsContainer);
+      project, eventsFunction.GetParameters(), outputObjectsContainer);
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
@@ -49,7 +44,6 @@ void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
-                                       eventsBasedBehavior.GetEventsFunctions(),
                                        eventsFunction,
                                        outputGlobalObjectsContainer,
                                        outputObjectsContainer);
@@ -87,7 +81,6 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
-                                       eventsBasedObject.GetEventsFunctions(),
                                        eventsFunction,
                                        outputGlobalObjectsContainer,
                                        outputObjectsContainer);

Core/GDCore/IDE/EventsFunctionTools.h

@@ -10,7 +10,6 @@
 #include "GDCore/String.h"
 namespace gd {
 class Project;
-class EventsFunctionsContainer;
 class ObjectsContainer;
 class ParameterMetadata;
 class EventsFunction;
@@ -35,7 +34,6 @@ class GD_CORE_API EventsFunctionTools {
    */
   static void FreeEventsFunctionToObjectsContainer(
       const gd::Project& project,
-      const gd::EventsFunctionsContainer functionContainer,
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);

Core/GDCore/IDE/ProjectStripper.cpp

@@ -5,8 +5,6 @@
  */
 #include "ProjectStripper.h"
 
-#include "GDCore/Project/EventsFunctionsContainer.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
@@ -14,7 +12,7 @@
 
 namespace gd {
 
-void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
+void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project& project) {
   project.GetObjectGroups().Clear();
   while (project.GetExternalEventsCount() > 0)
     project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
@@ -24,28 +22,7 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
     project.GetLayout(i).GetEvents().Clear();
   }
 
-  // Keep the EventsBasedObject object list because it's useful for the Runtime
-  // to create the child-object.
-  for (unsigned int extensionIndex = 0;
-       extensionIndex < project.GetEventsFunctionsExtensionsCount();
-       ++extensionIndex) {
-    auto &extension = project.GetEventsFunctionsExtension(extensionIndex);
-    auto &eventsBasedObjects = extension.GetEventsBasedObjects();
-    if (eventsBasedObjects.size() == 0) {
-      project.RemoveEventsFunctionsExtension(extension.GetName());
-      extensionIndex--;
-      continue;
-    }
-    for (unsigned int objectIndex = 0; objectIndex < eventsBasedObjects.size();
-         ++objectIndex) {
-      auto &eventsBasedObject = eventsBasedObjects.at(objectIndex);
-      eventsBasedObject.SetFullName("");
-      eventsBasedObject.SetDescription("");
-      eventsBasedObject.GetEventsFunctions().GetInternalVector().clear();
-      eventsBasedObject.GetPropertyDescriptors().GetInternalVector().clear();
-    }
-    extension.GetEventsBasedBehaviors().Clear();
-  }
+  project.ClearEventsFunctionsExtensions();
 }
 
-} // namespace gd
+}  // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -1,301 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "PropertyFunctionGenerator.h"
-
-#include "GDCore/Events/Builtin/StandardEvent.h"
-#include "GDCore/Events/Event.h"
-#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/Project/EventsBasedBehavior.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
-    gd::Project &project, gd::EventsFunctionsExtension &extension,
-    gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::NamedPropertyDescriptor &property, bool isSharedProperties) {
-  GenerateGetterAndSetter(project, extension, eventsBasedBehavior, property,
-                          eventsBasedBehavior.GetObjectType(), true,
-                          isSharedProperties);
-}
-
-void PropertyFunctionGenerator::GenerateObjectGetterAndSetter(
-    gd::Project &project, gd::EventsFunctionsExtension &extension,
-    gd::EventsBasedObject &eventsBasedObject,
-    const gd::NamedPropertyDescriptor &property) {
-  GenerateGetterAndSetter(project, extension, eventsBasedObject, property, "",
-                          false, false);
-}
-
-void PropertyFunctionGenerator::GenerateGetterAndSetter(
-    gd::Project &project, gd::EventsFunctionsExtension &extension,
-    gd::AbstractEventsBasedEntity &eventsBasedEntity,
-    const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
-    bool isBehavior, bool isSharedProperties) {
-  auto &propertyName = property.GetName();
-  auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
-  gd::String capitalizedName = CapitalizeFirstLetter(property.GetName());
-  gd::String setterName = "Set" + capitalizedName;
-
-  gd::String functionGroupName =
-      (eventsBasedEntity.GetFullName().empty()
-           ? eventsBasedEntity.GetName()
-           : eventsBasedEntity.GetFullName()) +
-      (property.GetGroup().empty()
-           ? ""
-           : " " + UnCapitalizeFirstLetter(property.GetGroup())) +
-      " configuration";
-
-  gd::String propertyLabel =
-      property.GetLabel().empty() ? property.GetName() : property.GetLabel();
-
-  gd::String descriptionSubject =
-      (property.GetType() == "Boolean" ? "if " : "the ") +
-      UnCapitalizeFirstLetter(propertyLabel) +
-      (isSharedProperties || property.GetType() == "Boolean"
-           ? "."
-           : " of the object.") +
-      (property.GetDescription().empty() ? ""
-                                         : " " + property.GetDescription()) +
-      (isSharedProperties
-           ? " While an object is needed, this will apply to all "
-             "objects using the behavior."
-           : "");
-
-  gd::String propertyGetterName =
-      (isSharedProperties ? "SharedProperty" : "Property") + property.GetName();
-  gd::String getterType =
-      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-          extension.GetName(), eventsBasedEntity.GetName(), propertyGetterName);
-  gd::String setterType =
-      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-          extension.GetName(), eventsBasedEntity.GetName(),
-          "Set" + propertyGetterName);
-
-  gd::String getterName = capitalizedName;
-  gd::String numberOrString =
-      property.GetType() == "Number" ? "Number" : "String";
-
-  if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
-    auto &getter = functionsContainer.InsertNewEventsFunction(
-        getterName, functionsContainer.GetEventsFunctionsCount());
-    auto &expressionType =
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property.GetType());
-    // TODO Stop replacing number by expression when it"s handled by the UI
-    // and released.
-    auto &legacyExpressionType =
-        expressionType == "number" ? "expression" : expressionType;
-    getter.GetExpressionType()
-        .SetName(legacyExpressionType)
-        .SetExtraInfo(GetStringifiedExtraInfo(property));
-    getter.SetFullName(propertyLabel).SetGroup(functionGroupName);
-    if (property.GetType() == "Boolean") {
-      getter.SetFunctionType(gd::EventsFunction::Condition)
-          .SetDescription("Check " + descriptionSubject)
-          .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel));
-    } else {
-      getter.SetFunctionType(gd::EventsFunction::ExpressionAndCondition)
-          .SetDescription(descriptionSubject)
-          .SetSentence("the " + UnCapitalizeFirstLetter(propertyLabel));
-    }
-
-    auto &event =
-        dynamic_cast<gd::StandardEvent &>(getter.GetEvents().InsertNewEvent(
-            project, "BuiltinCommonInstructions::Standard", 0));
-    if (property.GetType() == "Boolean") {
-      gd::Instruction condition;
-      condition.SetType(getterType);
-      condition.AddParameter("Object");
-      if (isBehavior) {
-        condition.AddParameter("Behavior");
-      }
-      event.GetConditions().Insert(condition, 0);
-
-      gd::Instruction action;
-      action.SetType("SetReturnBoolean");
-      action.AddParameter("True");
-      event.GetActions().Insert(action, 0);
-    } else {
-      gd::Instruction action;
-      action.SetType("SetReturn" + numberOrString);
-      gd::String receiver = isBehavior ? "Object.Behavior::" : "Object.";
-      gd::String propertyPrefix =
-          (isSharedProperties ? "SharedProperty" : "Property");
-      action.AddParameter(receiver + propertyPrefix + property.GetName() +
-                          "()");
-      event.GetActions().Insert(action, 0);
-    }
-  }
-
-  if (!functionsContainer.HasEventsFunctionNamed(setterName)) {
-    auto &setter = functionsContainer.InsertNewEventsFunction(
-        setterName, functionsContainer.GetEventsFunctionsCount());
-    if (property.GetType() == "Boolean") {
-      setter.SetFunctionType(gd::EventsFunction::Action)
-          .SetFullName(propertyLabel)
-          .SetGroup(functionGroupName)
-          .SetDescription("Change " + descriptionSubject)
-          .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel) +
-                       (isBehavior ? ": _PARAM2_" : ": _PARAM1_"));
-      gd::ParameterMetadata objectParameter;
-      objectParameter.SetType("object")
-          .SetName("Object")
-          .SetDescription("Object")
-          .SetExtraInfo(objectType);
-      if (!isBehavior) {
-        gd::String objectFullType = gd::PlatformExtension::GetObjectFullType(
-            extension.GetName(), eventsBasedEntity.GetName());
-        objectParameter.SetExtraInfo(objectFullType);
-      }
-      setter.GetParameters().push_back(objectParameter);
-      if (isBehavior) {
-        gd::ParameterMetadata behaviorParameter;
-        gd::String behaviorFullType =
-            gd::PlatformExtension::GetBehaviorFullType(
-                extension.GetName(), eventsBasedEntity.GetName());
-        behaviorParameter.SetType("behavior")
-            .SetName("Behavior")
-            .SetDescription("Behavior")
-            .SetExtraInfo(behaviorFullType);
-        setter.GetParameters().push_back(behaviorParameter);
-      }
-      gd::ParameterMetadata valueParameter;
-      valueParameter.SetType("yesorno")
-          .SetName("Value")
-          .SetDescription(capitalizedName)
-          .SetOptional(true)
-          .SetDefaultValue("yes");
-      setter.GetParameters().push_back(valueParameter);
-    } else {
-      setter.SetFunctionType(gd::EventsFunction::ActionWithOperator);
-      setter.SetGetterName(getterName);
-    }
-
-    if (property.GetType() == "Boolean") {
-      {
-        auto &event =
-            dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
-                project, "BuiltinCommonInstructions::Standard", 0));
-
-        gd::Instruction condition;
-        condition.SetType("GetArgumentAsBoolean");
-        condition.AddParameter("\"Value\"");
-        event.GetConditions().Insert(condition, 0);
-
-        gd::Instruction action;
-        action.SetType(setterType);
-        action.AddParameter("Object");
-        if (isBehavior) {
-          action.AddParameter("Behavior");
-          action.AddParameter("yes");
-        } else {
-          action.AddParameter("yes");
-        }
-        event.GetActions().Insert(action, 0);
-      }
-      {
-        auto &event =
-            dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
-                project, "BuiltinCommonInstructions::Standard", 0));
-
-        gd::Instruction condition;
-        condition.SetType("GetArgumentAsBoolean");
-        condition.AddParameter("\"Value\"");
-        condition.SetInverted(true);
-        event.GetConditions().Insert(condition, 0);
-
-        gd::Instruction action;
-        action.SetType(setterType);
-        action.AddParameter("Object");
-        if (isBehavior) {
-          action.AddParameter("Behavior");
-          action.AddParameter("no");
-        } else {
-          action.AddParameter("no");
-        }
-        event.GetActions().Insert(action, 0);
-      }
-    } else {
-      auto &event =
-          dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
-              project, "BuiltinCommonInstructions::Standard", 0));
-
-      gd::Instruction action;
-      action.SetType(setterType);
-      action.AddParameter("Object");
-      gd::String parameterGetterCall =
-          "GetArgumentAs" + numberOrString + "(\"Value\")";
-      if (isBehavior) {
-        action.AddParameter("Behavior");
-        action.AddParameter("=");
-        action.AddParameter(parameterGetterCall);
-      } else {
-        action.AddParameter("=");
-        action.AddParameter(parameterGetterCall);
-      }
-      event.GetActions().Insert(action, 0);
-    }
-  }
-}
-
-bool PropertyFunctionGenerator::CanGenerateGetterAndSetter(
-    const gd::AbstractEventsBasedEntity &eventsBasedEntity,
-    const gd::NamedPropertyDescriptor &property) {
-  auto &type = property.GetType();
-  if (type != "Boolean" && type != "Number" && type != "String" &&
-      type != "Choice" && type != "Color") {
-    return false;
-  }
-
-  auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
-  auto getterName = CapitalizeFirstLetter(property.GetName());
-  auto setterName = "Set" + getterName;
-  return !functionsContainer.HasEventsFunctionNamed(setterName) &&
-         !functionsContainer.HasEventsFunctionNamed(getterName);
-};
-
-gd::String PropertyFunctionGenerator::GetStringifiedExtraInfo(
-    const gd::PropertyDescriptor &property) {
-  if (property.GetType() == "Choice") {
-    gd::String arrayString;
-    arrayString += "[";
-    bool isFirst = true;
-    for (const gd::String &choice : property.GetExtraInfo()) {
-      if (!isFirst) {
-        arrayString += ",";
-      }
-      isFirst = false;
-      arrayString += "\"" + choice + "\"";
-    }
-    arrayString += "]";
-    return arrayString;
-  }
-  return "";
-}
-
-gd::String
-PropertyFunctionGenerator::CapitalizeFirstLetter(const gd::String &string) {
-  if (string.empty()) {
-    return string;
-  }
-  return string.substr(0, 1).UpperCase() + string.substr(1);
-}
-
-gd::String
-PropertyFunctionGenerator::UnCapitalizeFirstLetter(const gd::String &string) {
-  if (string.empty()) {
-    return string;
-  }
-  return string.substr(0, 1).LowerCase() + string.substr(1);
-}
-
-} // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -1,65 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_PROPERTYFUNCTIONGENERATOR_H
-#define GDCORE_PROPERTYFUNCTIONGENERATOR_H
-
-namespace gd {
-class String;
-class Project;
-class EventsFunctionsExtension;
-class EventsBasedBehavior;
-class EventsBasedObject;
-class AbstractEventsBasedEntity;
-class PropertyDescriptor;
-class NamedPropertyDescriptor;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Generate a getter and a setter functions for properties.
- */
-class GD_CORE_API PropertyFunctionGenerator {
-public:
-  /**
-   * \brief Generate a getter and a setter for the given behavior property.
-   */
-  static void GenerateBehaviorGetterAndSetter(
-      gd::Project &project, gd::EventsFunctionsExtension &extension,
-      gd::EventsBasedBehavior &eventsBasedBehavior,
-      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 bool CanGenerateGetterAndSetter(
-      const gd::AbstractEventsBasedEntity &eventsBasedEntity,
-      const gd::NamedPropertyDescriptor &property);
-
-  ~PropertyFunctionGenerator();
-
-private:
-  static void GenerateGetterAndSetter(
-      gd::Project &project, gd::EventsFunctionsExtension &extension,
-      gd::AbstractEventsBasedEntity &eventsBasedEntity,
-      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);
-
-  PropertyFunctionGenerator();
-};
-
-} // namespace gd
-
-#endif // GDCORE_PROPERTYFUNCTIONGENERATOR_H

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -35,6 +35,40 @@
 #include "GDCore/String.h"
 #include "GDCore/Tools/Log.h"
 
+namespace {
+// These functions are doing the reverse of what is done when adding
+// instructions/expression to extension/behaviors. If needed, they could be
+// moved to gd::PlatformExtension to colocate the usage of the namespace
+// separator?
+gd::String GetEventsFunctionFullType(const gd::String& extensionName,
+                                     const gd::String& functionName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + functionName;
+}
+gd::String GetBehaviorEventsFunctionFullType(const gd::String& extensionName,
+                                             const gd::String& behaviorName,
+                                             const gd::String& functionName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + behaviorName + separator + functionName;
+}
+gd::String GetBehaviorFullType(const gd::String& extensionName,
+                               const gd::String& behaviorName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + behaviorName;
+}
+gd::String GetObjectEventsFunctionFullType(const gd::String& extensionName,
+                                             const gd::String& objectName,
+                                             const gd::String& functionName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + objectName + separator + functionName;
+}
+gd::String GetObjectFullType(const gd::String& extensionName,
+                               const gd::String& objectName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + objectName;
+}
+}  // namespace
+
 namespace gd {
 
 // By convention, the first parameter of an events based behavior method is
@@ -120,11 +154,7 @@ void WholeProjectRefactorer::ExposeProjectEvents(
       gd::ObjectsContainer globalObjectsAndGroups;
       gd::ObjectsContainer objectsAndGroups;
       gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
-          project,
-          eventsFunctionsExtension,
-          *eventsFunction,
-          globalObjectsAndGroups,
-          objectsAndGroups);
+          project, *eventsFunction, globalObjectsAndGroups, objectsAndGroups);
 
       worker.Launch(eventsFunction->GetEvents(),
                     globalObjectsAndGroups,
@@ -218,7 +248,7 @@ WholeProjectRefactorer::GetAllObjectTypesUsingEventsBasedBehavior(
     const gd::EventsFunctionsExtension& eventsFunctionsExtension,
     const gd::EventsBasedBehavior& eventsBasedBehavior) {
   std::set<gd::String> allTypes;
-  const gd::String behaviorType = gd::PlatformExtension::GetBehaviorFullType(
+  const gd::String behaviorType = GetBehaviorFullType(
       eventsFunctionsExtension.GetName(), eventsBasedBehavior.GetName());
 
   auto addTypesOfObjectsIn =
@@ -261,7 +291,7 @@ void WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
         .SetType("behavior")
         .SetName("Behavior")
         .SetDescription("Behavior")
-        .SetExtraInfo(gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        .SetExtraInfo(GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                                           eventsBasedBehavior.GetName()));
   }
 }
@@ -281,7 +311,7 @@ void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
         .SetType("object")
         .SetName(parentObjectParameterName)
         .SetDescription("Object")
-        .SetExtraInfo(gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
+        .SetExtraInfo(GetObjectFullType(eventsFunctionsExtension.GetName(),
                                         eventsBasedObject.GetName()));
   }
 }
@@ -296,27 +326,30 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         DoRenameEventsFunction(
             project,
             eventsFunction,
-            gd::PlatformExtension::GetEventsFunctionFullType(oldName, eventsFunction.GetName()),
-            gd::PlatformExtension::GetEventsFunctionFullType(newName, eventsFunction.GetName()));
+            GetEventsFunctionFullType(oldName, eventsFunction.GetName()),
+            GetEventsFunctionFullType(newName, eventsFunction.GetName()));
       };
 
   auto renameBehaviorEventsFunction =
       [&project, &oldName, &newName](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.IsExpression()) {
-          // Nothing to do, expressions are not including the extension name
-        }
-        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(oldName,
+              GetBehaviorEventsFunctionFullType(oldName,
                                                 eventsBasedBehavior.GetName(),
                                                 eventsFunction.GetName()),
-              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(newName,
+              GetBehaviorEventsFunctionFullType(newName,
                                                 eventsBasedBehavior.GetName(),
                                                 eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
+        } else if (eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::Expression ||
+                   eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::StringExpression) {
+          // Nothing to do, expressions are not including the extension name
         }
       };
 
@@ -326,12 +359,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
             project,
-            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            GetBehaviorEventsFunctionFullType(
                 oldName,
                 eventsBasedBehavior.GetName(),
                 gd::EventsBasedBehavior::GetPropertyActionName(
                     property.GetName())),
-            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+            GetBehaviorEventsFunctionFullType(
                 newName,
                 eventsBasedBehavior.GetName(),
                 gd::EventsBasedBehavior::GetPropertyActionName(
@@ -341,12 +374,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
                 project,
-                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+                GetBehaviorEventsFunctionFullType(
                     oldName,
                     eventsBasedBehavior.GetName(),
                     gd::EventsBasedBehavior::GetPropertyConditionName(
                         property.GetName())),
-                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+                GetBehaviorEventsFunctionFullType(
                     newName,
                     eventsBasedBehavior.GetName(),
                     gd::EventsBasedBehavior::GetPropertyConditionName(
@@ -357,60 +390,26 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         // extension name
       };
 
-  auto renameBehaviorSharedPropertyFunctions =
-      [&project, &oldName, &newName](
-          const gd::EventsBasedBehavior& eventsBasedBehavior,
-          const gd::NamedPropertyDescriptor& property) {
-        gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
-            project,
-            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-                oldName,
-                eventsBasedBehavior.GetName(),
-                gd::EventsBasedBehavior::GetSharedPropertyActionName(
-                    property.GetName())),
-            gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-                newName,
-                eventsBasedBehavior.GetName(),
-                gd::EventsBasedBehavior::GetSharedPropertyActionName(
-                    property.GetName())));
-        ExposeProjectEvents(project, actionRenamer);
-
-        gd::InstructionsTypeRenamer conditionRenamer =
-            gd::InstructionsTypeRenamer(
-                project,
-                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-                    oldName,
-                    eventsBasedBehavior.GetName(),
-                    gd::EventsBasedBehavior::GetSharedPropertyConditionName(
-                        property.GetName())),
-                gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-                    newName,
-                    eventsBasedBehavior.GetName(),
-                    gd::EventsBasedBehavior::GetSharedPropertyConditionName(
-                        property.GetName())));
-        ExposeProjectEvents(project, conditionRenamer);
-
-        // Nothing to do for expressions, expressions are not including the
-        // extension name
-      };
-
   auto renameObjectEventsFunction =
       [&project, &oldName, &newName](
           const gd::EventsBasedObject& eventsBasedObject,
           const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.IsExpression()) {
-          // Nothing to do, expressions are not including the extension name
-        }
-        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              gd::PlatformExtension::GetObjectEventsFunctionFullType(oldName,
+              GetObjectEventsFunctionFullType(oldName,
                                                 eventsBasedObject.GetName(),
                                                 eventsFunction.GetName()),
-              gd::PlatformExtension::GetObjectEventsFunctionFullType(newName,
+              GetObjectEventsFunctionFullType(newName,
                                                 eventsBasedObject.GetName(),
                                                 eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
+        } else if (eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::Expression ||
+                   eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::StringExpression) {
+          // Nothing to do, expressions are not including the extension name
         }
       };
 
@@ -420,12 +419,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
             project,
-            gd::PlatformExtension::GetObjectEventsFunctionFullType(
+            GetObjectEventsFunctionFullType(
                 oldName,
                 eventsBasedObject.GetName(),
                 gd::EventsBasedObject::GetPropertyActionName(
                     property.GetName())),
-            gd::PlatformExtension::GetObjectEventsFunctionFullType(
+            GetObjectEventsFunctionFullType(
                 newName,
                 eventsBasedObject.GetName(),
                 gd::EventsBasedObject::GetPropertyActionName(
@@ -435,12 +434,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
                 project,
-                gd::PlatformExtension::GetObjectEventsFunctionFullType(
+                GetObjectEventsFunctionFullType(
                     oldName,
                     eventsBasedObject.GetName(),
                     gd::EventsBasedObject::GetPropertyConditionName(
                         property.GetName())),
-                gd::PlatformExtension::GetObjectEventsFunctionFullType(
+                GetObjectEventsFunctionFullType(
                     newName,
                     eventsBasedObject.GetName(),
                     gd::EventsBasedObject::GetPropertyConditionName(
@@ -457,7 +456,9 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
 
   // Free expressions
   for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-    if (eventsFunction->IsExpression()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
+        eventsFunction->GetFunctionType() ==
+            gd::EventsFunction::StringExpression) {
       renameEventsFunction(*eventsFunction);
     }
   }
@@ -466,7 +467,9 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
     auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
     for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-      if (eventsFunction->IsExpression()) {
+      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
+          eventsFunction->GetFunctionType() ==
+              gd::EventsFunction::StringExpression) {
         renameBehaviorEventsFunction(*eventsBasedBehavior, *eventsFunction);
       }
     }
@@ -474,7 +477,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
 
   // Free instructions
   for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
       renameEventsFunction(*eventsFunction);
     }
   }
@@ -484,26 +488,21 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
     auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
     for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-      if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
+      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+          eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
         renameBehaviorEventsFunction(*eventsBasedBehavior, *eventsFunction);
       }
     }
   }
 
   // Behavior properties
-  for (auto &&eventsBasedBehavior :
+  for (auto&& eventsBasedBehavior :
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
-    for (auto &&propertyDescriptor :
-         eventsBasedBehavior->GetPropertyDescriptors().GetInternalVector()) {
+    auto& behaviorProperties = eventsBasedBehavior->GetPropertyDescriptors();
+    for (auto&& propertyDescriptor : behaviorProperties.GetInternalVector()) {
       renameBehaviorPropertyFunctions(*eventsBasedBehavior,
                                       *propertyDescriptor);
     }
-    for (auto &&propertyDescriptor :
-         eventsBasedBehavior->GetSharedPropertyDescriptors()
-             .GetInternalVector()) {
-      renameBehaviorSharedPropertyFunctions(*eventsBasedBehavior,
-                                            *propertyDescriptor);
-    }
   }
 
   // Object instructions
@@ -511,7 +510,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
     auto& objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
     for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-      if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
+      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+          eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
         renameObjectEventsFunction(*eventsBasedObject, *eventsFunction);
       }
     }
@@ -532,8 +532,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
     DoRenameBehavior(
         project,
-        gd::PlatformExtension::GetBehaviorFullType(oldName, eventsBasedBehavior->GetName()),
-        gd::PlatformExtension::GetBehaviorFullType(newName, eventsBasedBehavior->GetName()));
+        GetBehaviorFullType(oldName, eventsBasedBehavior->GetName()),
+        GetBehaviorFullType(newName, eventsBasedBehavior->GetName()));
   }
 
   // Finally, rename custom objects type
@@ -541,8 +541,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
     DoRenameObject(
         project,
-        gd::PlatformExtension::GetObjectFullType(oldName, eventsBasedObject->GetName()),
-        gd::PlatformExtension::GetObjectFullType(newName, eventsBasedObject->GetName()));
+        GetObjectFullType(oldName, eventsBasedObject->GetName()),
+        GetObjectFullType(newName, eventsBasedObject->GetName()));
   }
 }
 
@@ -559,20 +559,10 @@ void WholeProjectRefactorer::RenameEventsFunction(
   DoRenameEventsFunction(
       project,
       eventsFunction,
-      gd::PlatformExtension::GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                 oldFunctionName),
-      gd::PlatformExtension::GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                 newFunctionName));
-  
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
-    for (auto&& otherFunction : eventsFunctionsExtension.GetInternalVector())
-    {
-      if (otherFunction->GetFunctionType() == gd::EventsFunction::ActionWithOperator &&
-          otherFunction->GetGetterName() == oldFunctionName) {
-        otherFunction->SetGetterName(newFunctionName);
-      }
-    }
-  }
 }
 
 void WholeProjectRefactorer::RenameBehaviorEventsFunction(
@@ -587,39 +577,30 @@ void WholeProjectRefactorer::RenameBehaviorEventsFunction(
   const gd::EventsFunction& eventsFunction =
       eventsFunctions.GetEventsFunction(oldFunctionName);
 
-  // Order is important: we first rename the expressions then the instructions,
-  // to avoid being unable to fetch the metadata (the types of parameters) of
-  // instructions after they are renamed.
-  if (eventsFunction.IsExpression()) {
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+        project,
+        GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedBehavior.GetName(),
+                                          oldFunctionName),
+        GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedBehavior.GetName(),
+                                          newFunctionName));
+    ExposeProjectEvents(project, renamer);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedBehaviorExpression(
-        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedBehavior.GetName()),
         oldFunctionName,
         newFunctionName);
     ExposeProjectEvents(project, renamer);
   }
-  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
-    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
-        project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedBehavior.GetName(),
-                                          oldFunctionName),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedBehavior.GetName(),
-                                          newFunctionName));
-    ExposeProjectEvents(project, renamer);
-  }
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
-    for (auto&& otherFunction : eventsBasedBehavior.GetEventsFunctions().GetInternalVector())
-    {
-      if (otherFunction->GetFunctionType() == gd::EventsFunction::ActionWithOperator &&
-          otherFunction->GetGetterName() == oldFunctionName) {
-        otherFunction->SetGetterName(newFunctionName);
-      }
-    }
-  }
 }
 
 void WholeProjectRefactorer::RenameObjectEventsFunction(
@@ -634,36 +615,30 @@ void WholeProjectRefactorer::RenameObjectEventsFunction(
   const gd::EventsFunction& eventsFunction =
       eventsFunctions.GetEventsFunction(oldFunctionName);
 
-  if (eventsFunction.IsExpression()) {
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+        project,
+        GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedObject.GetName(),
+                                          oldFunctionName),
+        GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedObject.GetName(),
+                                          newFunctionName));
+    ExposeProjectEvents(project, renamer);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedObjectExpression(
-        gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
+        GetObjectFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedObject.GetName()),
         oldFunctionName,
         newFunctionName);
     ExposeProjectEvents(project, renamer);
   }
-  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
-    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
-        project,
-        gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedObject.GetName(),
-                                          oldFunctionName),
-        gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                          eventsBasedObject.GetName(),
-                                          newFunctionName));
-    ExposeProjectEvents(project, renamer);
-  }
-  if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
-    for (auto&& otherFunction : eventsBasedObject.GetEventsFunctions().GetInternalVector())
-    {
-      if (otherFunction->GetFunctionType() == gd::EventsFunction::ActionWithOperator &&
-          otherFunction->GetGetterName() == oldFunctionName) {
-        otherFunction->SetGetterName(newFunctionName);
-      }
-    }
-  }
 }
 
 void WholeProjectRefactorer::MoveEventsFunctionParameter(
@@ -677,25 +652,24 @@ void WholeProjectRefactorer::MoveEventsFunctionParameter(
   const gd::EventsFunction& eventsFunction =
       eventsFunctionsExtension.GetEventsFunction(functionName);
 
-  const gd::String& eventsFunctionType = gd::PlatformExtension::GetEventsFunctionFullType(
+  const gd::String& eventsFunctionType = GetEventsFunctionFullType(
       eventsFunctionsExtension.GetName(), functionName);
 
-  if (eventsFunction.IsExpression()) {
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project, eventsFunctionType, oldIndex, newIndex);
+    ExposeProjectEvents(project, mover);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
     gd::ExpressionsParameterMover mover =
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetFreeExpressionMovedParameter(
         eventsFunctionType, oldIndex, newIndex);
     ExposeProjectEvents(project, mover);
   }
-  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
-    const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
-    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
-        project,
-        eventsFunctionType,
-        oldIndex + operatorIndexOffset,
-        newIndex + operatorIndexOffset);
-    ExposeProjectEvents(project, mover);
-  }
 }
 
 void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
@@ -712,30 +686,29 @@ void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
       eventsFunctions.GetEventsFunction(functionName);
 
   const gd::String& eventsFunctionType =
-      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                         eventsBasedBehavior.GetName(),
                                         functionName);
 
-  if (eventsFunction.IsExpression()) {
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project, eventsFunctionType, oldIndex, newIndex);
+    ExposeProjectEvents(project, mover);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
     gd::ExpressionsParameterMover mover =
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetBehaviorExpressionMovedParameter(
-        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedBehavior.GetName()),
         functionName,
         oldIndex,
         newIndex);
     ExposeProjectEvents(project, mover);
   }
-  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
-    const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
-    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
-        project,
-        eventsFunctionType,
-        oldIndex + operatorIndexOffset,
-        newIndex + operatorIndexOffset);
-    ExposeProjectEvents(project, mover);
-  }
 }
 
 void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
@@ -752,30 +725,29 @@ void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
       eventsFunctions.GetEventsFunction(functionName);
 
   const gd::String& eventsFunctionType =
-      gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+      GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                         eventsBasedObject.GetName(),
                                         functionName);
 
-  if (eventsFunction.IsExpression()) {
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project, eventsFunctionType, oldIndex, newIndex);
+    ExposeProjectEvents(project, mover);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
     gd::ExpressionsParameterMover mover =
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetObjectExpressionMovedParameter(
-        gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
+        GetObjectFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedObject.GetName()),
         functionName,
         oldIndex,
         newIndex);
     ExposeProjectEvents(project, mover);
   }
-  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
-    const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
-    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
-        project,
-        eventsFunctionType,
-        oldIndex + operatorIndexOffset,
-        newIndex + operatorIndexOffset);
-    ExposeProjectEvents(project, mover);
-  }
 }
 
 void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
@@ -812,7 +784,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
     gd::ExpressionsRenamer expressionRenamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     expressionRenamer.SetReplacedBehaviorExpression(
-        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
+        GetBehaviorFullType(eventsFunctionsExtension.GetName(),
                             eventsBasedBehavior.GetName()),
         EventsBasedBehavior::GetPropertyExpressionName(oldPropertyName),
         EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
@@ -820,11 +792,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyActionName(oldPropertyName)),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyActionName(newPropertyName)));
@@ -832,11 +804,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyConditionName(oldPropertyName)),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyConditionName(newPropertyName)));
@@ -844,72 +816,6 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
   }
 }
 
-void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
-    gd::Project& project,
-    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-    const gd::EventsBasedBehavior& eventsBasedBehavior,
-    const gd::String& oldPropertyName,
-    const gd::String& newPropertyName) {
-  auto& properties = eventsBasedBehavior.GetPropertyDescriptors();
-  if (!properties.Has(oldPropertyName)) return;
-
-  if (properties.Get(oldPropertyName).GetType() == "Behavior") {
-    // This is a property representing another behavior that must exist on the
-    // object.
-
-    // This other "required behavior" uses the property name, that is about to
-    // change, as its name.
-    // So we must change all reference to this name in the events of the
-    // behavior functions.
-    gd::EventsBehaviorRenamer behaviorRenamer(project.GetCurrentPlatform(),
-                                              behaviorObjectParameterName,
-                                              oldPropertyName,
-                                              newPropertyName);
-
-    ExposeEventsBasedBehaviorEvents(
-        project, eventsBasedBehavior, behaviorRenamer);
-  } else {
-    // Properties that represent primitive values will be used through
-    // their related actions/conditions/expressions. Rename these.
-
-    // Order is important: we first rename the expressions then the
-    // instructions, to avoid being unable to fetch the metadata (the types of
-    // parameters) of instructions after they are renamed.
-    gd::ExpressionsRenamer expressionRenamer =
-        gd::ExpressionsRenamer(project.GetCurrentPlatform());
-    expressionRenamer.SetReplacedBehaviorExpression(
-        gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(),
-                            eventsBasedBehavior.GetName()),
-        EventsBasedBehavior::GetSharedPropertyExpressionName(oldPropertyName),
-        EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName));
-    ExposeProjectEvents(project, expressionRenamer);
-
-    gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
-        project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetSharedPropertyActionName(oldPropertyName)),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetSharedPropertyActionName(newPropertyName)));
-    ExposeProjectEvents(project, actionRenamer);
-
-    gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
-        project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetSharedPropertyConditionName(oldPropertyName)),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            eventsBasedBehavior.GetName(),
-            EventsBasedBehavior::GetSharedPropertyConditionName(newPropertyName)));
-    ExposeProjectEvents(project, conditionRenamer);
-  }
-}
-
 void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
     gd::Project& project,
     const gd::EventsFunctionsExtension& eventsFunctionsExtension,
@@ -928,7 +834,7 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
   gd::ExpressionsRenamer expressionRenamer =
       gd::ExpressionsRenamer(project.GetCurrentPlatform());
   expressionRenamer.SetReplacedObjectExpression(
-      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(),
+      GetObjectFullType(eventsFunctionsExtension.GetName(),
                           eventsBasedObject.GetName()),
       EventsBasedObject::GetPropertyExpressionName(oldPropertyName),
       EventsBasedObject::GetPropertyExpressionName(newPropertyName));
@@ -936,11 +842,11 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
 
   gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
       project,
-      gd::PlatformExtension::GetObjectEventsFunctionFullType(
+      GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyActionName(oldPropertyName)),
-      gd::PlatformExtension::GetObjectEventsFunctionFullType(
+      GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyActionName(newPropertyName)));
@@ -948,11 +854,11 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
 
   gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
       project,
-      gd::PlatformExtension::GetObjectEventsFunctionFullType(
+      GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyConditionName(oldPropertyName)),
-      gd::PlatformExtension::GetObjectEventsFunctionFullType(
+      GetObjectEventsFunctionFullType(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyConditionName(newPropertyName)));
@@ -1182,22 +1088,25 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
        &eventsFunctionsExtension,
        &oldBehaviorName,
        &newBehaviorName](const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.IsExpression()) {
-          // Nothing to do, expressions are not including the name of the
-          // behavior
-        }
-        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+              GetBehaviorEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   oldBehaviorName,
                   eventsFunction.GetName()),
-              gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+              GetBehaviorEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   newBehaviorName,
                   eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
+        } else if (eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::Expression ||
+                   eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::StringExpression) {
+          // Nothing to do, expressions are not including the name of the
+          // behavior
         }
       };
 
@@ -1209,11 +1118,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
                                         property) {
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldBehaviorName,
             EventsBasedBehavior::GetPropertyActionName(property.GetName())),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetPropertyActionName(property.GetName())));
@@ -1221,11 +1130,11 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldBehaviorName,
             EventsBasedBehavior::GetPropertyConditionName(property.GetName())),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+        GetBehaviorEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetPropertyConditionName(property.GetName())));
@@ -1235,40 +1144,6 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
     // the behavior
   };
 
-  auto renameBehaviorSharedProperty = [&project,
-                                 &eventsFunctionsExtension,
-                                 &oldBehaviorName,
-                                 &newBehaviorName](
-                                    const gd::NamedPropertyDescriptor&
-                                        property) {
-    gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
-        project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            oldBehaviorName,
-            EventsBasedBehavior::GetSharedPropertyActionName(property.GetName())),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            newBehaviorName,
-            EventsBasedBehavior::GetSharedPropertyActionName(property.GetName())));
-    ExposeProjectEvents(project, actionRenamer);
-
-    gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
-        project,
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            oldBehaviorName,
-            EventsBasedBehavior::GetSharedPropertyConditionName(property.GetName())),
-        gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
-            eventsFunctionsExtension.GetName(),
-            newBehaviorName,
-            EventsBasedBehavior::GetSharedPropertyConditionName(property.GetName())));
-    ExposeProjectEvents(project, conditionRenamer);
-
-    // Nothing to do for expression, expressions are not including the name of
-    // the behavior
-  };
-
   // Order is important: we first rename the expressions then the instructions,
   // to avoid being unable to fetch the metadata (the types of parameters) of
   // instructions after they are renamed.
@@ -1276,30 +1151,31 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
 
   // Behavior expressions
   for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->IsExpression()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
+        eventsFunction->GetFunctionType() ==
+            gd::EventsFunction::StringExpression) {
       renameBehaviorEventsFunction(*eventsFunction);
     }
   }
 
   // Behavior instructions
   for (auto&& eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
       renameBehaviorEventsFunction(*eventsFunction);
     }
   }
 
   // Behavior properties
-  for (auto&& property : eventsBasedBehavior.GetPropertyDescriptors().GetInternalVector()) {
+  auto& properties = eventsBasedBehavior.GetPropertyDescriptors();
+  for (auto&& property : properties.GetInternalVector()) {
     renameBehaviorProperty(*property);
   }
-  for (auto&& property : eventsBasedBehavior.GetSharedPropertyDescriptors().GetInternalVector()) {
-    renameBehaviorSharedProperty(*property);
-  }
 
   DoRenameBehavior(
       project,
-      gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), oldBehaviorName),
-      gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName));
+      GetBehaviorFullType(eventsFunctionsExtension.GetName(), oldBehaviorName),
+      GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName));
 }
 
 void WholeProjectRefactorer::RenameEventsBasedObject(
@@ -1321,22 +1197,25 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
        &eventsFunctionsExtension,
        &oldObjectName,
        &newObjectName](const gd::EventsFunction& eventsFunction) {
-        if (eventsFunction.IsExpression()) {
-          // Nothing to do, expressions are not including the name of the
-          // object
-        }
-        if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
+        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
           gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
               project,
-              gd::PlatformExtension::GetObjectEventsFunctionFullType(
+              GetObjectEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   oldObjectName,
                   eventsFunction.GetName()),
-              gd::PlatformExtension::GetObjectEventsFunctionFullType(
+              GetObjectEventsFunctionFullType(
                   eventsFunctionsExtension.GetName(),
                   newObjectName,
                   eventsFunction.GetName()));
           ExposeProjectEvents(project, renamer);
+        } else if (eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::Expression ||
+                   eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::StringExpression) {
+          // Nothing to do, expressions are not including the name of the
+          // object
         }
       };
 
@@ -1348,11 +1227,11 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
                                         property) {
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
-        gd::PlatformExtension::GetObjectEventsFunctionFullType(
+        GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldObjectName,
             EventsBasedObject::GetPropertyActionName(property.GetName())),
-        gd::PlatformExtension::GetObjectEventsFunctionFullType(
+        GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newObjectName,
             EventsBasedObject::GetPropertyActionName(property.GetName())));
@@ -1360,11 +1239,11 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
-        gd::PlatformExtension::GetObjectEventsFunctionFullType(
+        GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             oldObjectName,
             EventsBasedObject::GetPropertyConditionName(property.GetName())),
-        gd::PlatformExtension::GetObjectEventsFunctionFullType(
+        GetObjectEventsFunctionFullType(
             eventsFunctionsExtension.GetName(),
             newObjectName,
             EventsBasedObject::GetPropertyConditionName(property.GetName())));
@@ -1381,14 +1260,17 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
 
   // Object expressions
   for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->IsExpression()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
+        eventsFunction->GetFunctionType() ==
+            gd::EventsFunction::StringExpression) {
       renameObjectEventsFunction(*eventsFunction);
     }
   }
 
   // Object instructions
   for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-    if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
       renameObjectEventsFunction(*eventsFunction);
     }
   }
@@ -1401,8 +1283,8 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
 
   DoRenameObject(
       project,
-      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), oldObjectName),
-      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName));
+      GetObjectFullType(eventsFunctionsExtension.GetName(), oldObjectName),
+      GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName));
 }
 
 void WholeProjectRefactorer::DoRenameEventsFunction(
@@ -1410,20 +1292,20 @@ void WholeProjectRefactorer::DoRenameEventsFunction(
     const gd::EventsFunction& eventsFunction,
     const gd::String& oldFullType,
     const gd::String& newFullType) {
-  // Order is important: we first rename the expressions then the instructions,
-  // to avoid being unable to fetch the metadata (the types of parameters) of
-  // instructions after they are renamed.
-  if (eventsFunction.IsExpression()) {
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsTypeRenamer renamer =
+        gd::InstructionsTypeRenamer(project, oldFullType, newFullType);
+    ExposeProjectEvents(project, renamer);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedFreeExpression(oldFullType, newFullType);
     ExposeProjectEvents(project, renamer);
   }
-  if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
-    gd::InstructionsTypeRenamer renamer =
-        gd::InstructionsTypeRenamer(project, oldFullType, newFullType);
-    ExposeProjectEvents(project, renamer);
-  }
 }
 
 void WholeProjectRefactorer::DoRenameBehavior(
@@ -1746,18 +1628,19 @@ void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction(
 
 void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
     gd::Project& project,
-    gd::ObjectsContainer& globalObjectsContainer,
     gd::EventsBasedObject& eventsBasedObject,
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::ObjectsContainer& objectsContainer,
     const gd::String& oldName,
     const gd::String& newName,
     bool isObjectGroup) {
   for (auto &functionUniquePtr : eventsBasedObject.GetEventsFunctions().GetInternalVector()) {
-    auto *function = functionUniquePtr.get();
+    auto function = functionUniquePtr.get();
     WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
         project,
         *function,
         globalObjectsContainer,
-        eventsBasedObject,
+        objectsContainer,
         oldName,
         newName,
         isObjectGroup);

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -207,21 +207,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldPropertyName,
       const gd::String& newPropertyName);
 
-  /**
-   * \brief Refactor the project **before** a shared property of a behavior is
-   * renamed.
-   *
-   * \warning Do the renaming of the specified shared property after calling
-   * this. This is because the shared property is expected to have its old name
-   * for the refactoring.
-   */
-  static void RenameEventsBasedBehaviorSharedProperty(
-      gd::Project& project,
-      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
-      const gd::EventsBasedBehavior& eventsBasedBehavior,
-      const gd::String& oldPropertyName,
-      const gd::String& newPropertyName);
-
   /**
    * \brief Refactor the project **before** a property of an object is
    * renamed.
@@ -348,8 +333,9 @@ class GD_CORE_API WholeProjectRefactorer {
    */
   static void ObjectOrGroupRenamedInEventsBasedObject(
       gd::Project& project,
-      gd::ObjectsContainer& globalObjectsContainer,
       gd::EventsBasedObject& eventsBasedObject,
+      gd::ObjectsContainer& globalObjectsContainer,
+      gd::ObjectsContainer& objectsContainer,
       const gd::String& oldName,
       const gd::String& newName,
       bool isObjectGroup);

Core/GDCore/Project/AbstractEventsBasedEntity.cpp

@@ -10,10 +10,8 @@
 
 namespace gd {
 
-AbstractEventsBasedEntity::AbstractEventsBasedEntity(
-    const gd::String& _name,
-    gd::EventsFunctionsContainer::FunctionOwner functionContainerSource)
-    : name(_name), fullName(""), eventsFunctionsContainer(functionContainerSource) {}
+AbstractEventsBasedEntity::AbstractEventsBasedEntity(const gd::String& _name)
+    : name(_name), fullName("") {}
 
 void AbstractEventsBasedEntity::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("description", description);

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -29,9 +29,7 @@ namespace gd {
  */
 class GD_CORE_API AbstractEventsBasedEntity {
  public:
-  AbstractEventsBasedEntity(
-      const gd::String& _name,
-      gd::EventsFunctionsContainer::FunctionOwner functionContainerSource);
+  AbstractEventsBasedEntity(const gd::String& _name);
   virtual ~AbstractEventsBasedEntity(){};
 
   /**

Core/GDCore/Project/Behavior.h

@@ -13,8 +13,7 @@ namespace gd {
 
 /**
  * \brief Base class used to represents a behavior that can be applied to an
- * object. It stores the content (i.e: the properties) of a behavior of an object
- * and forward the properties related functions to Javascript with Emscripten.
+ * object. It stores the content (i.e: the properties) of a behavior of an object.
  *
  * \see gd::BehaviorsSharedData
  * \see gd::Object

Core/GDCore/Project/CustomBehavior.cpp

@@ -1,8 +1,3 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
 #include "CustomBehavior.h"
 
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
@@ -11,7 +6,6 @@
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Project/CustomConfigurationHelper.h"
 
 #include <map>
 
@@ -22,26 +16,52 @@ CustomBehavior *CustomBehavior::Clone() const {
   return clone;
 }
 
-void CustomBehavior::InitializeContent(gd::SerializerElement &behaviorContent) {
-  if (!project.HasEventsBasedBehavior(GetTypeName())) {
-    return;
-  }
-  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
-  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
-
-  gd::CustomConfigurationHelper::InitializeContent(properties, behaviorContent);
-}
-
 std::map<gd::String, gd::PropertyDescriptor> CustomBehavior::GetProperties(
     const gd::SerializerElement &behaviorContent) const {
+  auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
   if (!project.HasEventsBasedBehavior(GetTypeName())) {
-    auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
     return behaviorProperties;
   }
   const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
   const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
 
-  return gd::CustomConfigurationHelper::GetProperties(properties, behaviorContent);
+  for (auto &property : properties.GetInternalVector()) {
+    const auto &propertyName = property->GetName();
+    const auto &propertyType = property->GetType();
+
+    // TODO Move this into a PropertyDescriptor copy method.
+    auto &newProperty = behaviorProperties[propertyName]
+                            .SetType(property->GetType())
+                            .SetDescription(property->GetDescription())
+                            .SetGroup(property->GetGroup())
+                            .SetLabel(property->GetLabel())
+                            .SetValue(property->GetValue())
+                            .SetHidden(property->IsHidden());
+
+    for (auto &extraInfo : property->GetExtraInfo()) {
+      newProperty.AddExtraInfo(extraInfo);
+    }
+
+    if (behaviorContent.HasChild(propertyName)) {
+      if (propertyType == "String" || propertyType == "Choice" ||
+          propertyType == "Color" || propertyType == "Behavior") {
+        newProperty.SetValue(
+            behaviorContent.GetChild(propertyName).GetStringValue());
+      } else if (propertyType == "Number") {
+        newProperty.SetValue(gd::String::From(
+            behaviorContent.GetChild(propertyName).GetDoubleValue()));
+      } else if (propertyType == "Boolean") {
+        newProperty.SetValue(
+            behaviorContent.GetChild(propertyName).GetBoolValue() ? "true"
+                                                                  : "false");
+      }
+    } else {
+      // No value was serialized for this property. `newProperty`
+      // will have the default value coming from `enumeratedProperty`.
+    }
+  }
+
+  return behaviorProperties;
 }
 
 bool CustomBehavior::UpdateProperty(gd::SerializerElement &behaviorContent,
@@ -52,10 +72,43 @@ bool CustomBehavior::UpdateProperty(gd::SerializerElement &behaviorContent,
   }
   const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
   const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
+  if (!properties.Has(propertyName)) {
+    return false;
+  }
+  const auto &property = properties.Get(propertyName);
 
-  return gd::CustomConfigurationHelper::UpdateProperty(
-      properties,
-      behaviorContent,
-      propertyName,
-      newValue);
+  auto &element = behaviorContent.AddChild(propertyName);
+  const gd::String &propertyType = property.GetType();
+
+  if (propertyType == "String" || propertyType == "Choice" ||
+      propertyType == "Color" || propertyType == "Behavior") {
+    element.SetStringValue(newValue);
+  } else if (propertyType == "Number") {
+    element.SetDoubleValue(newValue.To<double>());
+  } else if (propertyType == "Boolean") {
+    element.SetBoolValue(newValue == "1");
+  }
+
+  return true;
+}
+
+void CustomBehavior::InitializeContent(gd::SerializerElement &behaviorContent) {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
+  for (auto &&property : properties.GetInternalVector()) {
+    auto element = behaviorContent.AddChild(property->GetName());
+    auto propertyType = property->GetType();
+
+    if (propertyType == "String" || propertyType == "Choice" ||
+        propertyType == "Color" || propertyType == "Behavior") {
+      element.SetStringValue(property->GetValue());
+    } else if (propertyType == "Number") {
+      element.SetDoubleValue(property->GetValue().To<double>());
+    } else if (propertyType == "Boolean") {
+      element.SetBoolValue(property->GetValue() == "true");
+    }
+  }
 }

Core/GDCore/Project/CustomBehavior.h

@@ -1,11 +1,3 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_CUSTOMBEHAVIOR_H
-#define GDCORE_CUSTOMBEHAVIOR_H
-
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/Project.h"
@@ -15,9 +7,9 @@
 
 using namespace gd;
 
-namespace gd {
 /**
- * \brief A gd::Behavior that stores its content in JSON.
+ * \brief A gd::Behavior that stores its content in JSON and forward the
+ * properties related functions to Javascript with Emscripten.
  */
 class CustomBehavior : public gd::Behavior {
 public:
@@ -33,16 +25,15 @@ public:
   using Behavior::UpdateProperty;
 
 protected:
-  std::map<gd::String, gd::PropertyDescriptor>
+  virtual std::map<gd::String, gd::PropertyDescriptor>
   GetProperties(const gd::SerializerElement &behaviorContent) const override;
-  bool UpdateProperty(gd::SerializerElement &behaviorContent,
-                      const gd::String &name, const gd::String &value) override;
-  void InitializeContent(gd::SerializerElement &behaviorContent) override;
+  virtual bool UpdateProperty(gd::SerializerElement &behaviorContent,
+                              const gd::String &name,
+                              const gd::String &value) override;
+  virtual void
+  InitializeContent(gd::SerializerElement &behaviorContent) override;
 
 private:
   const Project &project; ///< The project is used to get the
                           ///< EventBasedBehavior from the fullType.
 };
-}  // namespace gd
-
-#endif  // GDCORE_CUSTOMBEHAVIOR_H

Core/GDCore/Project/CustomBehaviorsSharedData.cpp

@@ -1,61 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "CustomBehaviorsSharedData.h"
-
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Project/CustomConfigurationHelper.h"
-
-#include <map>
-
-using namespace gd;
-
-CustomBehaviorsSharedData *CustomBehaviorsSharedData::Clone() const {
-  CustomBehaviorsSharedData *clone = new CustomBehaviorsSharedData(*this);
-  return clone;
-}
-
-void CustomBehaviorsSharedData::InitializeContent(gd::SerializerElement &behaviorContent) {
-  if (!project.HasEventsBasedBehavior(GetTypeName())) {
-    return;
-  }
-  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
-  const auto &properties = eventsBasedBehavior.GetSharedPropertyDescriptors();
-
-  gd::CustomConfigurationHelper::InitializeContent(properties, behaviorContent);
-}
-
-std::map<gd::String, gd::PropertyDescriptor> CustomBehaviorsSharedData::GetProperties(
-    const gd::SerializerElement &behaviorContent) const {
-  if (!project.HasEventsBasedBehavior(GetTypeName())) {
-    auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
-    return behaviorProperties;
-  }
-  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
-  const auto &properties = eventsBasedBehavior.GetSharedPropertyDescriptors();
-
-  return gd::CustomConfigurationHelper::GetProperties(properties, behaviorContent);
-}
-
-bool CustomBehaviorsSharedData::UpdateProperty(gd::SerializerElement &behaviorContent,
-                                    const gd::String &propertyName,
-                                    const gd::String &newValue) {
-  if (!project.HasEventsBasedBehavior(GetTypeName())) {
-    return false;
-  }
-  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
-  const auto &properties = eventsBasedBehavior.GetSharedPropertyDescriptors();
-
-  return gd::CustomConfigurationHelper::UpdateProperty(
-      properties,
-      behaviorContent,
-      propertyName,
-      newValue);
-}

Core/GDCore/Project/CustomBehaviorsSharedData.h

@@ -1,46 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_CUSTOMBEHAVIORSSHAREDDATA_H
-#define GDCORE_CUSTOMBEHAVIORSSHAREDDATA_H
-
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/EventsBasedBehavior.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-using namespace gd;
-
-namespace gd {
-/**
- * \brief A gd::BehaviorsSharedData that stores its content in JSON.
- */
-class CustomBehaviorsSharedData : public gd::BehaviorsSharedData {
-public:
-  CustomBehaviorsSharedData(const gd::String &name, const Project &project_,
-                            const gd::String &fullType)
-      : BehaviorsSharedData(name, fullType), project(project_) {}
-  CustomBehaviorsSharedData *Clone() const override;
-
-  using BehaviorsSharedData::GetProperties;
-  using BehaviorsSharedData::InitializeContent;
-  using BehaviorsSharedData::UpdateProperty;
-
-protected:
-  std::map<gd::String, gd::PropertyDescriptor>
-  GetProperties(const gd::SerializerElement &behaviorContent) const override;
-  bool UpdateProperty(gd::SerializerElement &behaviorContent,
-                      const gd::String &name, const gd::String &value) override;
-  void InitializeContent(gd::SerializerElement &behaviorContent) override;
-
-private:
-  const Project &project; ///< The project is used to get the
-                          ///< EventBasedBehavior from the fullType.
-};
-} // namespace gd
-
-#endif // GDCORE_CUSTOMBEHAVIORSSHAREDDATA_H

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -1,104 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "CustomConfigurationHelper.h"
-
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-#include <map>
-
-using namespace gd;
-
-void CustomConfigurationHelper::InitializeContent(
-    const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
-    gd::SerializerElement &configurationContent) {
-  for (auto &&property : properties.GetInternalVector()) {
-    auto &element = configurationContent.AddChild(property->GetName());
-    auto propertyType = property->GetType();
-
-    if (propertyType == "String" || propertyType == "Choice" ||
-        propertyType == "Color" || propertyType == "Behavior") {
-      element.SetStringValue(property->GetValue());
-    } else if (propertyType == "Number") {
-      element.SetDoubleValue(property->GetValue().To<double>());
-    } else if (propertyType == "Boolean") {
-      element.SetBoolValue(property->GetValue() == "true");
-    }
-  }
-}
-
-std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetProperties(
-    const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
-    const gd::SerializerElement &configurationContent) {
-  auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
-
-  for (auto &property : properties.GetInternalVector()) {
-    const auto &propertyName = property->GetName();
-    const auto &propertyType = property->GetType();
-
-    // TODO Move this into a PropertyDescriptor copy method.
-    auto &newProperty = behaviorProperties[propertyName]
-                            .SetType(property->GetType())
-                            .SetDescription(property->GetDescription())
-                            .SetGroup(property->GetGroup())
-                            .SetLabel(property->GetLabel())
-                            .SetValue(property->GetValue())
-                            .SetHidden(property->IsHidden());
-
-    for (auto &extraInfo : property->GetExtraInfo()) {
-      newProperty.AddExtraInfo(extraInfo);
-    }
-
-    if (configurationContent.HasChild(propertyName)) {
-      if (propertyType == "String" || propertyType == "Choice" ||
-          propertyType == "Color" || propertyType == "Behavior") {
-        newProperty.SetValue(
-            configurationContent.GetChild(propertyName).GetStringValue());
-      } else if (propertyType == "Number") {
-        newProperty.SetValue(gd::String::From(
-            configurationContent.GetChild(propertyName).GetDoubleValue()));
-      } else if (propertyType == "Boolean") {
-        newProperty.SetValue(
-            configurationContent.GetChild(propertyName).GetBoolValue() ? "true"
-                                                                  : "false");
-      }
-    } else {
-      // No value was serialized for this property. `newProperty`
-      // will have the default value coming from `enumeratedProperty`.
-    }
-  }
-
-  return behaviorProperties;
-}
-
-bool CustomConfigurationHelper::UpdateProperty(
-    const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
-    gd::SerializerElement &configurationContent,
-    const gd::String &propertyName,
-    const gd::String &newValue) {
-  if (!properties.Has(propertyName)) {
-    return false;
-  }
-  const auto &property = properties.Get(propertyName);
-
-  auto &element = configurationContent.AddChild(propertyName);
-  const gd::String &propertyType = property.GetType();
-
-  if (propertyType == "String" || propertyType == "Choice" ||
-      propertyType == "Color" || propertyType == "Behavior") {
-    element.SetStringValue(newValue);
-  } else if (propertyType == "Number") {
-    element.SetDoubleValue(newValue.To<double>());
-  } else if (propertyType == "Boolean") {
-    element.SetBoolValue(newValue == "1");
-  }
-
-  return true;
-}

Core/GDCore/Project/CustomConfigurationHelper.h

@@ -1,43 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_CUSTOMCONFIGURATIONHELPER_H
-#define GDCORE_CUSTOMCONFIGURATIONHELPER_H
-
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/EventsBasedBehavior.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-using namespace gd;
-
-namespace gd {
-/**
- * \brief Helper functions that gd::CustomBehavior and gd::CustomBehaviorsSharedData use to
- * store their content in JSON.
- */
-class CustomConfigurationHelper {
-public:
-  CustomConfigurationHelper() {}
-
-  static void InitializeContent(
-      const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
-      gd::SerializerElement &behaviorContent);
-
-  static std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
-      const gd::SerializerElement &behaviorContent);
-
-  static bool UpdateProperty(
-      const gd::SerializableWithNameList<gd::NamedPropertyDescriptor> &properties,
-      gd::SerializerElement &behaviorContent,
-      const gd::String &name,
-      const gd::String &value);
-};
-}  // namespace gd
-
-#endif  // GDCORE_CUSTOMCONFIGURATIONHELPER_H

Core/GDCore/Project/CustomObject.cpp

@@ -0,0 +1,165 @@
+#include "CustomObject.h"
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+#include <map>
+
+using namespace gd;
+
+std::unique_ptr<gd::Object> CustomObject::Clone() const {
+  CustomObject* clone = new CustomObject(*this);
+  return std::unique_ptr<gd::Object>(clone);
+}
+
+// TODO EBO Extract a class from Object for the object configuration.
+// This will allow CustomObject to have a ObjectConfiguration composed of
+// ObjectConfiguration for their children in addition to its own properties.
+// This will be used by the GUI to display custom editors (for sprites for
+// instance)
+std::map<gd::String, gd::PropertyDescriptor> CustomObject::GetProperties() const {
+    auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
+    if (!project.HasEventsBasedObject(GetType())) {
+      return objectProperties;
+    }
+    const auto &eventsBasedObject = project.GetEventsBasedObject(GetType());
+    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
+
+    for (auto &property : properties.GetInternalVector()) {
+      const auto &propertyName = property->GetName();
+      const auto &propertyType = property->GetType();
+
+      // TODO Move this into a PropertyDescriptor copy method.
+      auto &newProperty = objectProperties[propertyName]
+            .SetType(property->GetType())
+            .SetDescription(property->GetDescription())
+            .SetGroup(property->GetGroup())
+            .SetLabel(property->GetLabel())
+            .SetValue(property->GetValue())
+            .SetHidden(property->IsHidden());
+      
+      for (auto &extraInfo : property->GetExtraInfo()) {
+        newProperty.AddExtraInfo(extraInfo);
+      }
+
+      if (objectContent.HasChild(propertyName)) {
+        if (
+          propertyType == "String" ||
+          propertyType == "Choice" ||
+          propertyType == "Color"
+        ) {
+          newProperty.SetValue(
+            objectContent.GetChild(propertyName).GetStringValue()
+          );
+        } else if (propertyType == "Number") {
+          newProperty.SetValue(
+            gd::String::From(objectContent.GetChild(propertyName).GetDoubleValue())
+          );
+        } else if (propertyType == "Boolean") {
+          newProperty.SetValue(
+            objectContent.GetChild(propertyName).GetBoolValue()
+              ? "true"
+              : "false"
+          );
+        }
+      } else {
+        // No value was serialized for this property. `newProperty`
+        // will have the default value coming from `enumeratedProperty`.
+      }
+    }
+
+    return objectProperties;
+}
+
+bool CustomObject::UpdateProperty(const gd::String& propertyName,
+                                  const gd::String& newValue) {
+    if (!project.HasEventsBasedObject(GetType())) {
+      return false;
+    }
+    const auto &eventsBasedObject = project.GetEventsBasedObject(GetType());
+    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
+    if (!properties.Has(propertyName)) {
+      return false;
+    }
+    const auto &property = properties.Get(propertyName);
+
+    auto &element = objectContent.AddChild(propertyName);
+    const gd::String &propertyType = property.GetType();
+
+    if (
+      propertyType == "String" ||
+      propertyType == "Choice" ||
+      propertyType == "Color"
+    ) {
+      element.SetStringValue(newValue);
+    } else if (propertyType == "Number") {
+      element.SetDoubleValue(newValue.To<double>());
+    } else if (propertyType == "Boolean") {
+      element.SetBoolValue(newValue == "1");
+    }
+
+    return true;
+}
+
+std::map<gd::String, gd::PropertyDescriptor>
+CustomObject::GetInitialInstanceProperties(
+    const gd::InitialInstance& instance,
+    gd::Project& project,
+    gd::Layout& scene) {
+  return std::map<gd::String, gd::PropertyDescriptor>();
+}
+
+bool CustomObject::UpdateInitialInstanceProperty(
+    gd::InitialInstance& instance,
+    const gd::String& name,
+    const gd::String& value,
+    gd::Project& project,
+    gd::Layout& scene) {
+  return false;
+}
+
+void CustomObject::DoSerializeTo(SerializerElement& arg0) const {
+  arg0.AddChild("content") = objectContent;
+}
+void CustomObject::DoUnserializeFrom(Project& arg0,
+                                               const SerializerElement& arg1) {
+  objectContent = arg1.GetChild("content");
+}
+
+void CustomObject::ExposeResources(
+    gd::ArbitraryResourceWorker& worker) {
+  std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
+
+  for (auto& property : properties) {
+    const String& propertyName = property.first;
+    const gd::PropertyDescriptor& propertyDescriptor = property.second;
+    if (propertyDescriptor.GetType() == "resource") {
+      auto& extraInfo = propertyDescriptor.GetExtraInfo();
+      const gd::String& resourceType = extraInfo.empty() ? "" : extraInfo[0];
+      const gd::String& oldPropertyValue = propertyDescriptor.GetValue();
+
+      gd::String newPropertyValue = oldPropertyValue;
+      if (resourceType == "image") {
+        worker.ExposeImage(newPropertyValue);
+      } else if (resourceType == "audio") {
+        worker.ExposeAudio(newPropertyValue);
+      } else if (resourceType == "font") {
+        worker.ExposeFont(newPropertyValue);
+      } else if (resourceType == "video") {
+        worker.ExposeVideo(newPropertyValue);
+      } else if (resourceType == "json") {
+        worker.ExposeJson(newPropertyValue);
+      } else if (resourceType == "bitmapFont") {
+        worker.ExposeBitmapFont(newPropertyValue);
+      }
+
+      if (newPropertyValue != oldPropertyValue) {
+        UpdateProperty(propertyName, newPropertyValue);
+      }
+    }
+  }
+}

Core/GDCore/Project/CustomObject.h

@@ -0,0 +1,49 @@
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace gd;
+
+/**
+ * \brief A gd::Object that stores its content in JSON and forward the
+ * properties related functions to Javascript with Emscripten.
+ *
+ * It also implements "ExposeResources" to expose the properties of type
+ * "resource".
+ */
+class CustomObject : public gd::Object {
+ public:
+  CustomObject(const gd::String &name, const Project& project_, const gd::String &fullType)
+      : Object(name),
+        project(project_) {
+    SetType(fullType);
+  }
+  std::unique_ptr<gd::Object> Clone() const override;
+
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+
+  std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
+      const gd::InitialInstance& instance,
+      gd::Project& project,
+      gd::Layout& scene) override;
+  bool UpdateInitialInstanceProperty(gd::InitialInstance& instance,
+                                     const gd::String& name,
+                                     const gd::String& value,
+                                     gd::Project& project,
+                                     gd::Layout& scene) override;
+
+  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
+
+ protected:
+  void DoSerializeTo(SerializerElement& element) const override;
+  void DoUnserializeFrom(Project& project, const SerializerElement& element) override;
+
+  private:
+    const Project& project; ///< The project is used to get the
+                            ///< EventBasedObject from the fullType.
+    gd::SerializerElement objectContent;
+};

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -1,171 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "CustomObjectConfiguration.h"
-
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Log.h"
-#include "GDCore/Project/CustomConfigurationHelper.h"
-
-using namespace gd;
-
-void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
-  project = objectConfiguration.project;
-  objectContent = objectConfiguration.objectContent;
-
-  // There is no default copy for a map of unique_ptr like childObjectConfigurations.
-  childObjectConfigurations.clear();
-  for (auto& it : objectConfiguration.childObjectConfigurations) {
-    childObjectConfigurations[it.first] = it.second->Clone();
-  }
-}
-
-gd::ObjectConfiguration CustomObjectConfiguration::badObjectConfiguration;
-
-std::unique_ptr<gd::ObjectConfiguration> CustomObjectConfiguration::Clone() const {
-  return gd::make_unique<gd::CustomObjectConfiguration>(*this);
-}
-
-gd::ObjectConfiguration &CustomObjectConfiguration::GetChildObjectConfiguration(const gd::String &objectName) {
-  if (!project->HasEventsBasedObject(GetType())) {
-    return badObjectConfiguration;
-  }
-  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-  
-  if (!eventsBasedObject.HasObjectNamed(objectName)) {
-    gd::LogError("Tried to get the configuration of a child-object:" + objectName
-                + " that doesn't exist in the event-based object: " + GetType());
-    return badObjectConfiguration;
-  }
-
-  auto &childObject = eventsBasedObject.GetObject(objectName);
-  auto configurationPosition = childObjectConfigurations.find(objectName);
-  if (configurationPosition == childObjectConfigurations.end()) {
-    childObjectConfigurations.insert(std::make_pair(
-        objectName,
-        childObject.GetConfiguration().Clone()));
-    return *(childObjectConfigurations[objectName]);
-  }
-  else {
-    auto &pair = *configurationPosition;
-    auto &configuration = pair.second;
-    return *configuration;
-  }
- }
-
-std::map<gd::String, gd::PropertyDescriptor> CustomObjectConfiguration::GetProperties() const {
-    auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
-    if (!project->HasEventsBasedObject(GetType())) {
-      return objectProperties;
-    }
-    const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-
-    return gd::CustomConfigurationHelper::GetProperties(properties, objectContent);
-}
-
-bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
-                                  const gd::String& newValue) {
-    if (!project->HasEventsBasedObject(GetType())) {
-      return false;
-    }
-    const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-    
-    return gd::CustomConfigurationHelper::UpdateProperty(
-        properties,
-        objectContent,
-        propertyName,
-        newValue);
-}
-
-std::map<gd::String, gd::PropertyDescriptor>
-CustomObjectConfiguration::GetInitialInstanceProperties(
-    const gd::InitialInstance& instance,
-    gd::Project& project,
-    gd::Layout& scene) {
-  return std::map<gd::String, gd::PropertyDescriptor>();
-}
-
-bool CustomObjectConfiguration::UpdateInitialInstanceProperty(
-    gd::InitialInstance& instance,
-    const gd::String& name,
-    const gd::String& value,
-    gd::Project& project,
-    gd::Layout& scene) {
-  return false;
-}
-
-void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const {
-  element.AddChild("content") = objectContent;
-  auto &childrenContentElement = element.AddChild("childrenContent");
-  for (auto &pair : childObjectConfigurations) {
-    auto &childName = pair.first;
-    auto &childConfiguration = pair.second;
-    auto &childElement = childrenContentElement.AddChild(childName);
-    childConfiguration->SerializeTo(childElement);
-  }
-}
-void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
-                                               const SerializerElement& element) {
-  objectContent = element.GetChild("content");
-  auto &childrenContentElement = element.GetChild("childrenContent");
-  for (auto &pair : childrenContentElement.GetAllChildren()) {
-    auto &childName = pair.first;
-    auto &childElement = pair.second;
-    auto &childConfiguration = GetChildObjectConfiguration(childName);
-    childConfiguration.UnserializeFrom(project, *childElement);
-  }
-}
-
-void CustomObjectConfiguration::ExposeResources(
-    gd::ArbitraryResourceWorker& worker) {
-  std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
-
-  for (auto& property : properties) {
-    const String& propertyName = property.first;
-    const gd::PropertyDescriptor& propertyDescriptor = property.second;
-    if (propertyDescriptor.GetType() == "resource") {
-      auto& extraInfo = propertyDescriptor.GetExtraInfo();
-      const gd::String& resourceType = extraInfo.empty() ? "" : extraInfo[0];
-      const gd::String& oldPropertyValue = propertyDescriptor.GetValue();
-
-      gd::String newPropertyValue = oldPropertyValue;
-      if (resourceType == "image") {
-        worker.ExposeImage(newPropertyValue);
-      } else if (resourceType == "audio") {
-        worker.ExposeAudio(newPropertyValue);
-      } else if (resourceType == "font") {
-        worker.ExposeFont(newPropertyValue);
-      } else if (resourceType == "video") {
-        worker.ExposeVideo(newPropertyValue);
-      } else if (resourceType == "json") {
-        worker.ExposeJson(newPropertyValue);
-      } else if (resourceType == "bitmapFont") {
-        worker.ExposeBitmapFont(newPropertyValue);
-      }
-
-      if (newPropertyValue != oldPropertyValue) {
-        UpdateProperty(propertyName, newPropertyValue);
-      }
-    }
-  }
-
-  auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
-  if (!project->HasEventsBasedObject(GetType())) {
-    return;
-  }
-  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-
-  for (auto& childObject : eventsBasedObject.GetObjects()) {
-    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-    configuration.ExposeResources(worker);
-  }
-}

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -1,100 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_CUSTOMOBJECTCONFIGURATION_H
-#define GDCORE_CUSTOMOBJECTCONFIGURATION_H
-
-#include "GDCore/Project/ObjectConfiguration.h"
-
-#include <map>
-#include <memory>
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-
-using namespace gd;
-
-namespace gd {
-/**
- * \brief A gd::ObjectConfiguration that stores its content in JSON and is
- * composed of other configuration according to it's object children.
- *
- * It also implements "ExposeResources" to expose the properties of type
- * "resource".
- */
-class CustomObjectConfiguration : public gd::ObjectConfiguration {
- public:
-  CustomObjectConfiguration(const Project& project_, const String& type_)
-      : project(&project_) {
-    SetType(type_);
-  }
-  std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
-
-  /**
-   * Copy constructor. Calls Init().
-   */
-  CustomObjectConfiguration(const gd::CustomObjectConfiguration& object)
-      : ObjectConfiguration(object) {
-    Init(object);
-  };
-
-  /**
-   * Assignment operator. Calls Init().
-   */
-  CustomObjectConfiguration& operator=(const gd::CustomObjectConfiguration& object){
-    if ((this) != &object) {
-        ObjectConfiguration::operator=(object);
-        Init(object);
-    }
-    return *this;
-  }
-
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
-
-  std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
-      const gd::InitialInstance& instance,
-      gd::Project& project,
-      gd::Layout& scene) override;
-  bool UpdateInitialInstanceProperty(gd::InitialInstance& instance,
-                                     const gd::String& name,
-                                     const gd::String& value,
-                                     gd::Project& project,
-                                     gd::Layout& scene) override;
-
-  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
-
-  gd::ObjectConfiguration &GetChildObjectConfiguration(const gd::String& objectName);
-
- protected:
-  void DoSerializeTo(SerializerElement& element) const override;
-  void DoUnserializeFrom(Project& project, const SerializerElement& element) override;
-
- private:
-  const Project* project; ///< The project is used to get the
-                          ///< EventBasedObject from the fullType.
-  gd::SerializerElement objectContent;
-  std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;
-
-  static gd::ObjectConfiguration badObjectConfiguration;
-
-  /**
-   * Initialize configuration using another configuration. 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 childObjectConfigurations
-   * and it must be a deep copy.
-   */
-  void Init(const gd::CustomObjectConfiguration& object);
-};
-}  // namespace gd
-
-#endif  // GDCORE_CUSTOMOBJECTCONFIGURATION_H

Core/GDCore/Project/EffectsContainer.h

@@ -110,11 +110,6 @@ class GD_CORE_API EffectsContainer {
    */
   void UnserializeFrom(const SerializerElement& element);
 
-  /**
-   * \brief Clear all effects of the container.
-   */
-  inline void Clear() { effects.clear(); }
-
  private:
   std::vector<std::shared_ptr<gd::Effect>> effects;
   static Effect badEffect;

Core/GDCore/Project/EventsBasedBehavior.cpp

@@ -11,27 +11,17 @@
 namespace gd {
 
 EventsBasedBehavior::EventsBasedBehavior()
-    : AbstractEventsBasedEntity(
-        "MyBehavior",
-        gd::EventsFunctionsContainer::FunctionOwner::Behavior) {}
+    : AbstractEventsBasedEntity("MyBehavior") {}
 
 void EventsBasedBehavior::SerializeTo(SerializerElement& element) const {
   AbstractEventsBasedEntity::SerializeTo(element);
   element.SetAttribute("objectType", objectType);
-  if (isPrivate) {
-    element.SetBoolAttribute("private", isPrivate);
-  }
-  sharedPropertyDescriptors.SerializeElementsTo(
-      "propertyDescriptor", element.AddChild("sharedPropertyDescriptors"));
 }
 
 void EventsBasedBehavior::UnserializeFrom(gd::Project& project,
                                           const SerializerElement& element) {
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   objectType = element.GetStringAttribute("objectType");
-  isPrivate = element.GetBoolAttribute("private");
-  sharedPropertyDescriptors.UnserializeElementsFrom(
-      "propertyDescriptor", element.GetChild("sharedPropertyDescriptors"));
 }
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedBehavior.h

@@ -73,58 +73,6 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
     return *this;
   }
 
-  /**
-   * \brief Check if the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  bool IsPrivate() { return isPrivate; }
-
-  /**
-   * \brief Set that the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  EventsBasedBehavior& SetPrivate(bool _isPrivate) {
-    isPrivate = _isPrivate;
-    return *this;
-  }
-
-  /**
-   * \brief Return a reference to the list of shared properties.
-   */
-  SerializableWithNameList<NamedPropertyDescriptor>& GetSharedPropertyDescriptors() {
-    return sharedPropertyDescriptors;
-  }
-
-  /**
-   * \brief Return a const reference to the list of shared properties.
-   */
-  const SerializableWithNameList<NamedPropertyDescriptor>& GetSharedPropertyDescriptors()
-      const {
-    return sharedPropertyDescriptors;
-  }
-
-  /**
-   * \brief Get the name of the action to change a shared property.
-   */
-  static gd::String GetSharedPropertyActionName(const gd::String &propertyName) {
-    return "SetSharedProperty" + propertyName;
-  };
-
-  /**
-   * \brief Get the name of the condition to compare a shared property.
-   */
-  static gd::String GetSharedPropertyConditionName(const gd::String &propertyName) {
-    return "SharedProperty" + propertyName;
-  };
-
-  /**
-   * \brief Get the name of the expression to get a shared property.
-   */
-  static gd::String
-  GetSharedPropertyExpressionName(const gd::String &propertyName) {
-    return "SharedProperty" + propertyName;
-  };
-
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,
@@ -132,8 +80,6 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
 
  private:
   gd::String objectType;
-  bool isPrivate = false;
-  SerializableWithNameList<NamedPropertyDescriptor> sharedPropertyDescriptors;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObject.cpp

@@ -10,10 +10,7 @@
 namespace gd {
 
 EventsBasedObject::EventsBasedObject()
-    : AbstractEventsBasedEntity(
-        "MyObject",
-        gd::EventsFunctionsContainer::FunctionOwner::Object),
-    ObjectsContainer() {
+    : AbstractEventsBasedEntity("MyObject"), ObjectsContainer() {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
@@ -26,16 +23,12 @@ EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObj
 }
 
 void EventsBasedObject::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("defaultName", defaultName);
-
   AbstractEventsBasedEntity::SerializeTo(element);
   SerializeObjectsTo(element.AddChild("objects"));
 }
 
 void EventsBasedObject::UnserializeFrom(gd::Project& project,
                                           const SerializerElement& element) {
-  defaultName = element.GetStringAttribute("defaultName");
-
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   UnserializeObjectsFrom(project, element.GetChild("objects"));
 }

Core/GDCore/Project/EventsBasedObject.h

@@ -16,7 +16,7 @@ class Project;
 }  // namespace gd
 
 namespace gd {
-// TODO EBO Add a way to mark some parts of children configuration as readonly.
+
 /**
  * \brief Represents an object that is implemented with events.
  *
@@ -38,19 +38,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
    */
   EventsBasedObject* Clone() const { return new EventsBasedObject(*this); };
 
-  /**
-   * \brief Get the default name for created objects.
-   */
-  const gd::String& GetDefaultName() const { return defaultName; };
-
-  /**
-   * \brief Set the default name for created objects.
-   */
-  EventsBasedObject& SetDefaultName(const gd::String& defaultName_) {
-    defaultName = defaultName_;
-    return *this;
-  }
-
   EventsBasedObject& SetDescription(const gd::String& description_) override {
     AbstractEventsBasedEntity::SetDescription(description_);
     return *this;
@@ -78,7 +65,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
                        const SerializerElement& element) override;
 
  private:
-  gd::String defaultName;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsFunction.cpp

@@ -7,96 +7,29 @@
 #include "EventsFunction.h"
 #include <vector>
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Project/EventsFunctionsContainer.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
 
 namespace gd {
 
-EventsFunction::EventsFunction() : functionType(Action) {
-  expressionType.SetName("expression");
-}
-
-const std::vector<gd::ParameterMetadata>& EventsFunction::GetParametersForEvents(
-    const gd::EventsFunctionsContainer& functionsContainer) const {
-  if (functionType != FunctionType::ActionWithOperator) {
-    // For most function types, the parameters are specified in the function.
-    return parameters;
-  }
-  // For ActionWithOperator, the parameters are auto generated.
-  actionWithOperationParameters.clear();
-  if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
-    return actionWithOperationParameters;
-  }
-  const auto& expression = functionsContainer.GetEventsFunction(getterName);
-  const auto& expressionParameters = expression.parameters;
-  const auto functionsSource = functionsContainer.GetOwner();
-  const int expressionValueParameterIndex =
-      functionsSource == gd::EventsFunctionsContainer::FunctionOwner::Behavior ?
-      2 : 
-      functionsSource == gd::EventsFunctionsContainer::FunctionOwner::Object ?
-      1 :
-      0;
-  
-  for (size_t i = 0;
-       i < expressionValueParameterIndex && i < expressionParameters.size();
-       i++)
-  {
-    actionWithOperationParameters.push_back(expressionParameters[i]);
-  }
-  gd::ParameterMetadata parameterMetadata;
-  parameterMetadata.SetName("Value").SetValueTypeMetadata(expression.expressionType);
-  actionWithOperationParameters.push_back(parameterMetadata);
-  for (size_t i = expressionValueParameterIndex;
-       i < expressionParameters.size();
-       i++)
-  {
-    actionWithOperationParameters.push_back(expressionParameters[i]);
-  }
-
-  return actionWithOperationParameters;
-}
+EventsFunction::EventsFunction() : functionType(Action) {}
 
 void EventsFunction::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
-  if (!description.empty()) {
-    element.SetAttribute("description", description);
-  }
+  element.SetAttribute("description", description);
   element.SetAttribute("sentence", sentence);
-  if (!group.empty()) {
-    element.SetAttribute("group", group);
-  }
-  if (!getterName.empty()) {
-    element.SetAttribute("getterName", getterName);
-  }
-  if (isPrivate) {
-    element.SetBoolAttribute("private", isPrivate);
-  }
+  element.SetAttribute("group", group);
+  element.SetBoolAttribute("private", isPrivate);
   events.SerializeTo(element.AddChild("events"));
 
   gd::String functionTypeStr = "Action";
   if (functionType == Condition)
     functionTypeStr = "Condition";
-  else if (functionType == Expression) {
+  else if (functionType == Expression)
     functionTypeStr = "Expression";
-
-    // Compatibility code for version 5.1.147 and older.
-    // There is no longer distinction between number and string in the function
-    // type directly. The expression type is now used for this.
-    if (expressionType.IsString()) {
-      functionTypeStr = "StringExpression";
-    }
-  }
-  else if (functionType == ExpressionAndCondition) {
-    functionTypeStr = "ExpressionAndCondition";
-  }
-  else if (functionType == ActionWithOperator)
-    functionTypeStr = "ActionWithOperator";
+  else if (functionType == StringExpression)
+    functionTypeStr = "StringExpression";
   element.SetAttribute("functionType", functionTypeStr);
 
-  if (this->IsExpression()) {
-    expressionType.SerializeTo(element.AddChild("expressionType"));
-  }
   gd::SerializerElement& parametersElement = element.AddChild("parameters");
   parametersElement.ConsiderAsArrayOf("parameter");
   for (const auto& parameter : parameters) {
@@ -113,32 +46,16 @@ void EventsFunction::UnserializeFrom(gd::Project& project,
   description = element.GetStringAttribute("description");
   sentence = element.GetStringAttribute("sentence");
   group = element.GetStringAttribute("group");
-  getterName = element.GetStringAttribute("getterName");
   isPrivate = element.GetBoolAttribute("private");
   events.UnserializeFrom(project, element.GetChild("events"));
 
   gd::String functionTypeStr = element.GetStringAttribute("functionType");
-
   if (functionTypeStr == "Condition")
     functionType = Condition;
-  else if (functionTypeStr == "Expression" || functionTypeStr == "StringExpression") {
+  else if (functionTypeStr == "Expression")
     functionType = Expression;
-    if (element.HasChild("expressionType")) {
-      expressionType.UnserializeFrom(element.GetChild("expressionType"));
-    }
-    else {
-      // Compatibility code for version 5.1.147 and older.
-      // There is no longer distinction between number and string in the function
-      // type directly. The expression type is now used for this.
-      expressionType.SetName(functionTypeStr == "StringExpression" ? "string" : "expression");
-    }
-  }
-  else if (functionTypeStr == "ExpressionAndCondition") {
-    functionType = ExpressionAndCondition;
-    expressionType.UnserializeFrom(element.GetChild("expressionType"));
-  }
-  else if (functionTypeStr == "ActionWithOperator")
-    functionType = ActionWithOperator;
+  else if (functionTypeStr == "StringExpression")
+    functionType = StringExpression;
   else
     functionType = Action;
 

Core/GDCore/Project/EventsFunction.h

@@ -12,7 +12,6 @@
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
 // TODO: In theory (for separation of concerns between Project and
 // extensions/events), this include should be removed and gd::ParameterMetadata
 // replaced by a new gd::EventsFunctionParameter class.
@@ -20,7 +19,6 @@
 namespace gd {
 class SerializerElement;
 class Project;
-class EventsFunctionsContainer;
 }  // namespace gd
 
 namespace gd {
@@ -117,45 +115,7 @@ class GD_CORE_API EventsFunction {
     return *this;
   }
 
-  /**
-   * \brief Get the name of the ExpressionAndCondition to use as an operand
-   * that is defined in the editor.
-   */
-  const gd::String& GetGetterName() const { return getterName; };
-
-  /**
-   * \brief Set the name of the ExpressionAndCondition to use as an operand
-   * that is defined in the editor.
-   */
-  EventsFunction& SetGetterName(const gd::String& getterName_) {
-    getterName = getterName_;
-    return *this;
-  }
-
-  /**
-   * \brief Set the type of the expression
-   */
-  EventsFunction& SetExpressionType(const gd::ValueTypeMetadata& type) {
-    expressionType = type;
-    return *this;
-  }
-
-  /**
-   * \brief Get the type of the expression
-   */
-  const gd::ValueTypeMetadata& GetExpressionType() const { return expressionType; }
-
-  /**
-   * \brief Get the type of the expression
-   */
-  gd::ValueTypeMetadata& GetExpressionType() { return expressionType; }
-
-  enum FunctionType {
-      Action,
-      Condition,
-      Expression,
-      ExpressionAndCondition,
-      ActionWithOperator };
+  enum FunctionType { Action, Condition, Expression, StringExpression };
 
   /**
    * \brief Set the type of the function
@@ -163,40 +123,12 @@ class GD_CORE_API EventsFunction {
   EventsFunction& SetFunctionType(FunctionType type) {
     functionType = type;
     return *this;
-  }
+  };
 
   /**
    * \brief Get the type of the function
    */
-  FunctionType GetFunctionType() const { return functionType; }
-
-  /**
-   * \brief Return true if the function is an action.
-   */
-  bool IsAction() const {
-    return functionType == gd::EventsFunction::Action || 
-           functionType == gd::EventsFunction::ActionWithOperator;
- }
-
-  /**
-   * \brief Return true if the function is an expression.
-   * 
-   * Note that a function can be both an expression and a condition.
-   */
-  bool IsExpression() const {
-    return functionType == gd::EventsFunction::Expression ||
-           functionType == gd::EventsFunction::ExpressionAndCondition;
- }
-
-  /**
-   * \brief Return true if the function is a condition.
-   * 
-   * Note that a function can be both an expression and a condition.
-   */
-  bool IsCondition() const {
-    return functionType == gd::EventsFunction::Condition ||
-           functionType == gd::EventsFunction::ExpressionAndCondition;
- }
+  FunctionType GetFunctionType() const { return functionType; };
 
   /**
    * \brief Returns true if the function is private.
@@ -222,20 +154,7 @@ class GD_CORE_API EventsFunction {
   gd::EventsList& GetEvents() { return events; };
 
   /**
-   * \brief Return the parameters of the function that are used in the events.
-   *
-   * \note During code/extension generation, new parameters are added
-   * to the generated function, like "runtimeScene" and "eventsFunctionContext".
-   * This should be transparent to the user.
-   */
-  const std::vector<gd::ParameterMetadata>& GetParametersForEvents(
-      const gd::EventsFunctionsContainer& functionsContainer) const;
-
-  /**
-   * \brief Return the parameters of the function that are filled in the editor.
-   * 
-   * \note They won't be used for ActionWithOperator, but they need to be kept
-   * to avoid to loose them when the function type is changed.
+   * \brief Return the parameters of the function.
    *
    * \note During code/extension generation, new parameters are added
    * to the generated function, like "runtimeScene" and "eventsFunctionContext".
@@ -283,12 +202,9 @@ class GD_CORE_API EventsFunction {
   gd::String description;
   gd::String sentence;
   gd::String group;
-  gd::String getterName;
-  gd::ValueTypeMetadata expressionType;
   gd::EventsList events;
   FunctionType functionType;
   std::vector<gd::ParameterMetadata> parameters;
-  mutable std::vector<gd::ParameterMetadata> actionWithOperationParameters;
   gd::ObjectGroupsContainer objectGroups;
   bool isPrivate = false;
 };

Core/GDCore/Project/EventsFunctionsContainer.h

@@ -25,24 +25,7 @@ namespace gd {
  */
 class GD_CORE_API EventsFunctionsContainer
     : private SerializableWithNameList<gd::EventsFunction> {
-public:
-  enum FunctionOwner {
-      Extension,
-      Object,
-      Behavior};
-
-  EventsFunctionsContainer(FunctionOwner source_) : owner(source_) {}
-
-  /**
-   * \brief Get the source of the function container.
-   * 
-   * \note For instance, it can be useful to handle specific parameters for
-   * behaviors.
-   */
-  FunctionOwner GetOwner() const {
-    return owner;
-  }
-
+ public:
   /** \name Events Functions management
    */
   ///@{
@@ -156,9 +139,6 @@ public:
   void Init(const gd::EventsFunctionsContainer& other) {
     return SerializableWithNameList<gd::EventsFunction>::Init(other);
   };
-
-private:
-  FunctionOwner owner;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -13,14 +13,10 @@
 
 namespace gd {
 
-EventsFunctionsExtension::EventsFunctionsExtension() :
-    gd::EventsFunctionsContainer(
-        gd::EventsFunctionsContainer::FunctionOwner::Extension) {}
+EventsFunctionsExtension::EventsFunctionsExtension() {}
 
 EventsFunctionsExtension::EventsFunctionsExtension(
-    const EventsFunctionsExtension& other) :
-    gd::EventsFunctionsContainer(
-        gd::EventsFunctionsContainer::FunctionOwner::Extension) {
+    const EventsFunctionsExtension& other) {
   Init(other);
 }
 
@@ -54,7 +50,7 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("version", version);
   element.SetAttribute("extensionNamespace", extensionNamespace);
   element.SetAttribute("shortDescription", shortDescription);
-  element.AddChild("description").SetMultilineStringValue(description);
+  element.SetAttribute("description", description);
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
   element.SetAttribute("category", category);
@@ -100,7 +96,7 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
   version = element.GetStringAttribute("version");
   extensionNamespace = element.GetStringAttribute("extensionNamespace");
   shortDescription = element.GetStringAttribute("shortDescription");
-  description = element.GetChild("description").GetMultilineStringValue();
+  description = element.GetStringAttribute("description");
   name = element.GetStringAttribute("name");
   fullName = element.GetStringAttribute("fullName");
   category = element.GetStringAttribute("category");
@@ -172,10 +168,24 @@ void EventsFunctionsExtension::UnserializeExtensionImplementationFrom(
     gd::Project& project,
     const SerializerElement& element) {
   UnserializeEventsFunctionsFrom(project, element.GetChild("eventsFunctions"));
-  eventsBasedBehaviors.UnserializeElementsFrom(
-      "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));
-  eventsBasedObjects.UnserializeElementsFrom(
-      "eventsBasedObject", project, element.GetChild("eventsBasedObjects"));
+  auto &behaviorsElement = element.GetChild("eventsBasedBehaviors");
+  behaviorsElement.ConsiderAsArrayOf("eventsBasedBehavior");
+  for (std::size_t i = 0; i < behaviorsElement.GetChildrenCount(); ++i) {
+    const gd::String &behaviorName =
+        behaviorsElement.GetChild(i).GetStringAttribute("name");
+    if (eventsBasedBehaviors.Has(behaviorName)) {
+      eventsBasedBehaviors.Get(behaviorName).UnserializeFrom(project, behaviorsElement.GetChild(i));
+    }
+  }
+  auto &objectsElement = element.GetChild("eventsBasedObjects");
+  objectsElement.ConsiderAsArrayOf("eventsBasedObject");
+  for (std::size_t i = 0; i < objectsElement.GetChildrenCount(); ++i) {
+    const gd::String &objectName =
+        objectsElement.GetChild(i).GetStringAttribute("name");
+    if (eventsBasedObjects.Has(objectName)) {
+      eventsBasedObjects.Get(objectName).UnserializeFrom(project, objectsElement.GetChild(i));
+    }
+  }
 }
 
 bool EventsFunctionsExtension::IsExtensionLifecycleEventsFunction(

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -20,9 +20,7 @@ class Project;
 }  // namespace gd
 
 namespace gd {
-// TODO Remove the EventsFunctionsContainer inheritance and make it an attribute.
-// This will allow to get EventsFunctionsContainer the same way for extensions,
-// objects and behaviors.
+
 /**
  * \brief Hold a list of Events Functions (gd::EventsFunction) and Events Based
  * Behaviors.

Core/GDCore/Project/InitialInstance.cpp

@@ -117,10 +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())
         .GetInitialInstanceProperties(*this, project, layout);
   else if (project.HasObjectNamed(GetObjectName()))
-    return project.GetObject(GetObjectName()).GetConfiguration()
+    return project.GetObject(GetObjectName())
         .GetInitialInstanceProperties(*this, project, layout);
 
   std::map<gd::String, gd::PropertyDescriptor> nothing;
@@ -132,10 +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())
         .UpdateInitialInstanceProperty(*this, name, value, project, layout);
   else if (project.HasObjectNamed(GetObjectName()))
-    return project.GetObject(GetObjectName()).GetConfiguration()
+    return project.GetObject(GetObjectName())
         .UpdateInitialInstanceProperty(*this, name, value, project, layout);
 
   return false;

Core/GDCore/Project/InitialInstance.h

@@ -7,14 +7,13 @@
 #ifndef GDCORE_INITIALINSTANCE_H
 #define GDCORE_INITIALINSTANCE_H
 #include <map>
-
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 namespace gd {
 class PropertyDescriptor;
 class Project;
 class Layout;
-}  // namespace gd
+}
 
 namespace gd {
 
@@ -128,8 +127,7 @@ class GD_CORE_API InitialInstance {
   void SetCustomHeight(double height_) { height = height_; }
 
   /**
-   * \brief Return true if the instance is locked and cannot be moved in the
-   * IDE.
+   * \brief Return true if the instance is locked and cannot be moved in the IDE.
    */
   bool IsLocked() const { return locked; };
 
@@ -242,7 +240,7 @@ class GD_CORE_API InitialInstance {
    * \brief Set the value of a string property stored in the instance.
    */
   void SetRawStringProperty(const gd::String& name, const gd::String& value);
-  ///@}
+///@}
 
   /** \name Saving and loading
    * Members functions related to serialization.
@@ -274,19 +272,18 @@ class GD_CORE_API InitialInstance {
       stringProperties;  ///< More data which can be used by the object
 
   gd::String objectName;  ///< Object name
-  double x;               ///< Object initial X position
-  double y;               ///< Object initial Y position
-  double angle;           ///< Object initial angle
+  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
+  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
-  mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,
-                                      ///< useful for hot reloading.
+  mutable gd::String persistentUuid; ///< A persistent random version 4 UUID, useful for hot reloading.
 
   static gd::String*
       badStringProperyValue;  ///< Empty string returned by GetRawStringProperty

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -60,6 +60,7 @@ void InitialInstancesContainer::IterateOverInstancesWithZOrdering(
   for (auto& instance : sortedInstances) func(instance);
 }
 
+#if defined(GD_IDE_ONLY)
 gd::InitialInstance& InitialInstancesContainer::InsertNewInitialInstance() {
   gd::InitialInstance newInstance;
   initialInstances.push_back(newInstance);
@@ -172,6 +173,7 @@ void InitialInstancesContainer::SerializeTo(SerializerElement& element) const {
 }
 
 void InitialInstancesContainer::Clear() { initialInstances.clear(); }
+#endif
 
 InitialInstanceFunctor::~InitialInstanceFunctor(){};
 

Core/GDCore/Project/InitialInstancesContainer.h

@@ -244,15 +244,6 @@ class GD_CORE_API HighestZOrderFinder : public gd::InitialInstanceFunctor {
    */
   size_t GetInstancesCount() const { return instancesCount; }
 
-  void Reset() {
-    highestZOrder = 0;
-    lowestZOrder = 0;
-    instancesCount = 0;
-    firstCall = true;
-    layerRestricted = false;
-    layerName.clear();
-  }
-
  private:
   int highestZOrder;
   int lowestZOrder;

Core/GDCore/Project/Layout.cpp

@@ -17,7 +17,6 @@
 #include "GDCore/IDE/SceneNameMangler.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/CustomBehaviorsSharedData.h"
 #include "GDCore/Project/InitialInstance.h"
 #include "GDCore/Project/Layer.h"
 #include "GDCore/Project/Object.h"
@@ -27,7 +26,6 @@
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/PolymorphicClone.h"
-#include "GDCore/Tools/Log.h"
 
 using namespace std;
 
@@ -220,8 +218,32 @@ void Layout::UpdateBehaviorsSharedData(gd::Project& project) {
 
     if (behaviorsSharedData.find(name) != behaviorsSharedData.end()) continue;
 
-    auto sharedData = CreateBehaviorsSharedData(project, name, allBehaviorsTypes[i]);
-    if (sharedData) {
+    if (project.HasEventsBasedBehavior(allBehaviorsTypes[i])) {
+      // Events based behaviors don't have shared data yet.
+      auto sharedData =
+          gd::make_unique<gd::BehaviorsSharedData>(name, allBehaviorsTypes[i]);
+      sharedData->InitializeContent();
+      behaviorsSharedData[name] = std::move(sharedData);
+    }
+    else {
+      const gd::BehaviorMetadata& behaviorMetadata =
+          gd::MetadataProvider::GetBehaviorMetadata(
+              project.GetCurrentPlatform(),
+              allBehaviorsTypes[i]);
+      if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
+        continue;
+      }
+
+      gd::BehaviorsSharedData* behaviorsSharedDataBluePrint =
+          behaviorMetadata.GetSharedDataInstance();
+      if (!behaviorsSharedDataBluePrint) continue;
+
+      auto sharedData =
+          gd::make_unique<gd::BehaviorsSharedData>(
+              *behaviorsSharedDataBluePrint);
+      sharedData->SetName(name);
+      sharedData->SetTypeName(allBehaviorsTypes[i]);
+      sharedData->InitializeContent();
       behaviorsSharedData[name] = std::move(sharedData);
     }
   }
@@ -242,40 +264,6 @@ void Layout::UpdateBehaviorsSharedData(gd::Project& project) {
   }
 }
 
-std::unique_ptr<gd::BehaviorsSharedData> Layout::CreateBehaviorsSharedData(
-        gd::Project& project, const gd::String& name, const gd::String& behaviorsType) {
-    if (project.HasEventsBasedBehavior(behaviorsType)) {
-      auto sharedData =
-          gd::make_unique<gd::CustomBehaviorsSharedData>(name, project, behaviorsType);
-      sharedData->InitializeContent();
-      return std::move(sharedData);
-    }
-    const gd::BehaviorMetadata& behaviorMetadata =
-        gd::MetadataProvider::GetBehaviorMetadata(
-            project.GetCurrentPlatform(),
-            behaviorsType);
-    if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-      gd::LogWarning("Tried to create a behavior shared data with an unknown type: " +
-                     behaviorsType + " on object " + GetName() + "!");
-    // It's probably an events-based behavior that was removed.
-    // Create a custom behavior shared data to preserve the properties values.
-      auto sharedData =
-          gd::make_unique<gd::CustomBehaviorsSharedData>(name, project, behaviorsType);
-      sharedData->InitializeContent();
-      return std::move(sharedData);
-    }
-
-    gd::BehaviorsSharedData* behaviorsSharedDataBluePrint =
-        behaviorMetadata.GetSharedDataInstance();
-    if (!behaviorsSharedDataBluePrint) return nullptr;
-
-    auto sharedData = behaviorsSharedDataBluePrint->Clone();
-    sharedData->SetName(name);
-    sharedData->SetTypeName(behaviorsType);
-    sharedData->InitializeContent();
-    return std::unique_ptr<gd::BehaviorsSharedData>(sharedData);
-}
-
 void Layout::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("mangledName", GetMangledName());
@@ -379,23 +367,20 @@ void Layout::UnserializeFrom(gd::Project& project,
                             "Behavior");  // Compatibility with GD <= 4
     gd::String name = sharedDataElement.GetStringAttribute("name", "", "Name");
 
-
-    auto sharedData = CreateBehaviorsSharedData(project, name, type);
-    if (sharedData) {
-      // Compatibility with GD <= 4.0.98
-      // If there is only one child called "content" (in addition to "type" and
-      // "name"), it's the content of a JavaScript behavior. Move the content
-      // out of the "content" object (to put it directly at the root of the
-      // behavior shared data element).
-      if (sharedDataElement.HasChild("content")) {
-        sharedData->UnserializeFrom(sharedDataElement.GetChild("content"));
-      }
-      // end of compatibility code
-      else {
-        sharedData->UnserializeFrom(sharedDataElement);
-      }
-      behaviorsSharedData[name] = std::move(sharedData);
+    auto behavior = gd::make_unique<gd::BehaviorsSharedData>(name, type);
+    // Compatibility with GD <= 4.0.98
+    // If there is only one child called "content" (in addition to "type" and
+    // "name"), it's the content of a JavaScript behavior. Move the content
+    // out of the "content" object (to put it directly at the root of the
+    // behavior shared data element).
+    if (sharedDataElement.HasChild("content")) {
+      behavior->UnserializeFrom(sharedDataElement.GetChild("content"));
     }
+    // end of compatibility code
+    else {
+      behavior->UnserializeFrom(sharedDataElement);
+    }
+    behaviorsSharedData[name] = std::move(behavior);
   }
 }
 
@@ -417,7 +402,7 @@ void Layout::Init(const Layout& other) {
   behaviorsSharedData.clear();
   for (const auto& it : other.behaviorsSharedData) {
     behaviorsSharedData[it.first] =
-        std::unique_ptr<gd::BehaviorsSharedData>(it.second->Clone());
+        gd::make_unique<gd::BehaviorsSharedData>(*(it.second->Clone()));
   }
 
   events = other.events;

Core/GDCore/Project/Layout.h

@@ -404,11 +404,6 @@ class GD_CORE_API Layout : public ObjectsContainer {
    * Don't forget to update me if members were changed!
    */
   void Init(const gd::Layout& other);
-
-  std::unique_ptr<gd::BehaviorsSharedData> CreateBehaviorsSharedData(
-      gd::Project& project,
-      const gd::String& name,
-      const gd::String& behaviorsType);
 };
 
 /**

Core/GDCore/Project/MeasurementBaseUnit.cpp

@@ -1,27 +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 "MeasurementBaseUnit.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Localization.h"
-#include <vector>
-
-namespace gd {
-
-MeasurementBaseUnit::~MeasurementBaseUnit() {}
-
-const gd::MeasurementBaseUnit MeasurementBaseUnit::degreeAngle =
-    MeasurementBaseUnit("degree", "deg", "");
-const gd::MeasurementBaseUnit MeasurementBaseUnit::pixel =
-    MeasurementBaseUnit("pixel", "px", "distance");
-const gd::MeasurementBaseUnit MeasurementBaseUnit::meter =
-    MeasurementBaseUnit("meter", "m", "distance");
-const gd::MeasurementBaseUnit MeasurementBaseUnit::second =
-    MeasurementBaseUnit("second", "s", "time");
-const gd::MeasurementBaseUnit MeasurementBaseUnit::kilogram =
-    MeasurementBaseUnit("kilogram", "Kg", "mass");
-
-} // namespace gd

Core/GDCore/Project/MeasurementBaseUnit.h

@@ -1,57 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_MEASUREMENTBASEUNIT
-#define GDCORE_MEASUREMENTBASEUNIT
-#include <vector>
-
-#include "GDCore/String.h"
-namespace gd {
-class SerializerElement;
-}
-
-namespace gd {
-
-/**
- * \brief An atomic unit of measurement.
- */
-class GD_CORE_API MeasurementBaseUnit {
-public:
-  MeasurementBaseUnit(gd::String name_, gd::String symbol_,
-                      gd::String quantity_)
-      : name(name_), symbol(symbol_), quantity(quantity_) {}
-
-  virtual ~MeasurementBaseUnit();
-
-  /**
-   * \brief Return the unit name.
-   */
-  const gd::String &GetName() const { return name; }
-
-  /**
-   * \brief Return the unit symbol.
-   */
-  const gd::String &GetSymbol() const { return symbol; }
-
-  /**
-   * \brief Return the physical quantity.
-   */
-  const gd::String &GetQuantity() const { return quantity; }
-
-  static const gd::MeasurementBaseUnit degreeAngle;
-  static const gd::MeasurementBaseUnit pixel;
-  static const gd::MeasurementBaseUnit meter;
-  static const gd::MeasurementBaseUnit second;
-  static const gd::MeasurementBaseUnit kilogram;
-
-private:
-  gd::String name;     ///< The unit name
-  gd::String symbol;   ///< The unit symbol
-  gd::String quantity; ///< The physical quantity
-};
-
-} // namespace gd
-
-#endif // GDCORE_MEASUREMENTBASEUNIT

Core/GDCore/Project/MeasurementUnit.cpp

@@ -1,38 +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 "MeasurementUnit.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/String.h"
-#include <vector>
-
-namespace gd {
-
-MeasurementUnit::~MeasurementUnit() {}
-
-gd::MeasurementUnit MeasurementUnit::undefined = CreateUndefined();
-gd::MeasurementUnit MeasurementUnit::dimensionless = CreateDimensionless();
-gd::MeasurementUnit MeasurementUnit::degreeAngle = CreateDegreeAngle();
-gd::MeasurementUnit MeasurementUnit::second = CreateSecond();
-gd::MeasurementUnit MeasurementUnit::pixel = CreatePixel();
-gd::MeasurementUnit MeasurementUnit::pixelSpeed = CreatePixelSpeed();
-gd::MeasurementUnit MeasurementUnit::pixelAcceleration =
-    CreatePixelAcceleration();
-gd::MeasurementUnit MeasurementUnit::newton = CreateNewton();
-gd::MeasurementUnit MeasurementUnit::angularSpeed = CreateAngularSpeed();
-
-void MeasurementUnit::ApplyTranslation() {
-  undefined = CreateUndefined();
-  dimensionless = CreateDimensionless();
-  degreeAngle = CreateDegreeAngle();
-  second = CreateSecond();
-  pixel = CreatePixel();
-  pixelSpeed = CreatePixelSpeed();
-  pixelAcceleration = CreatePixelAcceleration();
-  newton = CreateNewton();
-  angularSpeed = CreateAngularSpeed();
-}
-
-} // namespace gd

Core/GDCore/Project/MeasurementUnit.h

@@ -1,197 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_MEASUREMENTUNIT
-#define GDCORE_MEASUREMENTUNIT
-#include <vector>
-
-#include "GDCore/Project/MeasurementUnitElement.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Localization.h"
-
-namespace gd {
-class SerializerElement;
-class MeasurementBaseUnit;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief A unit of measurement.
- */
-class GD_CORE_API MeasurementUnit {
-public:
-  MeasurementUnit(const std::vector<gd::MeasurementUnitElement> &elements_,
-                  gd::String name_, gd::String label_,
-                  gd::String elementsWithWords_, gd::String description_ = "")
-      : elements(elements_), name(name_), label(label_),
-        description(description_), elementsWithWords(elementsWithWords_) {}
-
-  MeasurementUnit(gd::String name_, gd::String label_,
-                  gd::String elementsWithWords_, gd::String description_ = "")
-      : name(name_), label(label_), description(description_),
-        elementsWithWords(elementsWithWords_) {}
-
-  virtual ~MeasurementUnit();
-
-  /**
-   * \brief Return the unit name.
-   */
-  const gd::String &GetName() const { return name; }
-
-  /**
-   * \brief Return the unit label.
-   */
-  const gd::String &GetLabel() const { return label; }
-
-  /**
-   * \brief Return the unit description.
-   */
-  const gd::String &GetDescription() const { return description; }
-
-  /**
-   * \brief Return the unit description.
-   */
-  const gd::String &GetElementsWithWords() const { return elementsWithWords; }
-
-  /**
-   * \brief Return the unit elements.
-   */
-  const std::vector<gd::MeasurementUnitElement> &GetElements() const {
-    return elements;
-  }
-
-  std::size_t GetElementsCount() const { return elements.size(); }
-
-  int GetElementPower(std::size_t elementIndex) const {
-    return elements.at(elementIndex).GetPower();
-  }
-
-  const gd::MeasurementBaseUnit &
-  GetElementBaseUnit(std::size_t elementIndex) const {
-    return elements.at(elementIndex).GetBaseUnit();
-  }
-
-  bool IsUndefined() const { return this == &gd::MeasurementUnit::undefined; }
-
-  static void ApplyTranslation();
-
-  static gd::MeasurementUnit &GetUndefined() { return undefined; }
-
-  static gd::MeasurementUnit &GetDimensionless() { return dimensionless; }
-
-  static gd::MeasurementUnit &GetDegreeAngle() { return degreeAngle; }
-
-  static gd::MeasurementUnit &GetSecond() { return second; }
-
-  static gd::MeasurementUnit &GetPixel() { return pixel; }
-
-  static gd::MeasurementUnit &GetPixelSpeed() { return pixelSpeed; }
-
-  static gd::MeasurementUnit &GetPixelAcceleration() {
-    return pixelAcceleration;
-  }
-
-  static gd::MeasurementUnit &GetAngularSpeed() { return angularSpeed; }
-
-  static gd::MeasurementUnit &GetNewton() { return newton; }
-
-private:
-  static gd::MeasurementUnit undefined;
-  static gd::MeasurementUnit dimensionless;
-  static gd::MeasurementUnit degreeAngle;
-  static gd::MeasurementUnit second;
-  static gd::MeasurementUnit pixel;
-  static gd::MeasurementUnit pixelSpeed;
-  static gd::MeasurementUnit pixelAcceleration;
-  static gd::MeasurementUnit newton;
-  static gd::MeasurementUnit angularSpeed;
-
-  static gd::MeasurementUnit CreateUndefined() {
-    return MeasurementUnit("Undefined", _("Undefined"), "");
-  }
-
-  static gd::MeasurementUnit CreateDimensionless() {
-    return MeasurementUnit("Dimensionless", _("Dimensionless"), "");
-  }
-
-  static gd::MeasurementUnit CreateDegreeAngle() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::degreeAngle, 1));
-    return MeasurementUnit(elements, "DegreeAngle", _("Angle"), _("degree"));
-  }
-
-  static gd::MeasurementUnit CreateSecond() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::second, 1));
-    return MeasurementUnit(elements, "Second", _("Duration"), _("second"));
-  }
-
-  static gd::MeasurementUnit CreatePixel() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::pixel, 1));
-    return MeasurementUnit(elements, "Pixel", _("Distance"), _("pixel"));
-  }
-
-  static gd::MeasurementUnit CreatePixelSpeed() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::pixel, 1));
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -1));
-    return MeasurementUnit(elements, "PixelSpeed", _("Speed"),
-                           _("pixel per second"),
-                           _("How much distance is covered per second."));
-  }
-
-  static gd::MeasurementUnit CreatePixelAcceleration() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::pixel, 1));
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -2));
-    return MeasurementUnit(elements, "PixelAcceleration", _("Acceleration"),
-                           _("pixel per second, per second"),
-                           _("How much speed is gained (or lost) per second."));
-  }
-
-  static gd::MeasurementUnit CreateNewton() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::meter, 1));
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::kilogram, 1));
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -2));
-    return MeasurementUnit(
-        elements, "Newton",
-        _("Force (in Newton)"), _("meter kilogram per second, per second"),
-        _("A unit to measure forces."));
-  }
-
-  static gd::MeasurementUnit CreateAngularSpeed() {
-    std::vector<gd::MeasurementUnitElement> elements;
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::degreeAngle, 1));
-    elements.push_back(
-        MeasurementUnitElement(gd::MeasurementBaseUnit::second, -1));
-    return MeasurementUnit(elements, "AngularSpeed", _("Angular speed"),
-                           _("degree per second"),
-                           _("How much angle is covered per second."));
-  }
-
-  gd::String name;              ///< The unit name.
-  gd::String label;             ///< The unit label.
-  gd::String description;       ///< The unit description.
-  gd::String elementsWithWords; ///< The unit elements put in words.
-  std::vector<gd::MeasurementUnitElement> elements; ///< The unit elements.
-};
-
-} // namespace gd
-
-#endif // GDCORE_MEASUREMENTUNIT

Core/GDCore/Project/MeasurementUnitElement.cpp

@@ -1,15 +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 "MeasurementUnitElement.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/String.h"
-#include <vector>
-
-namespace gd {
-
-MeasurementUnitElement::~MeasurementUnitElement() {}
-
-} // namespace gd

Core/GDCore/Project/MeasurementUnitElement.h

@@ -1,46 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_MEASUREMENTUNITELEMENT
-#define GDCORE_MEASUREMENTUNITELEMENT
-#include <vector>
-
-#include "GDCore/Project/MeasurementBaseUnit.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class SerializerElement;
-}
-
-namespace gd {
-
-/**
- * \brief A couple of an atomic unit of measurement and its power.
- */
-class GD_CORE_API MeasurementUnitElement {
-public:
-  MeasurementUnitElement(const gd::MeasurementBaseUnit &baseUnit_, int power_)
-      : baseUnit(baseUnit_), power(power_) {}
-
-  virtual ~MeasurementUnitElement();
-
-  /**
-   * \brief Return the base unit.
-   */
-  const gd::MeasurementBaseUnit &GetBaseUnit() const { return baseUnit; }
-
-  /**
-   * \brief Return the power on the base unit.
-   */
-  int GetPower() const { return power; }
-
-private:
-  gd::MeasurementBaseUnit baseUnit; ///< The base unit.
-  int power;                        ///< The power on the base unit.
-};
-
-} // namespace gd
-
-#endif // GDCORE_MEASUREMENTUNITELEMENT