Changeset 6142 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/world_entities/world_entity.cc (modified) (4 diffs)

trunk/src/world_entities/world_entity.cc

@@ -53 +53 @@
 
   this->setVisibiliy(true);
+
+  this->objectListNumber = OM_INIT;
+  this->objectListIterator = NULL;
+
+  this->toList(OM_NULL);
 }
 
@@ -67 +72 @@
   for (unsigned int i = 0; i < this->models.size(); i++)
     this->setModel(NULL, i);
+
+  State::getObjectManager()->toList(this, OM_INIT);
 }
 
@@ -95 +102 @@
 {
   if (fileName != NULL)
-  { 
+  {
     // search for the special character # in the LoadParam
     if (strchr(fileName, '#') != NULL)
       {
-        PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
-        char* lodFile = new char[strlen(fileName)+1];
-        strcpy(lodFile, fileName);
-        char* depth = strchr(lodFile, '#');
-        for (unsigned int i = 0; i < 5; i++)
-          {
-            *depth = 48+(int)i;
-            printf("-------%s\n", lodFile);
-            if (ResourceManager::isInDataDir(lodFile))
-              this->loadModel(lodFile, scaling, i);
-          }
-        return;
+        PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
+        char* lodFile = new char[strlen(fileName)+1];
+        strcpy(lodFile, fileName);
+        char* depth = strchr(lodFile, '#');
+        for (unsigned int i = 0; i < 5; i++)
+          {
+            *depth = 48+(int)i;
+            printf("-------%s\n", lodFile);
+            if (ResourceManager::isInDataDir(lodFile))
+              this->loadModel(lodFile, scaling, i);
+          }
+        return;
       }
 
@@ -174 +181 @@
   }
 }
+
+/**
+ * @brief moves this entity to the List OM_List
+ * @param list the list to set this Entity to.
+ *
+ * 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)
+{
+  State::getObjectManager()->toList(this, list);
+}
+