Changeset 7123 in orxonox.OLD for trunk/src/defs

Timestamp:

Feb 11, 2006, 8:57:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some cleanup before the new tag

1. BaseObject isA was wrong… every subclass was detected as any other subclass
2. Classes get unloaded again as they should
3. some minor fixes (Material* → Material) and some other cleanups

File:

• trunk/src/defs/class_id.h (modified) (3 diffs)

trunk/src/defs/class_id.h

@@ -242 +242 @@
   CL_COLLISION                  =    0x00000711,
   CL_BV_TREE                    =    0x00701000,
-  CL_BV_TREE_NODE               =    0x00002000,
+  CL_BV_TREE_NODE               =    0x00702000,
   CL_OBB_TREE                   =    0x00000714,
   CL_OBB_TREE_NODE              =    0x00000715,
@@ -270 +270 @@
 
   CL_PRIMITIVE_MODEL            =    0x00000908,
-  CL_MD2Model                   =    0x00000909,
+  CL_MD2_MODEL                  =    0x00000909,
   CL_HEIGHT_MAP                 =    0x0000090a,
   CL_GRID                       =    0x0000090b,
-
-  // Particles
-  CL_PARTICLE_SYSTEM            =    0x00a01000,
-  CL_SPRITE_PARTICLES           =    0x00002000,
-  CL_SPARK_PARTICLES            =    0x00004000,
-  CL_PNODE_PARTICLES            =    0x00008000,
-  CL_DOT_PARTICLES              =    0x00010000,
-  CL_MODEL_PARTICLES            =    0x00020000,
-
-  CL_PARTICLE_EMITTER           =    0x00a02000,
-  CL_DOT_EMITTER                =    0x00000a21,
-  CL_PLANE_EMITTER              =    0x00000a22,
-  CL_BOX_EMITTER                =    0x00000a23,
-  CL_SPHERE_EMITTER             =    0x00000a24,
-  CL_MODEL_EMITTER              =    0x00000a25,
-
 
   CL_MATERIAL                   =    0x00000810,
@@ -298 +282 @@
   CL_LIGHTNING_BOLT             =    0x00000851,
 
+    // Particles
+  CL_PARTICLE_SYSTEM            =    0x00a01000,
+  CL_DOT_PARTICLES              =    0x00a02000,
+  CL_SPARK_PARTICLES            =    0x00a04000,
+  CL_SPRITE_PARTICLES           =    0x00a08000,
+  CL_MODEL_PARTICLES            =    0x00a10000,
+  //  CL_PNODE_PARTICLES            =    0x00a20000,
+
+
+  CL_PARTICLE_EMITTER           =    0x00a40000,
+  CL_DOT_EMITTER                =    0x00000a21,
+  CL_PLANE_EMITTER              =    0x00000a22,
+  CL_BOX_EMITTER                =    0x00000a23,
+  CL_SPHERE_EMITTER             =    0x00000a24,
+  //  CL_MODEL_EMITTER              =    0x00000a25,
+
   // Element2D's  (range from 0x00000b00 to 0x00000bff)
   /// GL-GUI
-  CL_GLGUI_WIDGET               =    0x00b00000,
-  CL_GLGUI_BUTTON               =    0x00b01000,
+  CL_GLGUI_WIDGET               =    0x00b01000,
+  CL_GLGUI_BUTTON               =    0x00b02000,
   CL_GLGUI_PUSHBUTTON           =    0x00000b03,
   CL_GLGUI_CHECKBUTTON          =    0x00000b04,
   CL_GLGUI_RADIOBUTTON          =    0x00000b05,
-  CL_GLGUI_CONTAINER            =    0x00b02000,
+  CL_GLGUI_CONTAINER            =    0x00b04000,
   CL_GLGUI_BOX                  =    0x00000b07,
   CL_GLGUI_FRAME                =    0x00000b08,