Changeset 7019 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Feb 3, 2006, 4:33:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Using TextEngine in the Menu

Location:

trunk/src/story_entities

Files:

• simple_game_menu.cc (modified) (5 diffs)
• simple_game_menu.h (modified) (3 diffs)

trunk/src/story_entities/simple_game_menu.cc

@@ -170 +170 @@
       this->menuSelector->setBindNode((const PNode*)NULL);
     }
-    else if( !strcmp( "StartGame_Menu", (*entity)->getName()))
-    {
-      this->menuStartGame = dynamic_cast<ImageEntity*>(*entity);
+  }
+
+  imageEntityList = ClassList::getList(CL_TEXT_ELEMENT);
+  for (entity = imageEntityList->begin(); entity != imageEntityList->end(); entity++)
+  {
+    if( !strcmp( "StartGame_Menu", (*entity)->getName()))
+    {
+      this->menuStartGame = dynamic_cast<TextElement*>(*entity);
       this->menuStartGame->setBindNode((const PNode*)NULL);
       this->menuStartGame->setRelCoor2D(State::getResX() / 2.0f,
                                         State::getResY() / 2.0f - 60.0f,
                                         0.0f);
-      this->menuLayers[0].menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+      this->menuLayers[0].menuList.push_back(dynamic_cast<TextElement*>(*entity));
 
     }
     else if( !strcmp( "Multiplayer_Menu", (*entity)->getName()))
     {
-      this->menuStartMultiplayerGame = dynamic_cast<ImageEntity*>(*entity);
+      this->menuStartMultiplayerGame = dynamic_cast<TextElement*>(*entity);
       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);
-      this->menuLayers[0].menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+      this->menuLayers[0].menuList.push_back(dynamic_cast<TextElement*>(*entity));
     }
     else if( !strcmp( "Quit_Menu", (*entity)->getName()))
     {
-      this->menuQuitGame = dynamic_cast<ImageEntity*>(*entity);
+      this->menuQuitGame = dynamic_cast<TextElement*>(*entity);
       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);
-      this->menuLayers[0].menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+      this->menuLayers[0].menuList.push_back(dynamic_cast<TextElement*>(*entity));
     }
   }
@@ -216 +221 @@
 
       // generating menu item
+      TextElement* te = new TextElement();
+      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);
+      this->menuLayers[1].menuList.push_back(te);
+
+      // generating screenshoot item
       ImageEntity* ie = new ImageEntity();
-      ie->setTexture(se->getMenuItemImage());
       ie->setVisibility(false);
       ie->setBindNode((const PNode*)NULL);
-      ie->setRelCoor2D(State::getResX() / 2.0f - 200.0f, State::getResY() / 2.0f + ((this->menuLayers[1].menuList.size() - 2.0f) * 60.0f), 0.0f);
-      ie->setSize2D(100.0f, 50.0f);
-      this->menuLayers[1].menuList.push_back(ie);
-
-      // generating screenshoot item
-      ie = new ImageEntity();
       ie->setTexture(se->getMenuScreenshoot());
-      ie->setVisibility(false);
-      ie->setBindNode((const PNode*)NULL);
       ie->setRelCoor2D(State::getResX() / 2.0f + 250.0f, State::getResY() / 2.0f, 0.0f);
       ie->setSize2D(140.0f, 105.0f);
@@ -246 +249 @@
   for(mit = this->menuLayers.begin(); mit != this->menuLayers.end(); mit++)
   {
-    (*mit).menuList.clear(); //erase((*mit).menuList.begin(), (*mit).menuList.end());
-    (*mit).storyList.clear(); //erase((*mit).storyList.begin(), (*mit).storyList.end());
+    while(!(*mit).menuList.empty())
+    {
+      delete (*mit).menuList.back();
+      (*mit).menuList.pop_back();
+    }
+
+    (*mit).menuList.clear();
+    (*mit).storyList.clear();
     (*mit).screenshootList.clear();
   }
@@ -404 +413 @@
 
   PRINTF(0)("Removing layer %i\n", layer1);
+  std::vector<TextElement*>::iterator te;
+  // fade old menu
+  for( te = this->menuLayers[layer1].menuList.begin(); te != this->menuLayers[layer1].menuList.end(); te++)
+  {
+    (*te)->setVisibility(false);
+  }
+
   std::vector<ImageEntity*>::iterator it;
-  // fade old menu
-  for( it = this->menuLayers[layer1].menuList.begin(); it != this->menuLayers[layer1].menuList.end(); it++)
-  {
-    (*it)->setVisibility(false);
-  }
+
   //also fade the screenshots if in level choosement mode
   for( it = this->menuLayers[layer1].screenshootList.begin(); it != this->menuLayers[layer1].screenshootList.end(); it++)
@@ -419 +431 @@
   PRINTF(0)("Showing layer %i\n", layer1);
   // beam here the new menu
-  for( it = this->menuLayers[layer2].menuList.begin(); it != this->menuLayers[layer2].menuList.end(); it++ )
-  {
-    (*it)->setVisibility(true);
+  for( te = this->menuLayers[layer2].menuList.begin(); te != this->menuLayers[layer2].menuList.end(); te++ )
+  {
+    (*te)->setVisibility(true);
   }
 

trunk/src/story_entities/simple_game_menu.h

@@ -15 +15 @@
 
 
+#include "elements/text_element.h"
+
 class SimpleGameMenuData;
 class TiXmlElement;
@@ -29 +31 @@
 
   public:
-    std::vector<ImageEntity*>         menuList;                        //!< the list of the menu items
+    std::vector<TextElement*>          menuList;                        //!< the list of the menu items
     std::vector<StoryEntity*>         storyList;                       //!< the list of the StoryEntities for the menu
     std::vector<ImageEntity*>         screenshootList;                 //!< list of the screen shoots FIXME: make a better structure for this stuff
@@ -75 +77 @@
 
     //std::vector<ImageEntity*>         menuList;                        //!< the list of the menu items
-    ImageEntity*                      menuSelected;                    //!< ref to the selected menu entity
     ImageEntity*                      menuSelector;                    //!< ref to the selector image
-    ImageEntity*                      menuStartGame;
-    ImageEntity*                      menuStartMultiplayerGame;
-    ImageEntity*                      menuQuitGame;
+    TextElement*                      menuSelected;                    //!< ref to the selected menu entity
+    TextElement*                      menuStartGame;
+    TextElement*                      menuStartMultiplayerGame;
+    TextElement*                      menuQuitGame;
     int                               menuSelectedIndex;