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

Timestamp:

Oct 18, 2005, 7:18:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: GL-GUI not rendered by Element2D anymore, lets see, if this proves usefull… i am not sure

Location:

trunk/src/lib

Files:

• graphics/render2D/element_2d.h (modified) (1 diff)
• graphics/render2D/render_2d.cc (modified) (6 diffs)
• gui/gl_gui/glgui_button.cc (modified) (1 diff)
• gui/gl_gui/glgui_pushbutton.cc (modified) (1 diff)
• gui/gl_gui/glgui_widget.cc (modified) (1 diff)

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

@@ -27 +27 @@
 
   E2D_LAYER_COUNT               =     4,         //!< The count of Layers.
+
+  E2D_LAYER_EXTERN              =    -1,         //!< In a Layers handeled externally.
 
   E2D_LAYER_ALL                 =     5,

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -66 +66 @@
 void Render2D::registerElement2D(Element2D* element2D)
 {
-  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT)
+  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT && element2D->getLayer() != E2D_LAYER_EXTERN)
     this->element2DList[element2D->getLayer()]->add(element2D);
   // DEBUG printf("::::%p, %d %d \n", element2D, element2D->getLayer(), this->element2DList[element2D->getLayer()]->getSize());
@@ -80 +80 @@
 void Render2D::unregisterElement2D(Element2D* element2D)
 {
-  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT)
+  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT && element2D->getLayer() != E2D_LAYER_EXTERN)
     this->element2DList[element2D->getLayer()]->remove(element2D);
     // DEBUG  printf(":::%s layer: %d, %d\n", element2D->getClassName(), element2D->getLayer(), this->element2DList[element2D->getLayer()]->getSize());
@@ -100 +100 @@
   if (likely(element2D->getLayer() != to))
   {
-    this->element2DList[element2D->getLayer()]->remove(element2D);
-    this->element2DList[to]->add(element2D);
+    if (element2D->getLayer() != E2D_LAYER_EXTERN)
+      this->element2DList[element2D->getLayer()]->remove(element2D);
+    if (to != E2D_LAYER_EXTERN)
+      this->element2DList[to]->add(element2D);
   }
 }
@@ -136 +138 @@
   if (layer != E2D_LAYER_ALL)
   {
-    if (likely(this->element2DList[layer]->getSize() > 0))
+    if (likely(layer != E2D_LAYER_EXTERN && this->element2DList[layer]->getSize() > 0))
     {
       tIterator<Element2D>* iterator = this->element2DList[layer]->getIterator();
@@ -169 +171 @@
   GraphicsEngine::leave2DMode();
 }
+
+

trunk/src/lib/gui/gl_gui/glgui_button.cc

@@ -52 +52 @@
   this->label = new Text();
   this->label->setParent2D(this);
+  this->label->setLayer(E2D_LAYER_EXTERN);
 }
 

trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

@@ -54 +54 @@
 {
   this->label->draw();
+  printf("test");
 }
 

trunk/src/lib/gui/gl_gui/glgui_widget.cc

@@ -51 +51 @@
   this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
   this->setParent2D((Element2D*)NULL);
+  this->setLayer(E2D_LAYER_EXTERN);
 
   this->backMat = NULL;