Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5218 in orxonox.OLD for trunk/src/lib/graphics


Ignore:
Timestamp:
Sep 22, 2005, 5:30:01 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: more error-fixes… thanks Valgrind team :)

Location:
trunk/src/lib/graphics
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/model.cc

    r5217 r5218  
    110110  if (this->listNumber != 0)
    111111    glDeleteLists(this->listNumber, 1);
     112
     113  if (this->name[0] != '\0')
     114    delete[] this->name;
    112115
    113116  if (this->next !=NULL)
     
    446449  if (this->groupCount != 0 && this->currentGroup->faceCount > 0)
    447450    {
    448       //      finalizeGroup(currentGroup);
     451      // finalizeGroup(currentGroup);
    449452      this->currentGroup = this->currentGroup->next = new ModelGroup;
    450453    }
  • trunk/src/lib/graphics/spatial_separation/quadtree.cc

    r5215 r5218  
    2626using namespace std;
    2727
     28#define QUADTREE_MATERIAL_COUNT       4
    2829
    2930/**
     
    3738
    3839  /* initialize the materials for debug draw */
    39   this->materials = new Material*[4];
    40   for(int i = 0; i < 4; ++i)
     40  this->materials = new Material*[QUADTREE_MATERIAL_COUNT];
     41  for(int i = 0; i < QUADTREE_MATERIAL_COUNT; ++i)
    4142  {
    4243    materials[i] = new Material();
     
    8283  // delete what has to be deleted here
    8384  delete [] this->nodes;
     85  if (this->materials != NULL)
     86  {
     87    for (unsigned int i = 0; i < QUADTREE_MATERIAL_COUNT; i++)
     88      delete this->materials[i];
     89    delete this->materials;
     90  }
     91
    8492  delete this->rootNode;
    8593  delete offset;
Note: See TracChangeset for help on using the changeset viewer.