Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Category ID #271

Merged
merged 3 commits into from
Feb 4, 2024
Merged

Adding Category ID #271

merged 3 commits into from
Feb 4, 2024

Conversation

AsherGlick
Copy link
Owner

Adding a new field for category ID a unique value.

This PR is pretty large because it alters the output of all of the integration tests as they all now have default category IDs. But overall it is not to complex because all of those changes are very similar to each other.

This PR should also unblock us on many of the category display bugs we are having in the overlay itself.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.453032192 +0000
+++ xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.461032145 +0000
@@ -47,4 +47,5 @@
   trail {
     achievement_bit: 5
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.473032074 +0000
+++ xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.481032026 +0000
@@ -56,4 +56,5 @@
   trail {
     achievement_id: 5
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/animation_speed/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.493031955 +0000
+++ xml_converter/integration_tests/test_cases/animation_speed/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.501031908 +0000
@@ -178,4 +178,5 @@
     }
     animation_speed: -123.456
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/canfade_invalid/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.513031837 +0000
+++ xml_converter/integration_tests/test_cases/canfade_invalid/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.521031789 +0000
@@ -16,4 +16,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/canfade_valid/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.533031718 +0000
+++ xml_converter/integration_tests/test_cases/canfade_valid/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.541031671 +0000
@@ -34,4 +34,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/category_name/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.553031600 +0000
+++ xml_converter/integration_tests/test_cases/category_name/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.557031576 +0000
@@ -24,4 +24,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/cull_chirality/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.569031505 +0000
+++ xml_converter/integration_tests/test_cases/cull_chirality/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.577031458 +0000
@@ -26,4 +26,5 @@
     }
     cull_chirality: counter_clockwise
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/fade_distance/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.589031386 +0000
+++ xml_converter/integration_tests/test_cases/fade_distance/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.597031339 +0000
@@ -83,4 +83,5 @@
   trail {
     distance_fade_end: 3.14
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/festival_filter/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.609031268 +0000
+++ xml_converter/integration_tests/test_cases/festival_filter/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.617031221 +0000
@@ -46,4 +46,5 @@
       lunar_new_year: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/is_wall/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.629031150 +0000
+++ xml_converter/integration_tests/test_cases/is_wall/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.637031102 +0000
@@ -14,4 +14,5 @@
   trail {
     map_id: 50
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/map_id/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.649031031 +0000
+++ xml_converter/integration_tests/test_cases/map_id/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.653031007 +0000
@@ -39,4 +39,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/map_type_filter/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.665030936 +0000
+++ xml_converter/integration_tests/test_cases/map_type_filter/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.673030889 +0000
@@ -81,4 +81,5 @@
       wvw_lounge_map: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/mount_filter_invalid/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.685030818 +0000
+++ xml_converter/integration_tests/test_cases/mount_filter_invalid/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.693030771 +0000
@@ -40,4 +40,5 @@
       springer: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/mountfilter_valid/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.705030699 +0000
+++ xml_converter/integration_tests/test_cases/mountfilter_valid/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.713030652 +0000
@@ -55,4 +55,5 @@
       seige_turtle: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/profession_filter/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.725030581 +0000
+++ xml_converter/integration_tests/test_cases/profession_filter/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.733030534 +0000
@@ -66,4 +66,5 @@
       revenant: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/specialization_filter/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.745030463 +0000
+++ xml_converter/integration_tests/test_cases/specialization_filter/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.753030415 +0000
@@ -166,4 +166,5 @@
       warrior_bladesworn: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/species_filter/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.765030344 +0000
+++ xml_converter/integration_tests/test_cases/species_filter/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.773030296 +0000
@@ -124,4 +124,5 @@
       sylvari: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/texture/output_proto/markers.bin.textproto._old	2024-01-22 07:30:34.785030226 +0000
+++ xml_converter/integration_tests/test_cases/texture/output_proto/markers.bin.textproto._new	2024-01-22 07:30:34.789030202 +0000
@@ -16,6 +16,7 @@
     texture_id: 1
     map_id: 50
   }
+  8: "(\350\314\006\302\223^\226"
 }
 textures {
 }

