Changeset 6276 in orxonox.OLD

Timestamp:

Dec 24, 2005, 2:28:00 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: cleaner base_object-stuff

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/lang/base_object.cc (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -91 +91 @@
   // SUPER-Modeling
   CL_TEXTURE                    =    0x00c01000,
-  CL_MODEL                      =    0x00c02000,
-  CL_STATIC_MODEL               =    0x00c04000,
-  CL_VERTEX_ARRAY_MODEL         =    0x00c08000,
+  CL_TEXT                       =    0x00c02000,
+
+  CL_MODEL                      =    0x00d01000,
+  CL_STATIC_MODEL               =    0x00002000,
+  CL_VERTEX_ARRAY_MODEL         =    0x00004000,
 
 
@@ -190 +192 @@
   // Collision
   CL_COLLISION                  =    0x00000611,
-  CL_BV_TREE                    =    0x00a01612,
-  CL_BV_TREE_NODE               =    0x00a02613,
-  CL_OBB_TREE                   =    0x00a04614,
-  CL_OBB_TREE_NODE              =    0x00a08615,
-  CL_BOUNDING_VOLUME            =    0x00a10616,
-  CL_OBB                        =    0x00a20617,
+  CL_BV_TREE                    =    0x00a01000,
+  CL_BV_TREE_NODE               =    0x00002000,
+  CL_OBB_TREE                   =    0x00000614,
+  CL_OBB_TREE_NODE              =    0x00000615,
+  CL_BOUNDING_VOLUME            =    0x00a10000,
+  CL_OBB                        =    0x00020617,
   CL_BOUNDING_SPHERE            =    0x00a40618,
 
   // graphical stuff (range from 0x00000800 to 0x000009ff)
-  CL_FONT                       =    0x00c02802,
-
-
-  CL_TEXT                       =    0x00b01801,
+  CL_FONT                       =    0x00000802,
+
+
   CL_MATERIAL                   =    0x00000804,
-  CL_TEXTURE_SEQUENCE           =    0x00c04805,
+  CL_TEXTURE_SEQUENCE           =    0x00004805,
   CL_OBJ_MODEL                  =    0x00000807,
   CL_PROMITIVE_MODEL            =    0x00000808,

trunk/src/lib/lang/base_object.cc

@@ -32 +32 @@
 BaseObject::BaseObject(const TiXmlElement* root)
 {
-  this->className = NULL;
+  this->className = "BaseObject";
   this->classID = CL_BASE_OBJECT;
 
@@ -73 +73 @@
 void BaseObject::setClassID(ClassID classID, const char* className)
 {
+  //  printf("%s(0x%.8X)->%s(0x%.8X)\n", this->className, this->classID, className, classID);
+  assert (!(this->classID & classID));
+
   this->classID |= (long)classID;
   this->className = className;