Changeset 5387 in orxonox.OLD for trunk/src

Timestamp:

Oct 16, 2005, 12:42:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: PNode and Element2D can now return their children-lists as const tList<type>*

Location:

trunk/src/lib

Files:

• coord/p_node.h (modified) (1 diff)
• graphics/render2D/element_2d.h (modified) (1 diff)
• gui/gl_gui/glgui_container.cc (modified) (3 diffs)
• gui/gl_gui/glgui_widget.cc (modified) (2 diffs)
• gui/gl_gui/glgui_widget.h (modified) (2 diffs)

trunk/src/lib/coord/p_node.h

@@ -104 +104 @@
   void setParent (const char* parentName);
   /** @returns the parent of this PNode */
-  PNode* getParent () const { return this->parent; };
+  inline PNode* getParent () const { return this->parent; };
+  /** @returns the List of Children of this PNode */
+  inline const tList<PNode>* getChildren() const { return this->children; };
 
   void setParentSoft(PNode* parentNode, float bias = 1.0);

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

@@ -153 +153 @@
     void setParent2D (const char* parentName);
     /** @returns the parent of this Element2D */
-    Element2D* getParent () const { return this->parent; };
+    inline Element2D* getParent () const { return this->parent; };
+    /** @returns the List of Children of this Element2D */
+    inline const tList<Element2D>* getChildren2D() const { return this->children; };
 
     void setParentSoft2D(Element2D* parentNode, float bias = 1.0);

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

@@ -52 +52 @@
 void GLGuiContainer::showAll()
 {
-
   tIterator<GLGuiWidget>* itC = this->children->getIterator();
   GLGuiWidget* enumC = itC->firstElement();
@@ -60 +59 @@
       static_cast<GLGuiContainer*>(enumC)->showAll();
     else
-     enumC->show();
+      enumC->show();
     enumC = itC->nextElement();
   }
@@ -71 +70 @@
 void GLGuiContainer::hideAll()
 {
+  tIterator<GLGuiWidget>* itC = this->children->getIterator();
+  GLGuiWidget* enumC = itC->firstElement();
+  while (enumC != NULL)
+  {
+    if (enumC->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(enumC)->showAll();
+    else
+      enumC->hide();
+    enumC = itC->nextElement();
+  }
+  delete itC;
 
+  this->hide();
 }
 

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

@@ -26 +26 @@
 {
   this->init();
-  this->setVisibility(true);
+  this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 }
 
@@ -46 +46 @@
   this->setClassID(CL_GLGUI_WIDGET, "GLGuiWidget");
 
-  this->managed = false;
   this->focusable = true;
   this->clickable = true;
 
-  this->backGround = NULL;
-  this->renderModel = 0;
+  this->backMat = NULL;
+  this->backModel = 0;
+  this->frontMat = NULL;
+  this->frontModel = 0;
 }

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

@@ -13 +13 @@
 class Material;
 
+//! if the Element should be visible by default.
+#define GLGUI_WIDGET_DEFAULT_VISIBLE       false
+
 //! This is widget part of the openglGUI class
 /**
-* A widget is the main class of all the elements of th GUI.
-*/
+ * A widget is the main class of all the elements of th GUI.
+ */
 class GLGuiWidget : public Element2D {
   public:
@@ -31 +34 @@
 
   protected:
-    Material*             backGround;
-    GLuint                renderModel;
+    Material*             backMat;
+    GLuint                backModel;
+
+    Material*             frontMat;
+    GLuint                frontModel;
 
   private:
-    bool                  managed;          //!< if this GUI-element should be managed. true means it gets deleted with the deletion of it's parent.
-    bool                  focusable;        //!< If it can receive focus.
-    bool                  clickable;        //!< if it can be clicked upon.
+    bool                  focusable;        //!< If this widget can receive focus.
+    bool                  clickable;        //!< if this widget can be clicked upon.
 };