Changeset 7063 in orxonox.OLD

Timestamp:

Feb 6, 2006, 10:12:34 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: better MenuSelector

Location:

trunk/src/story_entities

Files:

• simple_game_menu.cc (modified) (4 diffs)
• simple_game_menu.h (modified) (1 diff)

trunk/src/story_entities/simple_game_menu.cc

@@ -207 +207 @@
   this->menuSelectedIndex = 0;
   this->menuSelected = this->menuLayers[0].menuList[this->menuSelectedIndex];
-  this->menuSelector->setAbsCoor2D(this->menuSelected->getAbsCoor2D());
+  this->sliderTo(this->menuSelected, 0.0f);
 
 
@@ -376 +376 @@
     {
       this->menuSelected = this->menuLayers[this->layerIndex].menuList[++this->menuSelectedIndex];
-      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);
+      this->sliderTo(this->menuSelected, 5.0f);
 
       if( this->layerIndex == 1)
@@ -391 +390 @@
     {
       this->menuSelected = this->menuLayers[this->layerIndex].menuList[--this->menuSelectedIndex];
-      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);
+      this->sliderTo(this->menuSelected, 5.0f);
 
       if( this->layerIndex == 1)
@@ -450 +448 @@
 }
 
+void SimpleGameMenu::sliderTo(const Element2D* element, float bias)
+{
+  if (bias > 0.0)
+  {
+    this->menuSelector->setAbsCoorSoft2D(element->getAbsCoor2D() + Vector(0, element->getSizeY2D() *.5,0), bias);
+    this->menuSelector->setSizeSoft2D(element->getSizeX2D(), element->getSizeY2D(), bias);
+  }
+  else
+  {
+    this->menuSelector->setAbsCoor2D(element->getAbsCoor2D() + Vector(0, element->getSizeY2D() *.5,0));
+    this->menuSelector->setSize2D(element->getSizeX2D(), element->getSizeY2D());
+  }
+}
 
 

trunk/src/story_entities/simple_game_menu.h

@@ -69 +69 @@
     void animateScene(float dt);
     void switchMenuLayer(int layer1, int layer2);
+    void sliderTo(const Element2D* element, float bias = 0.0f);