Changeset 5398 in orxonox.OLD

Timestamp:

Oct 18, 2005, 6:28:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a bug in the allocation of Element2D

Location:

trunk/src

Files:

• lib/collision_detection/lin_alg.h (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (2 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/shell/shell.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)

trunk/src/lib/collision_detection/lin_alg.h

@@ -117 +117 @@
     }
   } //end of main i loop
-  printf("\n 50 iterations !\n");
+//  printf("\n 50 iterations !\n");
   return;  //too many iterations
 }

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

@@ -113 +113 @@
   this->setActiveness(true);
   this->setAlignment(E2D_ALIGN_NONE);
-  this->layer = E2D_TOP;
+  this->layer = E2D_DEFAULT_LAYER;
   this->bindNode = NULL;
 
@@ -214 +214 @@
 {
   if (!strcmp(layer, "top"))
-    this->setLayer(E2D_TOP);
+    this->setLayer(E2D_LAYER_TOP);
   else if (!strcmp(layer, "medium"))
-    this->setLayer(E2D_MEDIUM);
+    this->setLayer(E2D_LAYER_MEDIUM);
   else if (!strcmp(layer, "bottom"))
-    this->setLayer(E2D_BOTTOM);
+    this->setLayer(E2D_LAYER_BOTTOM);
   else if (!strcmp(layer, "below-all"))
-    this->setLayer(E2D_BELOW_ALL);
+    this->setLayer(E2D_LAYER_BELOW_ALL);
 }
 

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

@@ -21 +21 @@
 typedef enum
 {
-  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_BELOW_ALL           =     0,        //!< Will be rendered below the 3D-scene. @todo make this work.
+  E2D_LAYER_BOTTOM              =     1,        //!< Will be rendered on the bottom Layer
+  E2D_LAYER_MEDIUM              =     2,        //!< Will be rendered on the medium Layer.
+  E2D_LAYER_TOP                 =     3,        //!< Will be rendered on top of everything else
+
+  E2D_LAYER_COUNT               =     4,         //!< The count of Layers.
+
+  E2D_LAYER_ALL                 =     5,
 } E2D_LAYER;
-#define E2D_DEFAULT_LAYER       E2D_TOP
+#define E2D_DEFAULT_LAYER       E2D_LAYER_MEDIUM
 
 typedef enum
@@ -81 +81 @@
     void setLayer(const char* layer);
     /** @returns the Layer this Element is drawn to */
-    inline E2D_LAYER getLayer() { return this->layer; };
+    inline E2D_LAYER getLayer() const { return this->layer; };
 
     /** @param visible true if the Element should be visible false otherwise (will not be rendered) */

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

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
 #include "render_2d.h"
@@ -66 +66 @@
 void Render2D::registerElement2D(Element2D* element2D)
 {
-  if (likely(element2D != NULL))
-    this->element2DList[E2D_DEFAULT_LAYER]->add(element2D);
+  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT)
+    this->element2DList[element2D->getLayer()]->add(element2D);
+  // DEBUG printf("::::%p, %d %d \n", element2D, element2D->getLayer(), this->element2DList[element2D->getLayer()]->getSize());
 }
 
@@ -79 +80 @@
 void Render2D::unregisterElement2D(Element2D* element2D)
 {
-  this->element2DList[element2D->getLayer()]->remove(element2D);
+  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT)
+    this->element2DList[element2D->getLayer()]->remove(element2D);
+    // DEBUG  printf(":::%s layer: %d, %d\n", element2D->getClassName(), element2D->getLayer(), this->element2DList[element2D->getLayer()]->getSize());
 }
 
@@ -93 +96 @@
     return;
 
-  if (E2D_LAYER_COUNT  > to)
+  if (E2D_LAYER_COUNT  < to)
     to = E2D_DEFAULT_LAYER;
-  if (element2D->getLayer() != to)
+  if (likely(element2D->getLayer() != to))
   {
     this->element2DList[element2D->getLayer()]->remove(element2D);
@@ -127 +130 @@
  * @param layer the Layer to draw (if E2D_LAYER_ALL then all layers will be drawn)
  */
-void Render2D::draw(unsigned int layer) const
+void Render2D::draw(E2D_LAYER layer) const
 {
   GraphicsEngine::enter2DMode();
@@ -133 +136 @@
   if (layer != E2D_LAYER_ALL)
   {
-    if ( this->element2DList[layer]->getSize() > 0)
+    if (likely(this->element2DList[layer]->getSize() > 0))
     {
       tIterator<Element2D>* iterator = this->element2DList[layer]->getIterator();

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

@@ -23 +23 @@
 
     void tick(float dt);
-    void draw(unsigned int layer) const;
+    void draw(E2D_LAYER layer) const;
 
 

trunk/src/lib/shell/shell.cc

@@ -125 +125 @@
   if (this->bActive == true)
     PRINTF(3)("The shell is already active\n");
-
-  printf("ACT\n");
   this->bActive = true;
 

trunk/src/world_entities/weapons/crosshair.cc

@@ -63 +63 @@
   this->setName("Crosshair");
 
-  this->setLayer(E2D_TOP);
+  this->setLayer(E2D_LAYER_TOP);
   this->setRotationSpeed(5);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);