Changeset 5211 in orxonox.OLD

Timestamp:

Sep 21, 2005, 2:21:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind mem-leak-recovered

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (1 diff)
• lib/graphics/importer/texture.cc (modified) (1 diff)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (2 diffs)
• lib/graphics/render2D/element_2d.h (modified) (1 diff)
• lib/math/curve.cc (modified) (9 diffs)
• lib/physics/physics_engine.cc (modified) (1 diff)
• lib/util/list.h (modified) (1 diff)
• story_entities/campaign.cc (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• util/loading/load_param.cc (modified) (2 diffs)
• util/resource_manager.cc (modified) (4 diffs)

trunk/src/lib/coord/p_node.cc

@@ -104 +104 @@
 {
   this->setClassID(CL_PARENT_NODE, "PNode");
+
   this->children = new tList<PNode>();
   this->bRelCoorChanged = true;

trunk/src/lib/graphics/importer/model.cc

@@ -350 +350 @@
     delete this->normals;
   if (this->triangles)
-    delete this->triangles;
+    delete[] this->triangles;
 
   this->vertices = NULL;
   this->vTexture = NULL;
   this->normals = NULL;
-  this->triangles = NULL; this->triangleCount = 0;
+  this->triangles = NULL;
+  this->triangleCount = 0;
 }
 

trunk/src/lib/graphics/importer/texture.cc

@@ -45 +45 @@
 Texture::~Texture()
 {
-  if (this->texture)
+  if (this->texture != 0)
     glDeleteTextures(1, &this->texture);
 }

trunk/src/lib/graphics/light.cc

@@ -244 +244 @@
     if (this->lights[i])
       delete lights[i];
-  delete lights;
+  delete[] lights;
   LightManager::singletonRef = NULL;
 }

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

@@ -90 +90 @@
   this->parent = NULL;
   this->children = new tList<Element2D>;
+  this->absDirection = 0.0;
   this->relDirection = 0.0;
   this->bRelCoorChanged = true;
@@ -844 +845 @@
 NullElement2D::~NullElement2D ()
 {
-  //delete singletonRef;
   NullElement2D::singletonRef = NULL;
 }

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

@@ -193 +193 @@
     Vector                  absCoordinate;      //!< absolute coordinates in the world ( from (0,0,0) )
     float                   relDirection;       //!< direction relative to the parent
-    float                   absDirection;       //!< absolute direvtion in the world ( from (0,0,1) )
+    float                   absDirection;       //!< absolute diretion in the world ( from (0,0,1) )
 
     Vector                  prevRelCoordinate;  //!< The last Relative Coordinate from the last update-Cycle.

trunk/src/lib/math/curve.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -13 +13 @@
    co-programmer: Patrick Boenzli
 
-   ADD: Patrick Boenzli           B-Spline 
-
-
-   TODO: 
+   ADD: Patrick Boenzli           B-Spline
+
+
+   TODO:
      local-Time implementation
      NURBS
      tList implementation
-     
+
 */
 
@@ -33 +33 @@
 
 
-/** 
+/**
   *  default constructor for a Curve
 */
@@ -71 +71 @@
 void Curve::addNode(const Vector& newNode, unsigned int insertPosition)
 {
-
   if (this->nodeCount == 0 || insertPosition > this->nodeCount)
     return addNode(newNode);
@@ -85 +84 @@
     {
       while (tmpNode->next->number != insertPosition)
-        tmpNode= tmpNode->next;
+        tmpNode= tmpNode->next;
       insNode->next = tmpNode->next;
       tmpNode->next = insNode;
@@ -199 +198 @@
       tmpNode->factor = binCoef;
       if (tmpNode =tmpNode->next)
-        {
-          binCoef *=(n-k)/(k+1);
-          ++k;
-        }
+        {
+          binCoef *=(n-k)/(k+1);
+          ++k;
+        }
     }
 
@@ -212 +211 @@
       dirCurve = new BezierCurve(1);
       while(tmpNode->next)
-        {
-          Vector tmpVector = (tmpNode->next->position)- (tmpNode->position);
-          tmpVector.x*=(float)nodeCount;
-          tmpVector.y*=(float)nodeCount;
-          tmpVector.z*=(float)nodeCount;
-          tmpVector.normalize();
-          this->dirCurve->addNode(tmpVector);
-          tmpNode = tmpNode->next;
-        }
+        {
+          Vector tmpVector = (tmpNode->next->position)- (tmpNode->position);
+          tmpVector.x*=(float)nodeCount;
+          tmpVector.y*=(float)nodeCount;
+          tmpVector.z*=(float)nodeCount;
+          tmpVector.normalize();
+          this->dirCurve->addNode(tmpVector);
+          tmpNode = tmpNode->next;
+        }
     }
 }
