Changeset 7919 in orxonox.OLD for trunk/src/lib/graphics/render2D/element_2d.cc

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/lib/graphics/render2D/element_2d.cc (modified) (4 diffs)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -62 +62 @@
   this->toCoordinate = NULL;
   this->toDirection = NULL;
+
+  this->size = Vector2D(0,0);
   this->toSize = NULL;
-  this->setSize2D(1, 1);
 
 
@@ -448 +449 @@
   this->relCoordinate += shift;
   this->bRelCoorChanged = true;
-
 }
 
@@ -847 +847 @@
     if (unlikely(this->toSize != NULL))
     {
-      Vector2D shiftSize = (*this->toSize - Vector2D(this->sizeX, this->sizeY)) *fabsf(dt)*bias;
+      Vector2D shiftSize = (*this->toSize - this->size) *fabsf(dt)*bias;
       if (likely((shiftSize).len() >= .001))//PNODE_ITERATION_DELTA))
       {
-        this->sizeX += shiftSize.x;
-        this->sizeY += shiftSize.y;
+        this->size += shiftSize;
       }
       else
@@ -1109 +1108 @@
   if (level == 0)
     glPopAttrib();
-
 }