Anim speed

xml_converter/doc/texture/animation_speed.md

@@ -4,6 +4,10 @@ type: Float32
 applies_to: [Trail]
 xml_fields: ["AnimSpeed", "AnimationSpeed"]
 protobuf_field: animation_speed
+custom_functions:
+  read.xml:
+    function: default_value_one_xml_attribute_to_float
+    side_effects: []
 ---
 The speed which the texture should be moving across the object.
 

xml_converter/intigration_tests/expected_outputs/xml_animation_speed/xml_file.xml

@@ -0,0 +1,19 @@
+<OverlayData>
+<MarkerCategory  DisplayName="My Category" Name="mycategory">
+</MarkerCategory>
+
+<POIs>
+<Trail  AnimSpeed="0.000000" Type="mycategory"/>
+<Trail  Type="mycategory"/>
+<Trail  AnimSpeed="3.140000" Type="mycategory"/>
+<Trail  AnimSpeed="123.456001" Type="mycategory"/>
+<Trail  AnimSpeed="0.000000" Type="mycategory"/>
+<Trail  Type="mycategory"/>
+<Trail  AnimSpeed="3.140000" Type="mycategory"/>
+<Trail  AnimSpeed="123.456001" Type="mycategory"/>
+<Trail  AnimSpeed="-3.140000" Type="mycategory"/>
+<Trail  AnimSpeed="-123.456001" Type="mycategory"/>
+<Trail  AnimSpeed="-3.140000" Type="mycategory"/>
+<Trail  AnimSpeed="-123.456001" Type="mycategory"/>
+</POIs>
+</OverlayData>

xml_converter/intigration_tests/inputs/xml_animation_speed/xml_file.xml

@@ -0,0 +1,19 @@
+<OverlayData>
+    <MarkerCategory DisplayName="My Category" Name="mycategory">
+    </MarkerCategory>
+
+    <POIs>
+        <Trail AnimSpeed="0" Type="mycategory" />
+        <Trail AnimSpeed="1.0" Type="mycategory" />
+        <Trail AnimSpeed="3.14" Type="mycategory" />
+        <Trail AnimSpeed="123.456" Type="mycategory" />
+        <Trail AnimationSpeed="0" Type="mycategory" />
+        <Trail AnimationSpeed="1" Type="mycategory" />     
+        <Trail AnimationSpeed="3.14" Type="mycategory" />
+        <Trail AnimationSpeed="123.456" Type="mycategory" />
+        <Trail AnimSpeed="-3.14" Type="mycategory" />
+        <Trail AnimSpeed="-123.456" Type="mycategory" />
+        <Trail AnimationSpeed="-3.14" Type="mycategory" />
+        <Trail AnimationSpeed="-123.456" Type="mycategory" />
+    </POIs>
+</OverlayData>

xml_converter/intigration_tests/testcases.py

@@ -119,12 +119,18 @@ class Testcase:
         expected_output_xml_path="./expected_outputs/xml_profession_filter",
         expected_output_proto_path="./expected_outputs/proto_profession_filter",
     ),
+    Testcase(
+        name="animation_speed",
+        xml_input_paths=["./inputs/xml_animation_speed"],
+        expected_output_xml_path="./expected_outputs/xml_animation_speed",
+        expected_output_proto_path="./expected_outputs/proto_animation_speed"
+    ),
     Testcase(
         name="cull_chirality",
         xml_input_paths=["./inputs/xml_cull_chirality"],
         expected_output_xml_path="./expected_outputs/xml_cull_chirality",
         expected_output_proto_path="./expected_outputs/proto_cull_chirality",
-    ).
+    ),
     Testcase(
         name="specialization_filter",
         xml_input_paths=["./inputs/xml_specialization_filter"],

xml_converter/src/attribute/float.cpp

@@ -49,3 +49,24 @@ void proto_to_float(float input, float* value, bool* is_set) {
 void float_to_proto(float value, std::function<void(float&)> setter) {
     setter(value);
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// replace_one_point_zero_with_zero
+//
+// Parses a float from the value of a rapidxml::xml_attribute and
+// replaces default value of one with zero
+////////////////////////////////////////////////////////////////////////////////
+void default_value_one_xml_attribute_to_float(
+    rapidxml::xml_attribute<>* input,
+    std::vector<XMLError*>* errors,
+    XMLReaderState* state,
+    float* value,
+    bool* is_set) {
+    if (std::stof(get_attribute_value(input)) == 1.0) {
+        *value = 0;
+    }
+    else {
+        *value = std::stof(get_attribute_value(input));
+        *is_set = true;
+    }
+}

xml_converter/src/attribute/float.hpp

@@ -21,3 +21,10 @@ std::string float_to_xml_attribute(const std::string& attribute_name, const floa
 void proto_to_float(float input, float* value, bool* is_set);
 
 void float_to_proto(float value, std::function<void(float&)> setter);
+
+void default_value_one_xml_attribute_to_float(
+    rapidxml::xml_attribute<>* input,
+    std::vector<XMLError*>* errors,
+    XMLReaderState* state,
+    float* value,
+    bool* is_set);

xml_converter/src/trail_gen.cpp

@@ -29,10 +29,10 @@ bool Trail::init_xml_attribute(rapidxml::xml_attribute<>* attribute, vector<XMLE
         xml_attribute_to_int(attribute, errors, state, &(this->achievement_id), &(this->achievement_id_is_set));
     }
     else if (attributename == "animspeed") {
-        xml_attribute_to_float(attribute, errors, state, &(this->animation_speed), &(this->animation_speed_is_set));
+        default_value_one_xml_attribute_to_float(attribute, errors, state, &(this->animation_speed), &(this->animation_speed_is_set));
     }
     else if (attributename == "animationspeed") {
-        xml_attribute_to_float(attribute, errors, state, &(this->animation_speed), &(this->animation_speed_is_set));
+        default_value_one_xml_attribute_to_float(attribute, errors, state, &(this->animation_speed), &(this->animation_speed_is_set));
     }
     else if (attributename == "type") {
         xml_attribute_to_marker_category(attribute, errors, state, &(this->category), &(this->category_is_set));