Changeset 4610 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 12, 2005, 11:48:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: 1. timestep different, now the game runs smoother on my laptop…. with this we have to play around some

2. implemented PNode::abs-coor, rel-coor for loading

Location:

orxonox/trunk/src

Files:

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

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

@@ -117 +117 @@
 {
   static_cast<BaseObject*>(this)->loadParams(root);
+
+  LoadParam<PNode>(root, "abs-coor", this, &PNode::setAbsCoor)
+      .describe("Sets The absolute Position of the Node.");
+
+  LoadParam<PNode>(root, "rel-coor", this, &PNode::setRelCoor)
+      .describe("Sets The relative position of the Node to its parent.");
 }
 
@@ -134 +140 @@
 
 /**
+   \brief set relative coordinates
+   \param x x-relative coordinates to its parent
+   \param y y-relative coordinates to its parent
+   \param z z-relative coordinates to its parent
+   \see  void PNode::setRelCoor (const Vector& relCoord)
+*/
+void PNode::setRelCoor (float x, float y, float z)
+{
+  this->setRelCoor(Vector(x, y, z));
+}
+
+/**
    \param absCoord set absolute coordinate
 
@@ -144 +162 @@
   this->bAbsCoorChanged = true;
   this->absCoordinate = absCoord;
+}
+
+/**
+ * \param x x-coordinate.
+ * \param y y-coordinate.
+ * \param z z-coordinate.
+ * \see void PNode::setAbsCoor (const Vector& absCoord)
+ */
+void PNode::setAbsCoor(float x, float y, float z)
+{
+  this->setAbsCoor(Vector(x, y, z));
 }
 

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

@@ -56 +56 @@
 
   void setRelCoor (const Vector& relCoord);
+  void setRelCoor (float x, float y, float z);
   /** \returns the relative position */
   inline const Vector& getRelCoor () const { return this->relCoordinate; };
   void setAbsCoor (const Vector& absCoord);
+  void setAbsCoor (float x, float y, float z);
   /** \returns the absolute position */
   inline const Vector& getAbsCoor () const { return this->absCoordinate; };

orxonox/trunk/src/story_entities/world.cc

@@ -1025 +1025 @@
       this->dt = currentFrame - this->lastFrame;
 
-      if( this->dt > 0)
+      if( this->dt > 10)
         {
           float fps = 1000/dt;
@@ -1039 +1039 @@
           */
           PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
-          SDL_Delay(10);
+          SDL_Delay(10-dt);
           this->dt = 10;
         }