Changeset 5397 in orxonox.OLD for trunk/src

Timestamp:

Oct 18, 2005, 5:33:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Elemet2D-drawing better
prevent segfault in setParent with NULL as new Parent in Element2D and PNode

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (6 diffs)
• lib/graphics/render2D/element_2d.h (modified) (2 diffs)
• lib/graphics/render2D/render_2d.cc (modified) (6 diffs)
• lib/graphics/render2D/render_2d.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_pushbutton.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (2 diffs)
• lib/shell/shell.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -415 +415 @@
     }
   child->parent = this;
-  this->children->add(child);
+  if (unlikely(this != NULL))
+    this->children->add(child);
   child->parentCoorChanged();
 }

trunk/src/lib/graphics/graphics_engine.cc

@@ -546 +546 @@
   GraphicsEngine::storeMatrices();
   Shader::suspendShader();
-  Render2D::getInstance()->draw(E2D_ALL_LAYERS);
+  Render2D::getInstance()->draw(E2D_LAYER_ALL);
   Shader::restoreShader();
   LightManager::getInstance()->draw();

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

@@ -35 +35 @@
 {
   this->init();
+  Render2D::getInstance()->registerElement2D(this);
   this->setParent2D(NullElement2D::getInstance());
 }
@@ -48 +49 @@
 {
   this->init();
+  Render2D::getInstance()->registerElement2D(this);
 
   // check Parenting, and if ok parent the stuff
@@ -124 +126 @@
   this->toDirection = NULL;
   this->setSize2D(1,1);
-
-  Render2D::getInstance()->registerElement2D(this);
 }
 
@@ -471 +471 @@
     child->parentMode = parentingMode;
   child->parent = this;
-  this->children->add(child);
+  if (likely(this != NULL))
+    this->children->add(child);
   child->parentCoorChanged();
 }
@@ -667 +668 @@
 
 
-    if (this->alignment == E2D_ALIGN_SCREEN_CENTER && this->bRelCoorChanged)
+    if (unlikely(this->alignment & E2D_ALIGN_SCREEN_CENTER && this->bRelCoorChanged))
     {
       this->prevRelCoordinate = this->relCoordinate;
@@ -674 +675 @@
       this->absCoordinate.z = 0.0;
     }
-    else if (this->bindNode)
+    else if (unlikely(this->bindNode != NULL))
     {
       GLdouble projectPos[3];

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

@@ -21 +21 @@
 typedef enum
 {
-  E2D_BELOW_ALL                 =     1,        //!< Will be rendered below the 3D-scene. @todo make this work.
-  E2D_BOTTOM                    =     2,        //!< Will be rendered on the bottom Layer
-  E2D_MEDIUM                    =     4,        //!< Will be rendered on the medium Layer.
-  E2D_TOP                       =     8,        //!< Will be rendered on top of everything else
-
-  E2D_LAYER_COUNT               =     4         //!< The count of Layers.
+  E2D_BELOW_ALL,       //!< Will be rendered below the 3D-scene. @todo make this work.
+  E2D_BOTTOM,          //!< Will be rendered on the bottom Layer
+  E2D_MEDIUM,          //!< Will be rendered on the medium Layer.
+  E2D_TOP,             //!< Will be rendered on top of everything else
+
+  E2D_LAYER_COUNT,     //!< The count of Layers.
+
+  E2D_LAYER_ALL,
 } E2D_LAYER;
 #define E2D_DEFAULT_LAYER       E2D_TOP
-#define E2D_ALL_LAYERS          E2D_TOP | E2D_MEDIUM | E2D_BOTTOM | E2D_BELOW_ALL
 
 typedef enum
@@ -153 +154 @@
     void setParent2D (const char* parentName);
     /** @returns the parent of this Element2D */
-    inline Element2D* getParent () const { return this->parent; };
+    inline Element2D* getParent2D () const { return this->parent; };
     /** @returns the List of Children of this Element2D */
     inline const tList<Element2D>* getChildren2D() const { return this->children; };

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

@@ -67 +67 @@
 {
   if (likely(element2D != NULL))
-    this->element2DList[(int)log2(E2D_DEFAULT_LAYER)]->add(element2D);
+    this->element2DList[E2D_DEFAULT_LAYER]->add(element2D);
 }
 
@@ -79 +79 @@
 void Render2D::unregisterElement2D(Element2D* element2D)
 {
-  this->element2DList[(int)log2(element2D->getLayer())]->remove(element2D);
+  this->element2DList[element2D->getLayer()]->remove(element2D);
 }
 
@@ -93 +93 @@
     return;
 
-  if (unlikely(pow(2, E2D_LAYER_COUNT ) > to))
+  if (E2D_LAYER_COUNT  > to)
     to = E2D_DEFAULT_LAYER;
   if (element2D->getLayer() != to)
   {
-    this->element2DList[(int)log2(element2D->getLayer())]->remove(element2D);
-    this->element2DList[(int)log2(to)]->add(element2D);
+    this->element2DList[element2D->getLayer()]->remove(element2D);
+    this->element2DList[to]->add(element2D);
   }
 }
