Changeset 8761 in orxonox.OLD for trunk/src/defs/class_id.h

Timestamp:

Jun 24, 2006, 2:16:12 AM (18 years ago)

Author:

bensch

Message:

merged the new Font-Implementation back here
merged with svn merge ​https://svn.orxonox.net/orxonox/branches/fontdata . -r8752:HEAD
no conflicts, naturally

File:

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

trunk/src/defs/class_id.h

@@ -289 +289 @@
   /// Graphical stuff (range from 0x00000800 to 0x00000aff)
   /// SUPER-Textures
-  CL_TEXTURE                    =    0x00801000,
-  CL_TEXTURE_SEQUENCE           =    0x00802000,
-  CL_TEXT                       =    0x00804000,
+  CL_MATERIAL                   =    0x00801000,
+  CL_TEXTURE                    =    0x00802000,
+  CL_TEXTURE_SEQUENCE           =    0x00804000,
+  CL_TEXT                       =    0x00808000,
   CL_MULTI_LINE_TEXT            =    0x00000840,
   CL_LIMITED_WIDTH_TEXT         =    0x00000841,
@@ -315 +316 @@
   CL_BSP_MODEL                  =    0x0000090c, //!FIXME
 
-  CL_MATERIAL                   =    0x00000810,
   CL_SHADER                     =    0x00000811,
   CL_LIGHT                      =    0x00000821,