Changeset 3306 in orxonox.OLD

Timestamp:

Dec 30, 2004, 12:32:43 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: modified function passing routines - now having two lists: parenting list (tree) and entity list (array), that coexist - this is the only possibility to keep oversight.

Location:

orxonox/branches/parenting/src

Files:

• null_parent.cc (modified) (1 diff)
• world.cc (modified) (6 diffs)
• world.h (modified) (1 diff)

orxonox/branches/parenting/src/null_parent.cc

@@ -64 +64 @@
   this->absCoordinate = this->relCoordinate;
   this->absDirection = parent->getAbsDir () * this->relDirection;
-    
   
   PNode* pn = this->children->enumerate ();

orxonox/branches/parenting/src/world.cc

@@ -257 +257 @@
   
   //Berechnung von normalen Vektoren
-
+  
   for(int i=1;i<sizeX-2;i+=1)
     for(int j=1;j<sizeY-2 ;j+=1)
@@ -454 +454 @@
   WorldEntity* entity;
   
-  ((WorldEntity*)this->nullParent)->processDraw ();
-
-  /*
+  //((WorldEntity*)this->nullParent)->processDraw ();
+
+  
   entity = this->entities->enumerate();
   while( entity != NULL ) 
@@ -463 +463 @@
       entity = this->entities->nextElement();
     }
-  */
+  
   
   // draw debug coord system
@@ -540 +540 @@
   
   this->nullParent->update (seconds);
-  this->nullParent->processTick (seconds);
+  //this->nullParent->processTick (seconds);
 
   entity = entities->enumerate(); 
@@ -791 +791 @@
 void World::spawn(WorldEntity* entity)
 {
-  Location zeroloc;
-  Location* loc = NULL;
-  WorldEntity* owner;
-
-  if( this->nullParent != NULL)
+  if( this->nullParent != NULL && entity->parent == NULL)
     this->nullParent->addChild (entity);
 
-  /*
-  entities->add (entity);
-  zeroloc.dist = 0;
-  zeroloc.part = 0;
-  zeroloc.pos = Vector();
-  zeroloc.rot = Quaternion();
-  loc = &zeroloc;
-  entity->init (loc, owner);
-  if (entity->bFree)
-    {
-      this->track[loc->part].mapCoords( loc, entity->getPlacement());
-    }
-  */
+  this->entities->add (entity);
+
   entity->postSpawn ();
 }
@@ -820 +805 @@
    \param location where to add
 */
-void World::spawn(WorldEntity* entity, Location* loc)
-{
-  if( this->nullParent != NULL)
+void World::spawn(WorldEntity* entity, Vector* absCoor, Quaternion* absDir)
+{
+  entity->setAbsCoor (absCoor);
+  entity->setAbsDir (absDir);
+  
+  if( this->nullParent != NULL && entity->parent == NULL)
     this->nullParent->addChild (entity);
 
-  //Location zeroLoc;
-  WorldEntity* owner;
   this->entities->add (entity);
-  /*
-  if( loc == NULL)
-    {
-      zeroLoc.dist = 0;
-      zeroLoc.part = 0;
-      zeroLoc.pos = Vector();
-      zeroLoc.rot = Quaternion();
-      loc = &zeroLoc;
-    }
-  */
-  //entity->init (loc, owner);
-  /*
-  if (entity->bFree)
-    {
-      this->track[loc->part].mapCoords( loc, entity->getPlacement());
-    }
-  */
+
   entity->postSpawn ();
-  //return entity;
-}
-
-
-/**
-   \brief add and spawn a new entity to this world
-   \param entity to be added
-   \param place where to be added
-*/
-void World::spawn(WorldEntity* entity, Placement* plc)
-{
-  if( this->nullParent != NULL)
-    this->nullParent->addChild (entity);
-
-  /*
-  Placement zeroPlc;
-  WorldEntity* owner;
-  if( plc == NULL)
-    {
-      zeroPlc.r = Vector();
-      zeroPlc.w = Quaternion();
-      plc = &zeroPlc;
-    }
-  */
-  this->entities->add (entity);
-  //entity->init (plc, owner);
-  entity->postSpawn ();
-  //return entity;
-}
+}
+
 
 

orxonox/branches/parenting/src/world.h

@@ -54 +54 @@
 
   void spawn (WorldEntity* entity);
-  void spawn (WorldEntity* entity, Location* loc);
-  void spawn (WorldEntity* entity, Placement* plc);
+  void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
 
   tList<WorldEntity>* entities;