Fix getter and setter generation for animation properties (#7307)

- Don't show in changelog
4ian · Jan 14, 2025 · 2638c4f · 2638c4f
1 parent 4be2386
commit 2638c4f
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 38 deletions.
diff --git a/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp b/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
@@ -79,6 +79,7 @@ const gd::String ValueTypeMetadata::colorValueType = "color";
 const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
 const gd::String ValueTypeMetadata::behaviorValueType = "behavior";
 const gd::String ValueTypeMetadata::leaderboardIdValueType = "leaderboardId";
+const gd::String ValueTypeMetadata::objectAnimationNameValueType = "objectAnimationName";
 
 const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     const gd::String &propertyType) {
@@ -94,8 +95,10 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     return behaviorValueType;
   } else if (propertyType == "LeaderboardId") {
     return leaderboardIdValueType;
+  } else if (propertyType == "ObjectAnimationName") {
+    return objectAnimationNameValueType;
   }
-  // For "String" or default
+  // For "String", "Resource" or default
   return stringValueType;
 };
 

diff --git a/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h b/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h
@@ -318,6 +318,7 @@ class GD_CORE_API ValueTypeMetadata {
   static const gd::String choiceValueType;
   static const gd::String behaviorValueType;
   static const gd::String leaderboardIdValueType;
+  static const gd::String objectAnimationNameValueType;
 };
 
 }  // namespace gd

diff --git a/Core/GDCore/IDE/PropertyFunctionGenerator.cpp b/Core/GDCore/IDE/PropertyFunctionGenerator.cpp
@@ -245,9 +245,11 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
 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" && type != "LeaderboardId") {
+  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
+      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
+          property.GetType()));
+  if (primitiveType != "boolean" && primitiveType != "number" &&
+      primitiveType != "string") {
     return false;
   }
 

diff --git a/Core/GDCore/Project/CustomConfigurationHelper.cpp b/Core/GDCore/Project/CustomConfigurationHelper.cpp
@@ -50,17 +50,16 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
 
     auto &newProperty = objectProperties[propertyName];
 
+    const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
+        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(propertyType));
     if (configurationContent.HasChild(propertyName)) {
-      if (propertyType == "String" || propertyType == "Choice" ||
-          propertyType == "Color" || propertyType == "Behavior" ||
-          propertyType == "Resource" || propertyType == "LeaderboardId" ||
-          propertyType == "AnimationName") {
+      if (primitiveType == "string") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
-      } else if (propertyType == "Number") {
+      } else if (primitiveType == "number") {
         newProperty.SetValue(gd::String::From(
             configurationContent.GetChild(propertyName).GetDoubleValue()));
-      } else if (propertyType == "Boolean") {
+      } else if (primitiveType == "boolean") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetBoolValue()
                 ? "true"
@@ -88,14 +87,13 @@ bool CustomConfigurationHelper::UpdateProperty(
   auto &element = configurationContent.AddChild(propertyName);
   const gd::String &propertyType = property.GetType();
 
-  if (propertyType == "String" || propertyType == "Choice" ||
-      propertyType == "Color" || propertyType == "Behavior" ||
-      propertyType == "Resource" || propertyType == "LeaderboardId" || 
-      propertyType == "AnimationName") {
+  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
+      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(propertyType));
+  if (primitiveType == "string") {
     element.SetStringValue(newValue);
-  } else if (propertyType == "Number") {
+  } else if (primitiveType == "number") {
     element.SetDoubleValue(newValue.To<double>());
-  } else if (propertyType == "Boolean") {
+  } else if (primitiveType == "boolean") {
     element.SetBoolValue(newValue == "1");
   }
 

diff --git a/newIDE/app/src/CompactPropertiesEditor/PropertiesMapToCompactSchema.js b/newIDE/app/src/CompactPropertiesEditor/PropertiesMapToCompactSchema.js
@@ -234,7 +234,7 @@ const createField = (
       getDescription,
       hasImpactOnAllOtherFields: property.hasImpactOnOtherProperties(),
     };
-  } else if (valueType === 'animationname') {
+  } else if (valueType === 'objectanimationname') {
     return {
       getChoices: () => {
         if (!object) {
@@ -245,13 +245,12 @@ const createField = (
           object.getConfiguration().getAnimationsCount(),
           i => {
             const animationName = object.getConfiguration().getAnimationName(i);
-            if (animationName === '') {
-              return null;
-            }
-            return {
-              value: animationName,
-              label: animationName,
-            };
+            return animationName === ''
+              ? null
+              : {
+                  value: animationName,
+                  label: animationName,
+                };
           }
         ).filter(Boolean);
         animationArray.push({ value: '', label: '(no animation)' });

diff --git a/newIDE/app/src/EventsBasedBehaviorEditor/EventsBasedBehaviorPropertiesEditor.js b/newIDE/app/src/EventsBasedBehaviorEditor/EventsBasedBehaviorPropertiesEditor.js
@@ -729,11 +729,6 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                           value="Boolean"
                                           label={t`Boolean (checkbox)`}
                                         />
-                                        <SelectOption
-                                          key="property-type-animationname"
-                                          value="AnimationName"
-                                          label={t`Animation name (text)`}
-                                        />
                                         <SelectOption
                                           key="property-type-choice"
                                           value="Choice"
@@ -744,6 +739,11 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                           value="Color"
                                           label={t`Color (text)`}
                                         />
+                                        <SelectOption
+                                          key="property-type-object-animation-name"
+                                          value="ObjectAnimationName"
+                                          label={t`Object animation (text)`}
+                                        />
                                         <SelectOption
                                           key="property-type-resource"
                                           value="Resource"
@@ -809,7 +809,7 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                       {(property.getType() === 'String' ||
                                         property.getType() === 'Number' ||
                                         property.getType() ===
-                                          'AnimationName') && (
+                                          'ObjectAnimationName') && (
                                         <SemiControlledTextField
                                           commitOnBlur
                                           floatingLabelText={

diff --git a/newIDE/app/src/PropertiesEditor/PropertiesMapToSchema.js b/newIDE/app/src/PropertiesEditor/PropertiesMapToSchema.js
@@ -220,7 +220,7 @@ const createField = (
       getLabel,
       getDescription,
     };
-  } else if (valueType === 'animationname') {
+  } else if (valueType === 'objectanimationname') {
     return {
       getChoices: () => {
         if (!object) {
@@ -231,13 +231,12 @@ const createField = (
           object.getConfiguration().getAnimationsCount(),
           i => {
             const animationName = object.getConfiguration().getAnimationName(i);
-            if (animationName === '') {
-              return null;
-            }
-            return {
-              value: animationName,
-              label: animationName,
-            };
+            return animationName === ''
+              ? null
+              : {
+                  value: animationName,
+                  label: animationName,
+                };
           }
         ).filter(Boolean);
         animationArray.push({ value: '', label: '(no animation)' });