Browse Source

support multiple objecttypes

David Rose 23 years ago
parent
commit
29e9fe84ec

+ 12 - 10
pandatool/src/egg-palettize/textureReference.cxx

@@ -445,11 +445,12 @@ get_uv_range(EggGroupNode *group, Palettizer::RemapUV remap) {
   if (group->is_of_type(EggGroup::get_class_type())) {
   if (group->is_of_type(EggGroup::get_class_type())) {
     EggGroup *egg_group;
     EggGroup *egg_group;
     DCAST_INTO_V(egg_group, group);
     DCAST_INTO_V(egg_group, group);
-    if (egg_group->has_objecttype() &&
-        cmp_nocase_uh(egg_group->get_objecttype(), "backstage") == 0) {
-      // If we reach a <Group> node with the "backstage" flag set,
-      // ignore it and everything under it.
-      return;
+    for (int i = 0; i < egg_group->get_num_object_types(); i++) {
+      if (cmp_nocase_uh(egg_group->get_object_type(i), "backstage") == 0) {
+        // If we reach a <Group> node with the "backstage" flag set,
+        // ignore it and everything under it.
+        return;
+      }
     }
     }
 
 
     if (egg_group->get_dart_type() != EggGroup::DT_none) {
     if (egg_group->get_dart_type() != EggGroup::DT_none) {
@@ -540,11 +541,12 @@ update_uv_range(EggGroupNode *group, Palettizer::RemapUV remap) {
   if (group->is_of_type(EggGroup::get_class_type())) {
   if (group->is_of_type(EggGroup::get_class_type())) {
     EggGroup *egg_group;
     EggGroup *egg_group;
     DCAST_INTO_V(egg_group, group);
     DCAST_INTO_V(egg_group, group);
-    if (egg_group->has_objecttype() &&
-        cmp_nocase_uh(egg_group->get_objecttype(), "backstage") == 0) {
-      // If we reach a <Group> node with the "backstage" flag set,
-      // ignore it and everything under it.
-      return;
+    for (int i = 0; i < egg_group->get_num_object_types(); i++) {
+      if (cmp_nocase_uh(egg_group->get_object_type(i), "backstage") == 0) {
+        // If we reach a <Group> node with the "backstage" flag set,
+        // ignore it and everything under it.
+        return;
+      }
     }
     }
 
 
     if (egg_group->get_dart_type() != EggGroup::DT_none) {
     if (egg_group->get_dart_type() != EggGroup::DT_none) {

+ 4 - 0
pandatool/src/egg-palettize/txaLine.cxx

@@ -532,6 +532,10 @@ output(ostream &out) const {
     case KW_cont:
     case KW_cont:
       out << " cont";
       out << " cont";
       break;
       break;
+
+    case KW_anisotropic:
+      out << " aniso " << _aniso_degree;
+      break;
     }
     }
   }
   }