From 38440c72bda7391d722636bba5c42cf94a6bb08a Mon Sep 17 00:00:00 2001
From: Zachary Pavlov <zachary.pavlov@gmail.com>
Date: Sat, 20 Jun 2009 00:13:18 +0000
Subject: [PATCH] new structured char support

---
 panda/src/egg/eggGroup.cxx |  4 ++++
 panda/src/egg/eggGroup.h   | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/panda/src/egg/eggGroup.cxx b/panda/src/egg/eggGroup.cxx
index f9261dc84b..181bb8d11c 100644
--- a/panda/src/egg/eggGroup.cxx
+++ b/panda/src/egg/eggGroup.cxx
@@ -883,6 +883,8 @@ string_dart_type(const string &strval) {
     return DT_nosync;
   } else if (cmp_nocase_uh(strval, "default") == 0) {
     return DT_default;
+  } else if (cmp_nocase_uh(strval, "structured") == 0) {
+    return DT_structured;
   } else {
     return DT_none;
   }
@@ -1359,6 +1361,8 @@ ostream &operator << (ostream &out, EggGroup::DartType t) {
     return out << "sync";
   case EggGroup::DT_nosync:
     return out << "nosync";
+  case EggGroup::DT_structured:
+    return out << "structured";
   case EggGroup::DT_default:
     return out << "1";
   }
diff --git a/panda/src/egg/eggGroup.h b/panda/src/egg/eggGroup.h
index e33a6d777f..93b8b859d9 100644
--- a/panda/src/egg/eggGroup.h
+++ b/panda/src/egg/eggGroup.h
@@ -46,13 +46,6 @@ PUBLISHED:
     GT_instance              = 0x00000001,
     GT_joint                 = 0x00000002,
   };
-  enum DartType {
-    // The bits here must correspond to those in Flags, below.
-    DT_none                  = 0x00000000,
-    DT_sync                  = 0x00000004,
-    DT_nosync                = 0x00000008,
-    DT_default               = 0x0000000c,
-  };
   enum DCSType {
     // The bits here must correspond to those in Flags2, below.
     DC_unspecified           = 0x00000000,
@@ -95,6 +88,16 @@ PUBLISHED:
     CF_intangible            = 0x08000000,
   };
 
+  enum DartType {
+    // The bits here must correspond to those in Flags, below.
+    DT_none                  = 0x00000000,
+    DT_structured            = 0x10000000,
+    DT_sync                  = 0x20000000,
+    DT_nosync                = 0x30000000,
+    DT_default               = 0x40000000,
+  };
+
+
   // These correspond to ColorBlendAttrib::Mode (but not numerically).
   enum BlendMode {
     BM_unspecified,
@@ -325,7 +328,6 @@ private:
 
   enum Flags {
     F_group_type             = 0x00000003,
-    F_dart_type              = 0x0000000c,
 
     F_billboard_type         = 0x000000e0,
     F_switch_flag            = 0x00000100,
@@ -336,6 +338,7 @@ private:
     F_direct_flag            = 0x00004000,
     F_cs_type                = 0x000f0000,
     F_collide_flags          = 0x0ff00000,
+    F_dart_type              = 0xf0000000,
   };
   enum Flags2 {
     F2_collide_mask          = 0x00000001,