Changeset 4444 in orxonox.OLD for orxonox

Timestamp:

Jun 1, 2005, 10:17:14 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: setMode → setParentMode

Location:

orxonox/trunk/src

Files:

• lib/coord/null_parent.cc (modified) (2 diffs)
• lib/coord/p_node.cc (modified) (8 diffs)
• lib/coord/p_node.h (modified) (2 diffs)
• story_entities/world.cc (modified) (4 diffs)
• util/track/track_node.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/skysphere.cc (modified) (1 diff)

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

@@ -26 +26 @@
 NullParent* NullParent::getInstance ()
 {
-  if(!singletonRef)
-    singletonRef = new NullParent ();
-  return singletonRef;
+  if(!NullParent::singletonRef)
+    NullParent::singletonRef = new NullParent ();
+  return NullParent::singletonRef;
 }
 
@@ -35 +35 @@
   this->setName("NullParent");
   this->setClassID(CL_NULL_PARENT, "NullParent");
-  singletonRef = this;
-  this->setMode(PNODE_ALL);
+  NullParent::singletonRef = this;
+  this->setParentMode(PNODE_ALL);
 }
 

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

@@ -52 +52 @@
 {
   this->init(NULL);
+  this->loadParams(root);
+  
   NullParent::getInstance()->addChild(this);
 }
@@ -291 +293 @@
    use this to add a child to this node.
 */
-void PNode::addChild (PNode* pNode, int parentingMode)
+void PNode::addChild (PNode* pNode, int parentMode)
 {
   if( likely(pNode->parent != NULL))
@@ -298 +300 @@
       pNode->parent->children->remove(pNode);
     }
-  pNode->mode = parentingMode;
+  pNode->parentMode = parentMode;
   pNode->parent = this;
   this->children->add(pNode);
@@ -332 +334 @@
   while( pn != NULL) 
     { 
-      nullParent->addChild(pn, pn->getMode());
+      nullParent->addChild(pn, pn->getParentMode());
       pn = iterator->nextElement();
     }
@@ -354 +356 @@
    \param mode the mode of the bind-type.
 */
-void PNode::setMode (int parentingMode)
-{
-  this->mode = parentingMode;
-}
-
-
-/**
-   \brief gets the mode of this parent manualy
-   \return the mode of the bind-type.
-*/
-int PNode::getMode() const
-{
-  return this->mode;
+void PNode::setParentMode (unsigned int parentMode)
+{
+  this->parentMode = parentMode;
 }
 
@@ -415 +407 @@
 
 
-      if( likely(this->mode & PNODE_MOVEMENT))
+      if( likely(this->parentMode & PNODE_MOVEMENT))
         {
           if( unlikely(this->bAbsCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -437 +429 @@
         }
   
-      if( this->mode & PNODE_LOCAL_ROTATE)
+      if( this->parentMode & PNODE_LOCAL_ROTATE)
         {
           if( unlikely(this->bAbsDirChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -451 +443 @@
         }
   
-      if( this->mode & PNODE_ROTATE_MOVEMENT)
+      if( this->parentMode & PNODE_ROTATE_MOVEMENT)
         {
           if( unlikely(this->bAbsCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)

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

@@ -88 +88 @@
 
   void setParent (PNode* parent);
-  void setMode (int parentingMode);
-  int getMode() const;
+  void setParentMode (unsigned int parentingMode);
+  int getParentMode() const { return this->parentMode; };
 
   void update (float dt);
@@ -122 +122 @@
   tList<PNode>*   children;           //!< list of the children
 
-  unsigned int    mode;               //!< the mode of the binding
+  unsigned int    parentMode;         //!< the mode of the binding
 };
 

orxonox/trunk/src/story_entities/world.cc

@@ -447 +447 @@
   tn->addChild(this->localCamera);
   localCamera->lookAt(tn);
-  localCamera->setMode(PNODE_MOVEMENT);
-  this->localPlayer->setMode(PNODE_ALL);
+  localCamera->setParentMode(PNODE_MOVEMENT);
+  this->localPlayer->setParentMode(PNODE_ALL);
   Vector* cameraOffset = new Vector (0, 5, -10);
   trackManager->condition(2, LEFTRIGHT, this->localPlayer);
@@ -625 +625 @@
         this->spawn(this->sky);
         this->localCamera->addChild(this->sky);
-        this->sky->setMode(PNODE_MOVEMENT);
+        this->sky->setParentMode(PNODE_MOVEMENT);
         /*monitor progress*/
         this->glmis->step();
@@ -659 +659 @@
         
         tn->addChild(this->localCamera);
-        this->localPlayer->setMode(PNODE_ALL);
+        this->localPlayer->setParentMode(PNODE_ALL);
         trackManager->condition(2, LEFTRIGHT, this->localPlayer);
         */
@@ -1143 +1143 @@
       entity->setRelCoor (*relCoor);
       entity->setRelDir (*relDir);
-      entity->setMode(parentingMode);
+      entity->setParentMode(parentingMode);
       
       this->entities->add (entity);

orxonox/trunk/src/util/track/track_node.cc

@@ -37 +37 @@
   NullParent::getInstance()->addChild(this);
   this->trackManager = TrackManager::getInstance();
-  this->setMode(PNODE_ALL);
-}
-
-
-TrackNode::TrackNode (const Vector& absCoordinate)
-{
-  this->trackManager = TrackManager::getInstance();
-  this->setMode(PNODE_ALL);
-  this->setAbsCoor(absCoordinate);
+  this->setParentMode(PNODE_ALL);
 }
 

orxonox/trunk/src/world_entities/camera.cc

@@ -229 +229 @@
 {
   this->setClassID(CL_CAMERA_TARGET, "CameraTarget");
-  this->setMode(PNODE_MOVEMENT);
+  this->setParentMode(PNODE_MOVEMENT);
 }
 

orxonox/trunk/src/world_entities/skybox.cc

@@ -45 +45 @@
 }
 
+/**
+   \brief initializes a skybox from a XmlElement
+*/
 SkyBox::SkyBox(const TiXmlElement* root)
 {
@@ -75 +78 @@
       this->material[i]->setAmbient(2.0, 2.0, 2.0);
     }
-  this->setMode(PNODE_MOVEMENT);
+  this->setParentMode(PNODE_MOVEMENT);
 }
 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -68 +68 @@
   PRINTF(1)("initializing the Skysphere with Material %s.\n", fileName);
   this->sphereObj = gluNewQuadric();
-  this->setMode(PNODE_MOVEMENT);
+  this->setParentMode(PNODE_MOVEMENT);
 
   gluQuadricTexture(this->sphereObj, GL_TRUE);