Changeset 6130 in orxonox.OLD

Timestamp:

Dec 16, 2005, 4:06:38 PM (18 years ago)

Author:

bensch

Message:

om: valgrind sweep, also in Element2D

Location:

branches/objectmanager/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (6 diffs)
• lib/graphics/render2D/element_2d.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (1 diff)
• lib/sound/sound_source.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/objectmanager/src/lib/graphics/render2D/element_2d.cc

@@ -18 +18 @@
 #include "element_2d.h"
 #include "render_2d.h"
+
+#include <algorithm>
 
 #include "p_node.h"
@@ -82 +84 @@
   if (this->parent != NULL)
   {
-    this->parent->children.remove(this);
+    this->parent->eraseChild(this);
     this->parent = NULL;
   }
@@ -512 +514 @@
   {
     PRINTF(5)("Element2D::addChild() - reparenting node: removing it and adding it again\n");
-    child->parent->children.remove(child);
+    child->parent->eraseChild(child);
   }
   child->parent = this;
@@ -581 +583 @@
   if (this->parent != NULL)
   {
-    this->parent->children.remove(this);
+    this->parent->eraseChild(this);
     this->parent = NULL;
   }
@@ -655 +657 @@
   if (parentNode != NULL)
     this->setParentSoft2D(parentNode, bias);
+}
+
+/** @param child the child to be erased from this Nodes List */
+void Element2D::eraseChild(Element2D* child)
+{
+  std::list<Element2D*>::iterator childIT = std::find(this->children.begin(), this->children.end(), child);
+  this->children.erase(childIT);
 }
 
@@ -733 +742 @@
     else if (unlikely(this->bindNode != NULL))
     {
-      GLdouble projectPos[3];
+      GLdouble projectPos[3] = {0, 0, 0};
       gluProject(this->bindNode->getAbsCoor().x,
                  this->bindNode->getAbsCoor().y,

branches/objectmanager/src/lib/graphics/render2D/element_2d.h

@@ -195 +195 @@
 
   private:
+    void eraseChild(Element2D* child);
     /** tells the child that the parent's Coordinate has changed */
     inline void parentCoorChanged () { this->bRelCoorChanged = true; }

branches/objectmanager/src/lib/sound/sound_engine.cc

@@ -141 +141 @@
     if (!this->ALSources.empty())
     {
-
       source = this->ALSources.top();
-      printf("test: : %d\n", source);
       this->ALSources.pop();
     }

branches/objectmanager/src/lib/sound/sound_source.cc

@@ -69 +69 @@
     SoundEngine::getInstance()->popALSource(this->sourceID);
 
-  printf("%d\n",sourceID);
   alSourceStop(this->sourceID);
   alSourcei (this->sourceID, AL_BUFFER, buffer->getID());

branches/objectmanager/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(false);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;