Changeset 5381 in orxonox.OLD for branches/2d-recalc/src/lib/graphics/render2D/element_2d.cc

Timestamp:

Oct 15, 2005, 7:13:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/2d-recalc: some recalculations.. do not know it i will continue with this, as has certain disadvantages over the old approach… maybe later

File:

• branches/2d-recalc/src/lib/graphics/render2D/element_2d.cc (modified) (11 diffs)

branches/2d-recalc/src/lib/graphics/render2D/element_2d.cc

@@ -111 +111 @@
   this->setActiveness(true);
   this->setAlignment(E2D_ALIGN_NONE);
-  this->layer = E2D_TOP;
+  this->layer = E2D_DEFAULT_LAYER;
   this->bindNode = NULL;
 
@@ -254 +254 @@
 /**
  * sets a node, this 2D-Element should be shown upon
- * @param bindNode the name of the Node (should be existing)
+ * @param bindNode the name of the Node (should already be existing)
  */
 void Element2D::setBindNode(const char* bindNode)
@@ -280 +280 @@
 
 /**
- * sets the relative coordinate of the Element2D to its Parent
- * @param x the x coordinate
- * @param y the y coordinate
- * @param z the z coordinate
- */
-void Element2D::setRelCoor2D (float x, float y, float z)
-{
-  this->setRelCoor2D(Vector(x,y,z));
-}
-
-/**
  * sets the Relative coordinate to the parent in Pixels
  * @param x the relCoord X
@@ -299 +288 @@
   this->setRelCoor2D(Vector((float)x/(float)GraphicsEngine::getInstance()->getResolutionX(),
                      (float)y/(float)GraphicsEngine::getInstance()->getResolutionY(),
-                     0
-                           ));
+                     0 ));
 }
 
@@ -332 +320 @@
 
 /**
- * set relative coordinates smoothely
- * @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::setRelCoorSoft (const Vector&, float)
- */
-void Element2D::setRelCoorSoft2D(float x, float y, float depth, float bias)
-{
-  this->setRelCoorSoft2D(Vector(x, y, depth), bias);
+ * @returns the Relative coordinate of the Element2D in pixels (as float-Vector)
+ */
+Vector Element2D::getRelCoor2Dpx() const
+{
+  return Vector(this->prevRelCoordinate.x * (float)GraphicsEngine::getInstance()->getResolutionX(),
+                this->prevRelCoordinate.y * (float)GraphicsEngine::getInstance()->getResolutionY(),
+                0);
 }
 
@@ -374 +360 @@
 
 /**
- * @param x x-coordinate.
- * @param y y-coordinate.
- * @param z z-coordinate.
- * @see void PNode::setAbsCoor (const Vector& absCoord)
- */
-void Element2D::setAbsCoor2D (float x, float y, float depth)
-{
-  this->setAbsCoor2D(Vector(x, y, depth));
-}
-
-/**
  * @param x x-coordinate in Pixels
  * @param y y-coordinate in Pixels
@@ -398 +373 @@
 
 /**
+ * @returns the absolute coordinate of the Element2D in pixels (as float-Vector)
+ */
+Vector Element2D::getAbsCoor2Dpx() const
+{
+  return Vector(this->absCoordinate.x * (float)GraphicsEngine::getInstance()->getResolutionX(),
+                this->absCoordinate.y * (float)GraphicsEngine::getInstance()->getResolutionY(),
+                0);
+}
+
+/**
  *  shift coordinate ralative
  * @param shift shift vector
@@ -407 +392 @@
   this->relCoordinate += shift;
   this->bRelCoorChanged = true;
-
 }
 
@@ -684 +668 @@
     PRINTF(5)("Element2D::update - %s - (%f, %f, %f)\n", this->getName(), this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
 
-
+    // update the direction
     if( this->parentMode & E2D_PARENT_LOCAL_ROTATE && this->bRelDirChanged)
     {
-      /* update the current absDirection - remember * means rotation around sth.*/
       this->prevRelDirection = this->relDirection;
       this->absDirection = this->relDirection + parent->getAbsDir2D();;
     }
-
 
     if (this->alignment == E2D_ALIGN_SCREEN_CENTER && this->bRelCoorChanged)
@@ -700 +682 @@
       this->absCoordinate.z = 0.0;
     }
-    else if (this->bindNode)
+    // align at the bindNode.
+    else if (unlikely(this->bindNode != NULL))
     {
       GLdouble projectPos[3];
@@ -715 +698 @@
       this->absCoordinate.y = projectPos[1]/(float)GraphicsEngine::getInstance()->getResolutionY() + this->relCoordinate.y;
       this->absCoordinate.z = projectPos[2] + this->relCoordinate.z;
+      //! @todo check for corectness.
+      //       printf("%f, %f, %f\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
     }
     else