Changeset 6122 in orxonox.OLD

Timestamp:

Dec 15, 2005, 1:47:28 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/objectManager: pack some entities to default lists

Location:

branches/objectmanager/src

Files:

• util/object_manager.cc (modified) (3 diffs)
• world_entities/skysphere.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

branches/objectmanager/src/util/object_manager.cc

@@ -133 +133 @@
   if (omList != OM_INIT || omList == OM_SIZE)
   {
-    PRINT(0)(" +ObjectManager-LIST: '%s'-size='%d'-----\n", ObjectManager::OMListToString((OM_LIST) omList), this->objectLists[omList].size());
+    PRINT(0)(" +ObjectManager-LIST: '%s'-size='%d'-----\n", ObjectManager::OMListToString((OM_LIST)omList), this->objectLists[omList].size());
     if (level > 1)
     {
@@ -178 +178 @@
     return "===invalid===";
 
+  printf("%d\n", omList);
   return ObjectManager::objectManagerListNames[omList];
 }
@@ -205 +206 @@
     "null",
     "dead",
-    "dead-tick"
+    "dead-tick",
     "environ-notick",
     "environ",

branches/objectmanager/src/world_entities/skysphere.cc

@@ -42 +42 @@
 {
   this->setClassID(CL_SKYSPHERE, "SkySphere");
-
+  this->toList(OM_ENVIRON_NOTICK);
   if (fileName == NULL)
     this->initialize("pictures/sky-replace.jpg");

branches/objectmanager/src/world_entities/terrain.cc

@@ -93 +93 @@
 {
   this->setClassID(CL_TERRAIN, "Terrain");
+  this->toList(OM_ENVIRON_NOTICK);
 
   this->objectList = 0;

branches/objectmanager/src/world_entities/test_entity.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_TEST_ENTITY, "TestEntity");
+  // TO SOME LIST!!
 
   this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");

branches/objectmanager/src/world_entities/world_entity.cc

@@ -188 +188 @@
  * this is the same as a call to State::getObjectManager()->toList(entity , list);
  * directly, but with an easier interface.
+ *
+ * @todo inline this (peut etre)
  */
 void WorldEntity::toList(OM_LIST list)