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

Timestamp:

Aug 23, 2005, 11:13:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reverted the last steps, because they created a huge pack of seg-faults

Location:

trunk/src/lib/graphics

Files:

• importer/model.cc (modified) (2 diffs)
• render2D/element_2d.cc (modified) (10 diffs)
• render2D/element_2d.h (modified) (2 diffs)
• render2D/render_2d.cc (modified) (2 diffs)
• spatial_separation/quadtree_node.cc (modified) (4 diffs)
• text_engine.cc (modified) (5 diffs)

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

@@ -192 +192 @@
 
     tIterator<Material>* tmpIt = this->materialList->getIterator();
-    Material* material = tmpIt->firstElement();
+    Material* material = tmpIt->nextElement();
   //! @todo do we really have to delete this material??
     while(material)
@@ -413 +413 @@
 {
   tIterator<Material>* tmpIt = this->materialList->getIterator();
-  Material* material = tmpIt->firstElement();
+  Material* material = tmpIt->nextElement();
   while(material)
     {

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

@@ -55 +55 @@
 
   tIterator<Element2D>* iterator = this->children->getIterator();
-  Element2D* pn = iterator->firstElement();
+  Element2D* pn = iterator->nextElement();
   while( pn != NULL)
   {
@@ -214 +214 @@
 void Element2D::setRelCoor2D (const Vector& relCoord)
 {
-  if (this->toCoordinate!= NULL)
-  {
-    delete this->toCoordinate;
-    this->toCoordinate = NULL;
-  }
   this->relCoordinate = relCoord;
   this->bRelCoorChanged = true;
@@ -232 +227 @@
 void Element2D::setRelCoor2D (float x, float y, float z)
 {
-  this->setRelCoor2D(Vector(x,y,z));
+  this->setAbsCoor2D(Vector(x,y,z));
 }
 
@@ -293 +288 @@
 void Element2D::setAbsCoor2D (const Vector& absCoord)
 {
-  if (this->toCoordinate!= NULL)
-  {
-    delete this->toCoordinate;
-    this->toCoordinate = NULL;
-  }
-
   if( likely(this->parentMode & E2D_PARENT_MOVEMENT))
   {
@@ -373 +362 @@
 void Element2D::setRelDir2D (float relDir)
 {
-  if (this->toDirection!= NULL)
-  {
-    delete this->toDirection;
-    this->toDirection = NULL;
-  }
-
   this->relDirection = relDir;
   this->bRelDirChanged = true;
@@ -403 +386 @@
 void Element2D::setAbsDir2D (float absDir)
 {
-  if (this->toDirection!= NULL)
-  {
-    delete this->toDirection;
-    this->toDirection = NULL;
-  }
-
   if (likely(this->parent != NULL))
     this->relDirection = absDir - this->parent->getAbsDir2D();
@@ -479 +456 @@
 {
   tIterator<Element2D>* iterator = this->children->getIterator();
-  Element2D* pn = iterator->firstElement();
+  Element2D* pn = iterator->nextElement();
 
   while( pn != NULL)
@@ -687 +664 @@
   {
     tIterator<Element2D>* iterator = this->children->getIterator();
-    Element2D* pn = iterator->firstElement();
+    Element2D* pn = iterator->nextElement();
     while( pn != NULL)
     {
@@ -697 +674 @@
 
       pn->update2D(dt);
+          //pn = this->children->nextElement();
       pn = iterator->nextElement();
     }
@@ -734 +712 @@
   {
     tIterator<Element2D>* iterator = this->children->getIterator();
-    Element2D* pn = iterator->firstElement();
+      //PNode* pn = this->children->enumerate ();
+    Element2D* pn = iterator->nextElement();
     while( pn != NULL)
     {

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

@@ -108 +108 @@
     /** @returns the relative position */
     inline const Vector& getRelCoor2D () const { return this->prevRelCoordinate; };
-    /** @returns the Relative Coordinate Destination */
-    inline const Vector& getRelCoorSoft2D() const { return (this->toCoordinate)?*this->toCoordinate:this->relCoordinate; };
     const Vector& getRelCoor2Dpx() const;
     void setAbsCoor2D (const Vector& absCoord);
@@ -125 +123 @@
     /** @returns the relative Direction */
     inline float getRelDir2D () const { return this->prevRelDirection; };
-    /** @returns the Relative Directional Destination */
-    inline float getRelDirSoft2D() const { return (this->toDirection)?*this->toDirection:this->relDirection; };
     void setAbsDir2D (float absDir);
     /** @returns the absolute Direction */

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

@@ -105 +105 @@
   {
     tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
-    Element2D* elem = iterator->firstElement();
+    Element2D* elem = iterator->nextElement();
     while (elem != NULL)
     {
@@ -131 +131 @@
     {
       tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
-      Element2D* elem = iterator->firstElement();
+      Element2D* elem = iterator->nextElement();
       while (elem != NULL)
       {

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -253 +253 @@
   counter = 0;
   iterator = listA->getIterator();
-  tempTri = iterator->firstElement();
+  tempTri = iterator->nextElement();
   while( tempTri)
   {
@@ -262 +262 @@
   counter = 0;
   iterator = listB->getIterator();
-  tempTri = iterator->firstElement();
+  tempTri = iterator->nextElement();
   while( tempTri)
   {
@@ -271 +271 @@
   counter = 0;
   iterator = listC->getIterator();
-  tempTri = iterator->firstElement();
+  tempTri = iterator->nextElement();
   while( tempTri)
   {
@@ -280 +280 @@
   counter = 0;
   iterator = listD->getIterator();
-  tempTri = iterator->firstElement();
+  tempTri = iterator->nextElement();
   while( tempTri)
   {

trunk/src/lib/graphics/text_engine.cc

@@ -592 +592 @@
           if( glyphSurf != NULL )
             {
+
               SDL_SetAlpha(glyphSurf, 0, 0);
 
@@ -597 +598 @@
               TexCoord tmpTexCoord;
               tmpTexCoord.minU = (float)tmpRect.x/(float)tmpSurf->w;
-              tmpTexCoord.maxU = (float)(tmpRect.x +1 + tmpGlyph->width)/(float)tmpSurf->w;
+              tmpTexCoord.maxU = (float)(tmpRect.x +1 +tmpGlyph->width)/(float)tmpSurf->w;
               tmpTexCoord.minV = (float)tmpRect.y/(float)tmpSurf->w;
               tmpTexCoord.maxV = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
@@ -619 +620 @@
 
               // Outputting Glyphs to BMP-files.
-/*
-                char outname[512];
+              /*
+                char outname[64];
                 if (i < 10)
-                sprintf( outname, "%s-glyph-00%d.bmp", this->getName(), i );
+                sprintf( outname, "glyph-00%d.bmp", i );
                 else if (i <100)
-                  sprintf( outname, "%s-glyph-0%d.bmp", this->getName(), i );
+                sprintf( outname, "glyph-0%d.bmp", i );
                 else
-                  sprintf( outname, "%s-glyph-%d.bmp", this->getName(), i );
-                SDL_SaveBMP(tmpSurf, outname);*/
-
+                sprintf( outname, "glyph-%d.bmp", i );
+                SDL_SaveBMP(tmpSurf, outname);
+              */
             }
         }
@@ -711 +712 @@
                   x = 0;
                   y = y + maxLineHeight;
-                  //maxLineHeight = 0;
+                  maxLineHeight = 0;
                 }
               if (y + maxLineHeight + 1 > size)
@@ -845 +846 @@
 
   tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
-  Text* text = dynamic_cast<Text*>(textIterator->firstElement());
+  Text* text = dynamic_cast<Text*>(textIterator->nextElement());
   while( text != NULL)
     {