Changeset 5378 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Oct 14, 2005, 6:54:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair now more compliant with Element2D
Element2D now also nows size

Location:

trunk/src/lib/graphics

Files:

• render2D/element_2d.cc (modified) (1 diff)
• render2D/element_2d.h (modified) (2 diffs)
• text_engine/text.h (modified) (1 diff)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -123 +123 @@
   this->toCoordinate = NULL;
   this->toDirection = NULL;
+  this->setSize2D(1,1);
 
   Render2D::getInstance()->registerElement2D(this);

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

@@ -98 +98 @@
     inline bool isActive() { return this->active; };
 
+
+    inline void setSize2D(float x, float y) { this->sizeX = x, this->sizeY = y; };
+    inline void setSizeX2D(float x) { this->sizeX = x; };
+    inline void setSizeY2D(float y) { this->sizeY = y; };
+    inline float getSizeX2D() const { return this->sizeX; };
+    inline float getSizeY2D() const { return this->sizeY; };
 
     // LIKE PNODE
@@ -179 +185 @@
     virtual void draw() const = 0;
 
-  protected:
+  private:
+    const PNode*            bindNode;           //!< a node over which to display this 2D-element
     float                   sizeX;              //!< The size of the rendered item in x-direction
     float                   sizeY;              //!< The size of the rendered Item in y-direction
-
-  private:
-    const PNode*            bindNode;           //!< a node over which to display this 2D-element
 
     E2D_ALIGNMENT           alignment;          //!< How the Element is aligned around its Position

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

@@ -71 +71 @@
     void setSize(float size) { this->size = size; };
     /** @returns the Size of the Text */
-    float getSize() const { return this->size; };
+//    void getSize(float &x, float& y) const { return this->size; };
 
     void setType(TEXT_RENDER_TYPE type);