Changeset 3537 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 14, 2005, 12:12:12 AM (20 years ago)

Author:

patrick

Message:

orxonox/trank: worked on removing alg. from pnode and changed a little on camera for the new tackmanager

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (1 diff)
• lib/coord/p_node.cc (modified) (3 diffs)
• lib/coord/p_node.h (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/primitive.cc (modified) (1 diff)

orxonox/trunk/src/camera.cc

@@ -171 +171 @@
         {
           //FIXME: camera should be made via relative coordinates
-          Vector* cameraOffset = new Vector (-10, 5, 0);
-          this->setRelCoor (cameraOffset);
+
         } 
       else

orxonox/trunk/src/lib/coord/p_node.cc

@@ -334 +334 @@
 void PNode::removeChild (PNode* pNode)
 {
+  /*
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      this->removeChild(pn);
+      np->addChild(pn, pn->getMode());
+      pn = this->children->nextElement();
+    }
+
+  */
+
   this->children->remove (pNode);
   pNode->parent = NULL;
@@ -340 +351 @@
 
 /**
+   \brief remove this pnode from the tree and adds all following to NullParent
+
+   this can be the case, if an entity in the world is been destroyed.
+*/
+void PNode::remove()
+{
+  NullParent* np = NullParent::getInstance();
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      this->children->remove(pn);
+      np->addChild(pn, pn->getMode());
+      pn = this->children->nextElement();
+    }
+}
+
+
+/**
    \brief sets the parent of this PNode
    \param parent the Parent to set
@@ -356 +385 @@
 {
   this->mode = mode;
+}
+
+
+/**
+   \brief gets the mode of this parent manualy
+   \return the mode of the bind-type.
+*/
+parentingMode PNode::getMode()
+{
+  return this->mode;
 }
 

orxonox/trunk/src/lib/coord/p_node.h

@@ -45 +45 @@
   tList<PNode>* children;   //!< list of the children
 
-  parentingMode mode;       //!< the mode of the binding
+
 
   Vector getRelCoor ();
@@ -65 +65 @@
   void addChild (PNode* pNode, parentingMode mode);
   void removeChild (PNode* pNode);
+  void remove();
+
+
   void setParent (PNode* parent);
   void parentCoorChanged ();
   void parentDirChanged ();
   void setMode (parentingMode mode);
+  parentingMode getMode();
 
   virtual void update (float timeStamp);
@@ -95 +99 @@
   Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
 
+  parentingMode mode;       //!< the mode of the binding
+
 };
 

orxonox/trunk/src/story_entities/world.cc

@@ -219 +219 @@
             this->localCamera->setName ("camera");
             this->localCamera->bind (myPlayer);
-            this->localPlayer->addChild (this->localCamera);
             /*monitor progress*/
             this->glmis->step();            
@@ -248 +247 @@
             //      trackManager->setBindSlave(env);
             TrackNode::getInstance()->addChild(myPlayer);
-            localCamera->setParent(TrackNode::getInstance());
+            //localCamera->setParent(TrackNode::getInstance());
+            this->localPlayer->addChild (this->localCamera);
+            Vector* cameraOffset = new Vector (0, 5, -10);
+            this->localCamera->setRelCoor (cameraOffset);
             trackManager->condition(1, NEAREST, myPlayer);
 

orxonox/trunk/src/world_entities/primitive.cc

@@ -51 +51 @@
   Vector v(0.0, 0.0, 1.0);
   Quaternion q(10.0, v);
-  this->relDirection = this->relDirection * q;
+  //this->relDirection = this->relDirection * q;
 }