Changeset 6969 in orxonox.OLD

Timestamp:

Feb 1, 2006, 7:43:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new ModelEntity (renamed)

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/environments/model_entity.cc (moved) (moved from trunk/src/world_entities/environments/movie_entity.cc)
• world_entities/environments/model_entity.h (moved) (moved from trunk/src/world_entities/environments/movie_entity.h)

trunk/src/defs/class_id.h

@@ -209 +209 @@
 
   // misc
-  CL_MOVIE_ENTITY               =    0x00000410,
-  CL_RECORDER                   =    0x00000411,
-
-  CL_IMAGE_ENTITY               =    0x00000412,
-  CL_BILLBOARD                  =    0x00000413,
+  CL_MOVIE_ENTITY               =    0x00000511,
+  CL_RECORDER                   =    0x00000512,
+
+  CL_IMAGE_ENTITY               =    0x00000513,
+  CL_BILLBOARD                  =    0x00000514,
+  CL_MODEL_ENTITY               =    0x00000515,
 
 

trunk/src/world_entities/Makefile.am

@@ -60 +60 @@
                   world_entities/spawning_point.cc \
                   \
-                  world_entities/environments/water.cc
+                  world_entities/environments/water.cc \
+                  world_entities/environments/model_entity.cc
 
 WorldEntities_HEADERS_ = \
@@ -114 +115 @@
                  world_entities/spawning_point.h \
                  \
-                 world_entities/environments/water.h
+                 world_entities/environments/water.h \
+                 world_entities/environments/model_entity.h