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

Timestamp:

Mar 7, 2006, 5:05:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new style for resources (prework/movement)

Location:

trunk/src/defs

Files:

• class_id.h (modified) (3 diffs)
• include_paths.am (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -84 +84 @@
   CL_WORLD_ENTITY               =    0x40000000,
 
-  CL_GRAPHICS_EFFECT            =    0x80000000,
-
+  CL_RESOURCE                   =    0x80000000,
 
   /// subsuper-classes
@@ -143 +142 @@
   CL_MOVIE_LOADER               =    0x00000109,
   CL_GAME_RULES                 =    0x00000110,          ///HACK: this is no story entity, bensch: to rebuild
-  CL_MULTIPLAYER_TEAM_DEATHMATCH =   0x00000111,          ///HACK: this is no story entity: it is a CL_GAME_RULES, bensch: to rebuild
+  CL_MULTIPLAYER_TEAM_DEATHMATCH=    0x00000111,          ///HACK: this is no story entity: it is a CL_GAME_RULES, bensch: to rebuild
 
   /// SUPER-PNodes
@@ -277 +276 @@
   CL_SHADER                     =    0x00000811,
   CL_LIGHT                      =    0x00000821,
-  CL_FOG_EFFECT                 =    0x00000841,
-  CL_LENSE_FLARE                =    0x00000842,
-  CL_EXPLOSION                  =    0x00000850,
-  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_GRAPHICS_EFFECT            =    0x00a01000,
+
+  CL_FOG_EFFECT                 =    0x00000a10,
+  CL_LENSE_FLARE                =    0x00000a12,
+  CL_EXPLOSION                  =    0x00000a20,
+  CL_LIGHTNING_BOLT             =    0x00000a21,
+
+
+  // Particles
+  CL_PARTICLE_SYSTEM            =    0x00a02000,
+  CL_DOT_PARTICLES              =    0x00000aa1,
+  CL_SPARK_PARTICLES            =    0x00000aa2,
+  CL_SPRITE_PARTICLES           =    0x00000aa3,
+  CL_MODEL_PARTICLES            =    0x00000aa4,
   //  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_PARTICLE_EMITTER           =    0x00a04000,
+  CL_DOT_EMITTER                =    0x00000ab1,
+  CL_PLANE_EMITTER              =    0x00000ab2,
+  CL_BOX_EMITTER                =    0x00000ab3,
+  CL_SPHERE_EMITTER             =    0x00000ab4,
   //  CL_MODEL_EMITTER              =    0x00000a25,
 

trunk/src/defs/include_paths.am

@@ -33 +33 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects