Changeset 7031 in orxonox.OLD

Timestamp:

Feb 4, 2006, 4:42:28 AM (18 years ago)

Author:

bensch

Message:

softed stuff

Location:

trunk/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (4 diffs)
• lib/graphics/render2D/element_2d.h (modified) (3 diffs)
• story_entities/simple_game_menu.cc (modified) (2 diffs)

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

@@ -55 +55 @@
   this->toCoordinate = NULL;
   this->toDirection = NULL;
+  this->toSize = NULL;
   this->setSize2D(1, 1);
 
@@ -221 +222 @@
 }
 
+void Element2D::setSizeSoft2D(float x, float y, float bias)
+{
+  if (likely(this->toSize == NULL))
+    this->toSize = new Vector2D();
+
+  *this->toSize = Vector2D(x,y);;
+  this->bias = bias;
+}
+
+
 
 /**
@@ -247 +258 @@
   this->bRelCoorChanged = true;
 }
-
 
 /**
@@ -798 +808 @@
       }
     }
+    if (unlikely(this->toSize != NULL))
+    {
+      Vector2D shiftSize = (*this->toSize - Vector2D(this->sizeX, this->sizeY)) *fabsf(dt)*bias;
+      if (likely((shiftSize).len() >= .001))//PNODE_ITERATION_DELTA))
+      {
+        this->sizeX += shiftSize.x;
+        this->sizeY += shiftSize.y;
+      }
+      else
+      {
+        delete this->toSize;
+        this->toSize = NULL;
+        PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
+      }
+    }
 
     // MAIN UPDATE /////////////////////////////////////

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

@@ -10 +10 @@
 
 #include "vector.h"
+#include "vector2D.h"
 #include <list>
 
@@ -124 +125 @@
 
     inline void setSize2D(float x, float y) { this->sizeX = x, this->sizeY = y; };
+    void setSizeSoft2D(float x, float y, float bias = 1.0);
     inline void setSizeX2D(float x) { this->sizeX = x; };
     inline void setSizeY2D(float y) { this->sizeY = y; };
@@ -234 +236 @@
     float                   sizeX;              //!< The size of the rendered item in x-direction
     float                   sizeY;              //!< The size of the rendered Item in y-direction
+    Vector2D*               toSize;             //!< The Size to iterate to.
 
     E2D_ALIGNMENT           alignment;          //!< How the Element is aligned around its Position

trunk/src/story_entities/simple_game_menu.cc

@@ -376 +376 @@
     {
       this->menuSelected = this->menuLayers[this->layerIndex].menuList[++this->menuSelectedIndex];
-      this->menuSelector->setAbsCoor2D(this->menuSelected->getAbsCoor2D() + Vector(0, this->menuSelected->getSizeY2D() *.5,0));
-      this->menuSelector->setSize(this->menuSelected->getSizeX2D(), this->menuSelected->getSizeY2D());
+      this->menuSelector->setAbsCoorSoft2D(this->menuSelected->getAbsCoor2D() + Vector(0, this->menuSelected->getSizeY2D() *.5,0), 3.0);
+      this->menuSelector->setSizeSoft2D(this->menuSelected->getSizeX2D(), this->menuSelected->getSizeY2D(), 3.0);
 
       if( this->layerIndex == 1)
@@ -391 +391 @@
     {
       this->menuSelected = this->menuLayers[this->layerIndex].menuList[--this->menuSelectedIndex];
-      this->menuSelector->setAbsCoor2D(this->menuSelected->getAbsCoor2D() + Vector(0, this->menuSelected->getSizeY2D() *.5,0));
-      this->menuSelector->setSize(this->menuSelected->getSizeX2D(), this->menuSelected->getSizeY2D());
+      this->menuSelector->setAbsCoorSoft2D(this->menuSelected->getAbsCoor2D() + Vector(0, this->menuSelected->getSizeY2D() *.5,0), 3.0);
+      this->menuSelector->setSizeSoft2D(this->menuSelected->getSizeX2D(), this->menuSelected->getSizeY2D(), 3.0);
 
       if( this->layerIndex == 1)