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

Timestamp:

Mar 12, 2005, 8:45:59 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: parenting revisited. fixed some bugs some missunderstandings. made it a little more secure to use. still dev

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (3 diffs)
• world.h (modified) (3 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -22 +22 @@
 #include "camera.h"
 #include "environment.h"
+#include "primitive.h"
 #include "p_node.h"
 #include "null_parent.h"
@@ -232 +233 @@
             this->glmis->step();
 
+            
+            WorldEntity* env = new Environment();
+            env->setName ("env");
+            this->spawn(env);
+            this->trackManager->setBindSlave(env);
+
             Vector* es = new Vector (50, 2, 0);
             Quaternion* qs = new Quaternion ();
-            WorldEntity* env = new Environment();
-            env->setName ("env");
-            this->spawn(env, es, qs);
-           
+            WorldEntity* pr = new Primitive(PSPHERE);
+            pr->setName("primitive");
+            this->spawn(pr, this->localPlayer, es, qs, ROTATION);
+            
+
             /*monitor progress*/
             this->glmis->step();
-
-            trackManager->setBindSlave(env);
 
             break;
@@ -896 +902 @@
 
 
+/**
+   \brief add and spawn a new entity to this world
+   \param entity to be added
+   \param entity to be added to (PNode)
+   \param At what relative  coordinates to add this entity.
+   \param In which relative direction should it look.
+*/
+void World::spawn(WorldEntity* entity, PNode* parentNode, 
+                  Vector* relCoor, Quaternion* relDir, 
+                  parentingMode mode)
+{
+
+  if( parentNode != NULL && entity->parent == NULL)
+    {
+      parentNode->addChild (entity);
+      
+      entity->setRelCoor (relCoor);
+      entity->setRelDir (relDir);
+      
+      this->entities->add (entity);
+      
+      entity->postSpawn ();
+    }
+}
+
+
 
 /**

orxonox/trunk/src/story_entities/world.h

@@ -9 +9 @@
 #include "stdincl.h"
 #include "story_entity.h"
-
+#include "p_node.h"
 
 class TrackManager;
@@ -19 +19 @@
 class Light;
 class FontSet;
+
 
 //! The game world
@@ -51 +52 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
-
+  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir, 
+             parentingMode mode);