Changeset 4765 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jul 2, 2005, 2:23:41 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: addChild and setParentMode via XML-loading

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (2 diffs)
• world.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -1164 +1164 @@
 */
 void World::spawn(WorldEntity* entity, PNode* parentNode,
-                  Vector* relCoor, Quaternion* relDir,
-                  int parentingMode)
+                  Vector* relCoor, Quaternion* relDir)
 {
   this->nullParent = NullParent::getInstance();
@@ -1174 +1173 @@
       entity->setRelCoor (*relCoor);
       entity->setRelDir (*relDir);
-      entity->setParentMode(parentingMode);
 
       this->entities->add (entity);

orxonox/trunk/src/story_entities/world.h

@@ -90 +90 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
-  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir,
-             int parentingMode);
+  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir);
 
   const char* getPath();