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

Timestamp:

Aug 23, 2005, 11:18:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk:restoring the trunk…

Location:

trunk/src/lib/graphics

Files:

• render2D/element_2d.cc (modified) (6 diffs)
• render2D/element_2d.h (modified) (2 diffs)
• text_engine.cc (modified) (4 diffs)

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

@@ -214 +214 @@
 void Element2D::setRelCoor2D (const Vector& relCoord)
 {
+  if (this->toCoordinate!= NULL)
+  {
+    delete this->toCoordinate;
+    this->toCoordinate = NULL;
+  }
   this->relCoordinate = relCoord;
   this->bRelCoorChanged = true;
@@ -227 +232 @@
 void Element2D::setRelCoor2D (float x, float y, float z)
 {
-  this->setAbsCoor2D(Vector(x,y,z));
+  this->setRelCoor2D(Vector(x,y,z));
 }
 
@@ -288 +293 @@
 void Element2D::setAbsCoor2D (const Vector& absCoord)
 {
+  if (this->toCoordinate!= NULL)
+  {
+    delete this->toCoordinate;
+    this->toCoordinate = NULL;
+  }
+
   if( likely(this->parentMode & E2D_PARENT_MOVEMENT))
   {
@@ -362 +373 @@
 void Element2D::setRelDir2D (float relDir)
 {
+  if (this->toDirection!= NULL)
+  {
+    delete this->toDirection;
+    this->toDirection = NULL;
+  }
+
   this->relDirection = relDir;
   this->bRelDirChanged = true;
@@ -386 +403 @@
 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();
@@ -712 +735 @@
   {
     tIterator<Element2D>* iterator = this->children->getIterator();
-      //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);
@@ -123 +125 @@
     /** @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/text_engine.cc

@@ -592 +592 @@
           if( glyphSurf != NULL )
             {
-
               SDL_SetAlpha(glyphSurf, 0, 0);
 
@@ -598 +597 @@
               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;
@@ -620 +619 @@
 
               // Outputting Glyphs to BMP-files.
-              /*
-                char outname[64];
+/*
+                char outname[512];
                 if (i < 10)
-                sprintf( outname, "glyph-00%d.bmp", i );
+                sprintf( outname, "%s-glyph-00%d.bmp", this->getName(), i );
                 else if (i <100)
-                sprintf( outname, "glyph-0%d.bmp", i );
+                  sprintf( outname, "%s-glyph-0%d.bmp", this->getName(), i );
                 else
-                sprintf( outname, "glyph-%d.bmp", i );
-                SDL_SaveBMP(tmpSurf, outname);
-              */
+                  sprintf( outname, "%s-glyph-%d.bmp", this->getName(), i );
+                SDL_SaveBMP(tmpSurf, outname);*/
+
             }
         }
@@ -712 +711 @@
                   x = 0;
                   y = y + maxLineHeight;
-                  maxLineHeight = 0;
+                  //maxLineHeight = 0;
                 }
               if (y + maxLineHeight + 1 > size)