Changeset 4849 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 13, 2005, 7:03:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the crosshair now renders as element2d

Location:

orxonox/trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (5 diffs)
• graphics_engine.h (modified) (1 diff)
• render2D/element_2d.h (modified) (1 diff)
• render2D/render_2d.cc (modified) (1 diff)
• render2D/render_2d.h (modified) (1 diff)

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

@@ -20 +20 @@
 #include "event_handler.h"
 
+#include "render_2d.h"
 #include "debug.h"
 #include "text_engine.h"
@@ -58 +59 @@
 {
   // delete what has to be deleted here
+
+  delete Render2D::getInstance();
+  GraphicsEngine::singletonRef = NULL;
 }
 
@@ -148 +152 @@
   glEnable(GL_DEPTH_TEST);
 
-
-  // subscribe the resolutionChanged-event
-  //EventHandler::getInstance()->subscribe(this, ES_GAME, EV_VIDEO_RESIZE);
-  //! @todo eventSystem craps up the Starting of orxonox -> see why.
+  Render2D::getInstance();
 
   this->isInit = true;
@@ -402 +403 @@
  * @param dt the time passed
 */
-void GraphicsEngine::tick(float dt)
+  void GraphicsEngine::tick(float dt)
 {
   if( unlikely(this->bDisplayFPS))
-    {
-      this->currentFPS = 1.0/dt;
-      if( unlikely(this->currentFPS > this->maxFPS)) this->maxFPS = this->currentFPS;
-      if( unlikely(this->currentFPS < this->minFPS)) this->minFPS = this->currentFPS;
+  {
+    this->currentFPS = 1.0/dt;
+    if( unlikely(this->currentFPS > this->maxFPS)) this->maxFPS = this->currentFPS;
+    if( unlikely(this->currentFPS < this->minFPS)) this->minFPS = this->currentFPS;
 
 #ifndef NO_TEXT
@@ -421 +422 @@
       this->geTextMinFPS->setText(tmpChar3);
 #endif /* NO_TEXT */
-    }
+
+
+  }
+  Render2D::getInstance()->tick(dt);
+
+}
+
+
+void GraphicsEngine::draw() const
+{
+  Render2D::getInstance()->draw();
+
 }
 

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

@@ -63 +63 @@
 
     void tick(float dt);
+    void draw() const;
     void displayFPS(bool display);
 

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

@@ -43 +43 @@
 
 //! A class for ...
-class Element2D : public BaseObject {
+class Element2D : virtual public BaseObject {
 
  public:

orxonox/trunk/src/lib/graphics/render2D/render_2d.cc

@@ -77 +77 @@
 
 
+void Render2D::tick(float dt)
+{
+  tIterator<Element2D>* iterator = this->element2DList->getIterator();
+  Element2D* elem = iterator->nextElement();
+  while (elem != NULL)
+  {
+    elem->tick(dt);
+    elem = iterator->nextElement();
+  }
+  delete iterator;
+
+}
+
+/**
+ * renders all the Elements of the Render2D-engine
+ */
 void Render2D::draw() const
 {

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

@@ -21 +21 @@
   inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
 
-
+  void tick(float dt);
   void draw() const;