@@ -229 +228 @@
  * @return the Position on the Path
 */
-Vector BezierCurve::calcPos(float t) 
+Vector BezierCurve::calcPos(float t)
 {
   Vector ret = Vector(0.0,0.0,0.0);
@@ -237 +236 @@
       double factor = pow(1.0-t,nodeCount-1);
       while(tmpNode)
-        {
-          ret.x += tmpNode->factor * factor * tmpNode->position.x;
-          ret.y += tmpNode->factor * factor * tmpNode->position.y;
-          ret.z += tmpNode->factor * factor * tmpNode->position.z;
-          factor *= t/(1.0-t); // same as pow but much faster.
-          
-          tmpNode = tmpNode->next;
-        }
+        {
+          ret.x += tmpNode->factor * factor * tmpNode->position.x;
+          ret.y += tmpNode->factor * factor * tmpNode->position.y;
+          ret.z += tmpNode->factor * factor * tmpNode->position.z;
+          factor *= t/(1.0-t); // same as pow but much faster.
+
+          tmpNode = tmpNode->next;
+        }
     }
   else if (nodeCount == 2)

trunk/src/lib/physics/physics_engine.cc

@@ -58 +58 @@
   }
   delete itPC;
-   delete this->connections;
+  delete this->connections;
 //
 //   // delete all PhysicsInterfaces, still in existence (this could be dangerous)

trunk/src/lib/util/list.h

@@ -82 +82 @@
     {
       listElement<T>* le = this->currentEl->next;
-      //delete this->currentEl->curr;
+      //delete this->currentEl->curr;  //! THIS IS EXTREMELY UNSAFE (the list only stores pointers not instances) //
       delete this->currentEl;
       this->currentEl = le;

trunk/src/story_entities/campaign.cc

@@ -161 +161 @@
     }
     delete this->entities;
+    delete it;
 }
 

trunk/src/story_entities/world.cc

@@ -165 +165 @@
   this->setName(name);
   this->debugWorldNr = worldID;
-
+  this->gameTime = 0.0f;
   this->setSpeed(1.0);
   this->music = NULL;
+  this->shell = NULL;
+  this->entities = NULL;
 }
 
@@ -259 +261 @@
   // load the parameters
   // name
-  char* temp;
   const char* string = grabParameter( root, "name");
   if( string == NULL)
     {
       PRINTF(2)("World is missing a proper 'name'\n");
-      string = "Unknown";
-      temp = new char[strlen(string)+1];
-      strcpy( temp, string);
-      this->setName(temp);
+      this->setName("Unknown");
     }
   else
     {
-      temp = new char[strlen(string )+1];
-      strcpy( temp, string);
-      this->setName(temp);
+      this->setName(string);
     }
 
@@ -478 +474 @@
   ClassList::debug();
 
-  this->music = (OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
-  music->playback();
+  this->music = NULL;//(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
+  //music->playback();
 }
 

trunk/src/util/loading/load_param.cc

@@ -133 +133 @@
   this->types = NULL;
   this->description = NULL;
+  this->defaultValues = NULL;
   this->paramName = new char[strlen(paramName)+1];
   strcpy(this->paramName, paramName);
-  this->defaultValues = NULL;
 }
 
@@ -158 +158 @@
   }
 
-  delete []this->types;
-  delete []this->defaultValues;
-  delete []this->paramName;
-  delete []this->description;
+  delete[] this->types;
+  delete[] this->defaultValues;
+  delete[] this->paramName;
+  delete[] this->description;
 }
 

trunk/src/util/resource_manager.cc

@@ -81 +81 @@
     }
   delete tmpIt;
-
   delete this->imageDirs;
+
+  delete[] this->dataDir;
 
   ResourceManager::singletonRef = NULL;
@@ -356 +357 @@
                       PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
                       tmpResource->pointer = new Texture(imgName);
-                      delete []imgName;
+                      delete[] imgName;
                       break;
                     }
-                  delete []imgName;
+                  delete[] imgName;
                   tmpDir = iterator->nextElement();
                 }
@@ -375 +376 @@
       if (tmpResource->pointer)
         this->resourceList->add(tmpResource);
-      delete []fullName;
+      delete[] fullName;
     }
   if (tmpResource->pointer)
@@ -631 +632 @@
     }
   else
+  {
+    delete[] tmpDirName;
     return false;
+  }
 }