Changeset 7316 in orxonox.OLD for trunk/src/story_entities/simple_game_menu.cc

Timestamp:

Apr 17, 2006, 1:49:05 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Element2D uses Vector2D instead of Vector whenever possible

File:

• trunk/src/story_entities/simple_game_menu.cc (modified) (6 diffs)

trunk/src/story_entities/simple_game_menu.cc

@@ -181 +181 @@
       this->menuStartGame->setBindNode((const PNode*)NULL);
       this->menuStartGame->setRelCoor2D(State::getResX() / 2.0f,
-                                        State::getResY() / 2.0f - 60.0f,
-                                        0.0f);
+                                        State::getResY() / 2.0f - 60.0f);
       this->menuLayers[0].menuList.push_back(dynamic_cast<TextElement*>(*entity));
 
@@ -191 +190 @@
       this->menuStartMultiplayerGame->setBindNode((const PNode*)NULL);
       this->menuStartMultiplayerGame->setRelCoor2D(State::getResX() / 2.0f,
-                                                   State::getResY() / 2.0f + ((this->menuLayers[0].menuList.size() -1 ) * 60.0f),
-                                                   0.0f);
+                                                   State::getResY() / 2.0f + ((this->menuLayers[0].menuList.size() -1 ) * 60.0f));
       this->menuLayers[0].menuList.push_back(dynamic_cast<TextElement*>(*entity));
     }
@@ -200 +198 @@
       this->menuQuitGame->setBindNode((const PNode*)NULL);
       this->menuQuitGame->setRelCoor2D(State::getResX() / 2.0f,
-                                       State::getResY() / 2.0f + ((this->menuLayers[0].menuList.size() -1 )* 60.0f),
-                                       0.0f);
+                                       State::getResY() / 2.0f + ((this->menuLayers[0].menuList.size() -1 )* 60.0f));
       this->menuLayers[0].menuList.push_back(dynamic_cast<TextElement*>(*entity));
     }
@@ -225 +222 @@
       te->setVisibility(false);
       te->setText(se->getName());
-      te->setRelCoor2D(State::getResX() / 2.0f - 200.0f, State::getResY() / 2.0f + ((this->menuLayers[1].menuList.size() - 2.0f) * 60.0f), 0.0f);
+      te->setRelCoor2D(State::getResX() / 2.0f - 200.0f, State::getResY() / 2.0f + ((this->menuLayers[1].menuList.size() - 2.0f) * 60.0f));
       this->menuLayers[1].menuList.push_back(te);
 
@@ -233 +230 @@
       ie->setBindNode((const PNode*)NULL);
       ie->setTexture(se->getMenuScreenshoot());
-      ie->setRelCoor2D(State::getResX() / 2.0f + 250.0f, State::getResY() / 2.0f, 0.0f);
+      ie->setRelCoor2D(State::getResX() / 2.0f + 250.0f, State::getResY() / 2.0f);
       ie->setSize2D(140.0f, 105.0f);
       this->menuLayers[1].screenshootList.push_back(ie);
@@ -453 +450 @@
   if (bias > 0.0)
   {
-    this->menuSelector->setAbsCoorSoft2D(element->getAbsCoor2D() + Vector(0, element->getSizeY2D() *.5,0), bias);
+    this->menuSelector->setAbsCoorSoft2D(element->getAbsCoor2D() + Vector2D(0, element->getSizeY2D() *.5), bias);
     this->menuSelector->setSizeSoft2D(element->getSizeX2D(), element->getSizeY2D(), bias);
   }
   else
   {
-    this->menuSelector->setAbsCoor2D(element->getAbsCoor2D() + Vector(0, element->getSizeY2D() *.5,0));
+    this->menuSelector->setAbsCoor2D(element->getAbsCoor2D() + Vector2D(0, element->getSizeY2D() *.5));
     this->menuSelector->setSize2D(element->getSizeX2D(), element->getSizeY2D());
   }