Changeset 4850 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 13, 2005, 7:23:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Text is now too a Element2D, and it does not need the TextEngine anymore to draw it.
optimizing…

Location:

orxonox/trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/render2D/element_2d.h (modified) (1 diff)
• lib/graphics/text_engine.cc (modified) (3 diffs)
• lib/graphics/text_engine.h (modified) (4 diffs)
• story_entities/world.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -21 +21 @@
 
 #include "render_2d.h"
+#include "light.h"
 #include "debug.h"
 #include "text_engine.h"
@@ -433 +434 @@
 {
   Render2D::getInstance()->draw();
-
+  LightManager::getInstance()->draw();
 }
 

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

@@ -45 +45 @@
 class Element2D : virtual public BaseObject {
 
- public:
-  Element2D();
-  virtual ~Element2D();
+  public:
+    Element2D();
+    virtual ~Element2D();
 
-  void setPosition(int xCoord, int yCoord);
-  void setLayer(E2DLayer layer);
-  /** @param visible true if the Element should be visible false otherwise (will not be rendered) */
-  inline void setVisibility(bool visible) { this->visible = visible; };
-  /** @param bindNode the Node this 2D-element should follow. if NULL the Element will not follow anything */
-  inline void setBindNode(const PNode* bindNode) { this->bindNode = bindNode; };
+    void setPosition2D(int xCoord, int yCoord);
+    void setLayer(E2DLayer layer);
+    /** @param visible true if the Element should be visible false otherwise (will not be rendered) */
+    inline void setVisibility(bool visible) { this->visible = visible; };
+    /** @param bindNode the Node this 2D-element should follow. if NULL the Element will not follow anything */
+ // inline void setBindNode(const PNode* bindNode) { this->bindNode = bindNode; };
 
-  /** @returns the visibility state */
-  inline bool isVisible() { return this->visible; };
+    /** @returns the visibility state */
+    inline bool isVisible() { return this->visible; };
 
-  void positioning();
-  virtual void tick(float dt);
-  virtual void draw() const = NULL;
+    void positioning();
+    virtual void tick(float dt);
+    virtual void draw() const = NULL;
 
   private:
     void init();
 
- private:
-   bool                    visible;
-   int                     relPos2D[2];      //!< X-coord, Y-Coord (relative to the Coordinates of the alignment if given.)
-   Position2D              absPos2D;         //!< The absolute position of the 2D-Element.
-   E2DLayer                layer;
+  protected:
+    const PNode*            bindNode;         //!< a node over which to display this 2D-element
+  private:
+    bool                    visible;
+    int                     relPos2D[2];      //!< X-coord, Y-Coord (relative to the Coordinates of the alignment if given.)
+    Position2D              absPos2D;         //!< The absolute position of the 2D-Element.
+    E2DLayer                layer;
 
-   E2D_ALIGNMENT           alignment;        //!< How the Element is aligned around its Position
-   const PNode*            bindNode;         //!< a node over which to display this 2D-element
+    E2D_ALIGNMENT           alignment;        //!< How the Element is aligned around its Position
 };
 

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -74 +74 @@
 {
   TextEngine::getInstance()->deleteText(this);
-}
-
-/**
- *  tells the Text, that it should folow a PNode
- * @param bindNode: the node to bind this text to
-*/
-void Text::setBindNode(PNode* bindNode)
-{
-  this->bindNode = bindNode;
 }
 
@@ -185 +176 @@
 
 /**
- *  draws the Font
+ *  draws the Text
 */
 void Text::draw() const
@@ -217 +208 @@
   // setting the Blending effects
   glColor4f(1.0f,1.0f,1.0f, this->blending);
+  glEnable(GL_BLEND);
+  glEnable(GL_TEXTURE_2D);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 

orxonox/trunk/src/lib/graphics/text_engine.h

@@ -26 +26 @@
 #endif
 
+#include "base_object.h"
+#include "element_2d.h"
+
 #include "vector.h"
-#include "base_object.h"
 
 // FORWARD DECLARATION
@@ -104 +106 @@
 ////////////
 //! Represents one textElement.
-class Text : public BaseObject
+class Text : public Element2D
 {
   friend class TextEngine;
  public:
   ~Text();
-
-  void setBindNode(PNode* bindNode);
 
   void setType(int type);
@@ -124 +124 @@
   void createTexture();
 
-  void draw() const;
+  virtual void draw() const;
 
   void debug() const;
@@ -147 +147 @@
   TexCoord          texCoord;       //!< Texture-coordinates @todo fix this to have a struct
   SDL_Rect          posSize;        //!< An SDL-Rectangle representing the position and size of the Text on the screen.
-
-  PNode*            bindNode;       //!< A node the Text is bind to. (if NULL thr node will not be bound to anything.)
 };
 

orxonox/trunk/src/story_entities/world.cc

@@ -850 +850 @@
 
   GraphicsEngine::getInstance()->draw();
-  TextEngine::getInstance()->draw();
-  LightManager::getInstance()->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
+  //TextEngine::getInstance()->draw();
 }