@@ -45,6 +45,12 @@ bool Category::init_xml_attribute(rapidxml::xml_attribute<>* attribute, vector<X
else if (attributename == "isseparator") {
xml_attribute_to_bool(attribute, errors, state, &(this->is_separator), &(this->is_separator_is_set));
}
else if (attributename == "id") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The markdown file that generates this code seems to be missing.

Base automatically changed from hashing_functions to xml_converter January 23, 2024 05:06

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.824954339 +0000
+++ xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.832954349 +0000
@@ -47,4 +47,5 @@
   trail {
     achievement_bit: 5
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.844954365 +0000
+++ xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.852954376 +0000
@@ -56,4 +56,5 @@
   trail {
     achievement_id: 5
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/animation_speed/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.864954392 +0000
+++ xml_converter/integration_tests/test_cases/animation_speed/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.868954397 +0000
@@ -178,4 +178,5 @@
     }
     animation_speed: -123.456
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/canfade_invalid/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.880954413 +0000
+++ xml_converter/integration_tests/test_cases/canfade_invalid/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.888954424 +0000
@@ -16,4 +16,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/canfade_valid/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.900954439 +0000
+++ xml_converter/integration_tests/test_cases/canfade_valid/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.908954450 +0000
@@ -34,4 +34,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/category_name/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.920954466 +0000
+++ xml_converter/integration_tests/test_cases/category_name/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.928954476 +0000
@@ -24,4 +24,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/cull_chirality/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.940954493 +0000
+++ xml_converter/integration_tests/test_cases/cull_chirality/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.948954503 +0000
@@ -26,4 +26,5 @@
     }
     cull_chirality: counter_clockwise
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/fade_distance/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.960954519 +0000
+++ xml_converter/integration_tests/test_cases/fade_distance/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.964954524 +0000
@@ -83,4 +83,5 @@
   trail {
     distance_fade_end: 3.14
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/festival_filter/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.976954540 +0000
+++ xml_converter/integration_tests/test_cases/festival_filter/output_proto/markers.bin.textproto._new	2024-01-23 07:51:44.984954551 +0000
@@ -46,4 +46,5 @@
       lunar_new_year: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/is_wall/output_proto/markers.bin.textproto._old	2024-01-23 07:51:44.996954567 +0000
+++ xml_converter/integration_tests/test_cases/is_wall/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.004954577 +0000
@@ -14,4 +14,5 @@
   trail {
     map_id: 50
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/map_id/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.016954593 +0000
+++ xml_converter/integration_tests/test_cases/map_id/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.024954604 +0000
@@ -39,4 +39,5 @@
       z: 215.83
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/map_type_filter/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.036954620 +0000
+++ xml_converter/integration_tests/test_cases/map_type_filter/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.044954631 +0000
@@ -81,4 +81,5 @@
       wvw_lounge_map: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/mount_filter_invalid/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.056954646 +0000
+++ xml_converter/integration_tests/test_cases/mount_filter_invalid/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.064954657 +0000
@@ -40,4 +40,5 @@
       springer: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/mountfilter_valid/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.072954668 +0000
+++ xml_converter/integration_tests/test_cases/mountfilter_valid/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.080954679 +0000
@@ -55,4 +55,5 @@
       seige_turtle: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/profession_filter/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.092954694 +0000
+++ xml_converter/integration_tests/test_cases/profession_filter/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.100954705 +0000
@@ -66,4 +66,5 @@
       revenant: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/specialization_filter/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.112954721 +0000
+++ xml_converter/integration_tests/test_cases/specialization_filter/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.120954731 +0000
@@ -166,4 +166,5 @@
       warrior_bladesworn: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/species_filter/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.132954747 +0000
+++ xml_converter/integration_tests/test_cases/species_filter/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.140954758 +0000
@@ -124,4 +124,5 @@
       sylvari: true
     }
   }
+  8: "(\350\314\006\302\223^\226"
 }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff
--- xml_converter/integration_tests/test_cases/texture/output_proto/markers.bin.textproto._old	2024-01-23 07:51:45.152954773 +0000
+++ xml_converter/integration_tests/test_cases/texture/output_proto/markers.bin.textproto._new	2024-01-23 07:51:45.160954784 +0000
@@ -16,6 +16,7 @@
     texture_id: 1
     map_id: 50
   }
+  8: "(\350\314\006\302\223^\226"
 }
 textures {
 }

@AsherGlick AsherGlick merged commit 2649e7b into xml_converter Feb 4, 2024
13 checks passed
@AsherGlick AsherGlick deleted the category_id branch February 4, 2024 04:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants