Changeset 7019 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Using TextEngine in the Menu

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (5 diffs)
• story_entities/simple_game_menu.h (modified) (3 diffs)
• world_entities/Makefile.am (modified) (1 diff)
• world_entities/elements/text_element.cc (copied) (copied from trunk/src/world_entities/elements/image_entity.cc) (5 diffs)
• world_entities/elements/text_element.h (copied) (copied from trunk/src/world_entities/elements/image_entity.h) (2 diffs)

trunk/src/defs/class_id.h

@@ -216 +216 @@
   CL_BILLBOARD                  =    0x00000514,
   CL_MODEL_ENTITY               =    0x00000515,
+  CL_TEXT_ELEMENT               =    0x00000516, /// TODO MOVE
 
 

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;
 

trunk/src/world_entities/Makefile.am

@@ -63 +63 @@
                   world_entities/environments/model_entity.cc \
                   \
-                  world_entities/elements/image_entity.cc
+                  world_entities/elements/image_entity.cc \
+                  world_entities/elements/text_element.cc
 
 

trunk/src/world_entities/elements/text_element.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "image_entity.h"
+#include "text_element.h"
 
 #include "load_param.h"
@@ -22 +22 @@
 
 #include "graphics_engine.h"
-#include "material.h"
-#include "glincl.h"
 #include "state.h"
 
@@ -30 +28 @@
 
 
-CREATE_FACTORY(ImageEntity, CL_IMAGE_ENTITY);
+CREATE_FACTORY(TextElement, CL_TEXT_ELEMENT);
 
 
@@ -36 +34 @@
  * standart constructor
  */
-ImageEntity::ImageEntity (const TiXmlElement* root)
+TextElement::TextElement (const TiXmlElement* root)
 {
-  this->init();
+  this->setClassID(CL_TEXT_ELEMENT, "TextElement");
+  this->setName("TextElement");
+
+  this->setLayer(E2D_LAYER_TOP);
+  this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
+
+  this->setSize(20);
+  this->setFont("fonts/earth.ttf");
+
   if(root != NULL)
     this->loadParams(root);
@@ -45 +51 @@
 
 /**
- * destroys a ImageEntity
+ * destroys a TextElement
 */
-ImageEntity::~ImageEntity ()
+TextElement::~TextElement ()
 {
-  if (this->material)
-    delete this->material;
 }
 
 
-/**
- * initializes the ImageEntity
- */
-void ImageEntity::init()
+void TextElement::loadParams(const TiXmlElement* root)
 {
-  this->setClassID(CL_IMAGE_ENTITY, "ImageEntity");
-  this->setName("ImageEntity");
+  Element2D::loadParams(root);
 
-  this->setLayer(E2D_LAYER_TOP);
-  this->setRotationSpeed(5);
-  this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0, GraphicsEngine::getInstance()->getResolutionY()/10.0);
+  LoadParam(root, "size", this, Text, setSize);
 
-  this->setBindNode(this);
-  this->material = new Material;
-  this->setTexture("pictures/error_texture.png");
-  this->bBillboarding = false;
+  LoadParam(root, "text", this, TextElement, setText);
+
+  LoadParam(root, "font", this, TextElement, setFont);
 }
 
-
-void ImageEntity::loadParams(const TiXmlElement* root)
+void TextElement::setText(const char* text)
 {
-  PNode::loadParams(root);
-  Element2D::loadParams(root);
-
-  LoadParam(root, "texture", this, ImageEntity, setTexture)
-      .describe("the texture-file to load onto the ImageEntity");
-
-  LoadParam(root, "size", this, ImageEntity, setSize)
-      .describe("the size of the ImageEntity in Pixels");
-
-  LoadParam(root, "rotation-speed", this, ImageEntity, setRotationSpeed)
-      .describe("the Speed with which the ImageEntity should rotate");
-
-  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboarding)
-      .describe("sets the Billboard to always look in the direction of the Player");
+  Text::setText(text);
 }
 
-
-/**
- * sets the size of the ImageEntity.
- * @param size the size in pixels
- */
-void ImageEntity::setSize(float sizeX, float sizeY)
+void TextElement::setFont(const char* font)
 {
-  this->setSize2D(sizeX, sizeY);
+  Text::setFont(font, (unsigned int)this->getSizeY2D());
 }
-
-
-/**
- * sets the material to load
- * @param textureFile The texture-file to load onto the crosshair
- */
-void ImageEntity::setTexture(const char* textureFile)
-{
-  this->material->setDiffuseMap(textureFile);
-}
-
-
-/** this turns on/off the billboarding of this WorldEntity
- *
- * This means that the image will always look in the direction of the Player
- */
-void ImageEntity::toggleBillboarding()
-{
-  this->bBillboarding = !this->bBillboarding;
-}
-
-
-/**
- * ticks the ImageEntity
- * @param dt the time to ticks
- */
-void ImageEntity::tick(float dt)
-{
-
-}
-
-
-/**
- * draws the crosshair
- */
-void ImageEntity::draw() const
-{
-  if( !this->isVisible())
-    return;
-
-  glPushMatrix();
-  glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
-
-  //glRotatef(this->getAbsDir2D(), 0,0,1);
-  this->material->select();
-  glBegin(GL_TRIANGLE_STRIP);
-  glTexCoord2f(0, 0);
-  glVertex2f(-this->getSizeX2D(), -this->getSizeY2D());
-  glTexCoord2f(1, 0);
-  glVertex2f(this->getSizeX2D(), -this->getSizeY2D());
-  glTexCoord2f(0, 1);
-  glVertex2f(-this->getSizeX2D(), this->getSizeY2D());
-  glTexCoord2f(1, 1);
-  glVertex2f(this->getSizeX2D(), this->getSizeY2D());
-  glEnd();
-  glPopMatrix();
-
-}

trunk/src/world_entities/elements/text_element.h

@@ -1 +1 @@
 /*!
- * @file image_entity.h
- *  Definition of an ImageEntity
+ * @file text_element.h
+ *  Definition of an TextElement
  */
 
-#ifndef _IMAGE_ENTITY_H
-#define _IMAGE_ENTITY_H
+#ifndef _TEXT_ELEMENT_H
+#define _TEXT_ELEMENT_H
 
 #include "p_node.h"
-#include "element_2d.h"
+#include "text.h"
 #include "event_listener.h"
 
@@ -20 +20 @@
 
 //! A class that enables the
-class ImageEntity : public PNode, public Element2D {
+class TextElement : public Text {
 
  public:
-  ImageEntity(const TiXmlElement* root = NULL);
-  virtual ~ImageEntity();
+  TextElement(const TiXmlElement* root = NULL);
+  virtual ~TextElement();
 
   void init();
   virtual void loadParams(const TiXmlElement* root);
 
-  void setSize(float sizeX, float sizeY);
-  void setTexture(const char* textureFile);
-  /** @param rotationSpeed the speed at what the crosshair should rotate */
-  void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
-  void toggleBillboarding();
-
-  virtual void tick(float dt);
-  virtual void draw() const;
+  void setText(const char* text);
+  void setFont(const char* font);
 
  private:
-   Material*        material;             //!< a material for the Aim.
-   float            rotationSpeed;        //!< Speed of the Rotation.
-   bool             bBillboarding;        //!< true if billboarding is on
+
 };
 
-#endif /* _IMAGE_ENTITY_H */
+#endif /* _TEXT_ELEMENT_H */