Changeset 3810 in orxonox.OLD

Timestamp:

Apr 13, 2005, 10:38:39 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: changed pnode interface of setRelCoor and setRelDir

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (1 diff)
• defs/stdincl.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (10 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• story_entities/world.cc (modified) (5 diffs)
• world_entities/weapon.cc (modified) (1 diff)

orxonox/trunk/src/camera.cc

@@ -143 +143 @@
     {
       tmpPos = tmpPos + *this->getRelCoor();
-      this->setRelCoor(&tmpPos);
+      this->setRelCoor(tmpPos);
     }
 }

orxonox/trunk/src/defs/stdincl.h

@@ -32 +32 @@
 /* performance tweaking stuff */
 #ifdef __unix__
- #include <glib-2.0/glib/gmacros.h>
- #define __LIKELY_IF(condition)  if( G_LIKELY(condition))
- #define __UNLIKELY_IF(condition) if( G_UNLIKELY(condition))
+ #include <linux/compiler.h>
+ #define __LIKELY_IF(condition)  if( likely(condition))
+ #define __UNLIKELY_IF(condition) if( unlikely(condition))
 #else
  #define __LIKELY_IF(condition)  if( condition)

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

@@ -115 +115 @@
 }
 
-/**
-   \brief deletes the hole pnode tree
-
-   cleans up all pnodes
-*/
-/*
-void PNode::destroy ()
-{
-  PNode* pn = this->children->enumerate();
-  while( pn != NULL) 
-    { 
-      pn->destroy ();
-      pn = this->children->nextElement();
-    } 
-  // this deletes all children in the list 
-  this->children->destroy ();
-
-  static_cast<BaseObject*>(this)->destroy();
-}
-*/
+
 
 /**
@@ -155 +136 @@
    has changed and won't update the children Nodes.
 */
+/*
 void PNode::setRelCoor (Vector* relCoord)
 {
@@ -160 +142 @@
   *this->relCoordinate = *relCoord;
 }
+*/
 
 
@@ -170 +153 @@
    has changed and won't update the children Nodes.
 */
-void PNode::setRelCoor (Vector relCoord)
+void PNode::setRelCoor (const Vector& relCoord)
 {
   this->bRelCoorChanged = true;
@@ -302 +285 @@
    has changed and won't update the children Nodes.
 */
+/*
 void PNode::setRelDir (Quaternion* relDir)
 {
@@ -307 +291 @@
   *this->relDirection = *relDir;
 }
-
-
-void PNode::setRelDir (Quaternion relDir)
+*/
+
+
+void PNode::setRelDir (const Quaternion& relDir)
 {
   this->bRelCoorChanged = true;
@@ -332 +317 @@
    has changed and won't update the children Nodes.
 */
+/*
 void PNode::setAbsDir (Quaternion* absDir)
 {
@@ -337 +323 @@
   *this->absDirection = *absDir;
 }
+*/
 
 
@@ -348 +335 @@
    has changed and won't update the children Nodes.
 */
-void PNode::setAbsDir (Quaternion absDir)
+void PNode::setAbsDir (const Quaternion& absDir)
 {
   this->bAbsDirChanged = true;
@@ -405 +392 @@
    \todo implement this
 */
-void PNode::shiftDir (Quaternion shift)
+/*
+void PNode::shiftDir (Quaternion* shift)
 {}
+*/
 
 

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

@@ -58 +58 @@
 
   inline Vector* getRelCoor () const { return this->relCoordinate; }
-  void setRelCoor (Vector* relCoord);
-  void setRelCoor (Vector relCoord);
+  void setRelCoor (const Vector& relCoord);
   inline Vector getAbsCoor () const { return *this->absCoordinate; }
-  //void setAbsCoor (Vector* absCoord);
   void setAbsCoor (const Vector& absCoord);
   void shiftCoor (Vector* shift);
   void shiftCoor (const Vector& shift);
-  //void shiftCoor (Vector shift);
 
   inline Quaternion getRelDir () const { return *this->relDirection; }
-  void setRelDir (Quaternion* relDir);
-  void setRelDir (Quaternion relDir);
+  //void setRelDir (Quaternion* relDir);
+  void setRelDir (const Quaternion& relDir);
   inline Quaternion getAbsDir () const { return *this->absDirection; }
-  void setAbsDir (Quaternion* absDir);
-  void setAbsDir (Quaternion absDir);
+  //void setAbsDir (Quaternion* absDir);
+  void setAbsDir (const Quaternion& absDir);
+  //void shiftDir (Quaternion* shift);
   void shiftDir (const Quaternion& shift);
-  void shiftDir (Quaternion shift);
 
   float getSpeed() const;

orxonox/trunk/src/story_entities/world.cc

@@ -464 +464 @@
             WorldEntity* baseNode = new Satellite(Vector(1,0,1), 1.2);
             this->localPlayer->addChild(baseNode);
-            baseNode->setRelCoor(new Vector(10.0, 2.0, 1.0));
+            baseNode->setRelCoor(Vector(10.0, 2.0, 1.0));
             this->spawn(baseNode);
 
             WorldEntity* secondNode = new Satellite(Vector(0,0,1), 2.0);
             baseNode->addChild(secondNode);
-            secondNode->setRelCoor(new Vector(0.0, 0.0, 3.0));
+            secondNode->setRelCoor(Vector(0.0, 0.0, 3.0));
             this->spawn(secondNode);
 
@@ -475 +475 @@
             WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 1.0);
             secondNode->addChild(thirdNode);
-            thirdNode->setRelCoor(new Vector(2.0, 0.0, 0.0));
+            thirdNode->setRelCoor(Vector(2.0, 0.0, 0.0));
             this->spawn(thirdNode);
 
@@ -483 +483 @@
             WorldEntity* b = new Environment();
             this->localPlayer->addChild(b);
-            b->setRelCoor(new Vector(10.0, 1.0, 1.0));
+            b->setRelCoor(Vector(10.0, 1.0, 1.0));
             this->spawn(b);
 
@@ -489 +489 @@
             WorldEntity* c = new Environment();
             this->localPlayer->addChild(c);
-            c->setRelCoor(new Vector(10.0, 2.0, -1.0));
+            c->setRelCoor(Vector(10.0, 2.0, -1.0));
             this->spawn(c);
             
@@ -576 +576 @@
 
   terrain = new Terrain("../data/worlds/newGround.obj");
-  terrain->setRelCoor(new Vector(0,-10,0));
+  terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -38 +38 @@
 {
   parent->addChild(this, PNODE_ALL);
-  this->setRelCoor(coordinate);
-  this->setRelDir(direction);
+  this->setRelCoor(*coordinate);
+  this->setRelDir(*direction);
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();