@@ -124 +124 @@
 
 /**
- * renders all the Elements of the Render2D-engine
- * @param layer the Layer to draw
+ * renders all the Elements of the Render2D-engine's layer
+ * @param layer the Layer to draw (if E2D_LAYER_ALL then all layers will be drawn)
  */
 void Render2D::draw(unsigned int layer) const
@@ -131 +131 @@
   GraphicsEngine::enter2DMode();
 
-  int drawLayer = 1;
-
-  for (int i = 0; i < E2D_LAYER_COUNT; i++)
+  if (layer != E2D_LAYER_ALL)
   {
-    if (layer & drawLayer && this->element2DList[i]->getSize() > 0)
+    if ( this->element2DList[layer]->getSize() > 0)
     {
-      tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
+      tIterator<Element2D>* iterator = this->element2DList[layer]->getIterator();
       Element2D* elem = iterator->firstElement();
       while (elem != NULL)
@@ -147 +145 @@
       delete iterator;
     }
-    drawLayer << 1;
+  }
+  else  // if (layer != E2D_LAYER_ALL)
+  {
+    for (int i = 0; i < E2D_LAYER_COUNT; i++)
+    {
+      if (this->element2DList[i]->getSize() > 0)
+      {
+        tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
+        Element2D* elem = iterator->firstElement();
+        while (elem != NULL)
+        {
+          if (elem->isVisible())
+            elem->draw();
+          elem = iterator->nextElement();
+        }
+        delete iterator;
+      }
+    }
   }
   GraphicsEngine::leave2DMode();

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

@@ -15 +15 @@
 //! A default singleton class.
 class Render2D : public BaseObject {
+  friend class Element2D;
 
- public:
-  virtual ~Render2D();
-  /** @returns a Pointer to the only object of this Class */
-  inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
+  public:
+    virtual ~Render2D();
+    /** @returns a Pointer to the only object of this Class */
+    inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
 
-  void tick(float dt);
-  void draw(unsigned int layer) const;
+    void tick(float dt);
+    void draw(unsigned int layer) const;
 
-  void registerElement2D(Element2D* element2D);
-  void unregisterElement2D(Element2D* element2D);
-  void moveToLayer(Element2D* element2D, E2D_LAYER to);
 
- private:
-  Render2D();
-  static Render2D*              singletonRef;                    //!< Reference to this class.
+  private:
+    void registerElement2D(Element2D* element2D);
+    void unregisterElement2D(Element2D* element2D);
+    void moveToLayer(Element2D* element2D, E2D_LAYER to);
+
+
+    Render2D();
+    static Render2D*              singletonRef;                    //!< Reference to this class.
 
 //  tList<Element2D>*             element2DList;                   //!< List of all valid 2D-elements.
-  tList<Element2D>*             element2DList[E2D_LAYER_COUNT];  //!< List of all valid 2D-elements in the different Layers.
+    tList<Element2D>*             element2DList[E2D_LAYER_COUNT];  //!< List of all valid 2D-elements in the different Layers.
 };
 

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

@@ -28 +28 @@
 {
   this->init();
-
 }
 

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

@@ -28 +28 @@
 {
   this->init();
-  this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 }
 
@@ -50 +49 @@
   this->focusable = true;
   this->clickable = true;
+  this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
+  this->setParent2D((Element2D*)NULL);
 
   this->backMat = NULL;

trunk/src/lib/shell/shell.cc

@@ -285 +285 @@
   this->shellInput->setFont(this->fontFile, this->textSize);
   this->shellInput->setAlignment(TEXT_ALIGN_LEFT);
-  if (shellInput->getParent() != this)
+  if (shellInput->getParent2D() != this)
     this->shellInput->setParent2D(this);
 

trunk/src/story_entities/world.cc

@@ -468 +468 @@
   for(int i = 0; i < 100; i++)
   {
-    WorldEntity* tmp = new NPC2();
+    WorldEntity* tmp = new NPC();
     char npcChar[10];
     sprintf (npcChar, "NPC_%d", i);