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

Timestamp:

Oct 13, 2005, 2:11:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fancy effects in Shell

Location:

trunk/src/lib/graphics

Files:

• render2D/element_2d.cc (modified) (5 diffs)
• text_engine/text.cc (modified) (2 diffs)

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

@@ -622 +622 @@
     if (unlikely(this->toCoordinate != NULL))
     {
-      Vector moveVect = (*this->toCoordinate - this->getRelCoor2D()) *fabsf(dt)*bias;
+      Vector moveVect = (*this->toCoordinate - this->relCoordinate) *fabsf(dt)*bias;
 
       if (likely(moveVect.len() >= .001))//PNODE_ITERATION_DELTA))
@@ -630 +630 @@
       else
       {
-        delete this->toCoordinate;
-        this->toCoordinate = NULL;
+        this->setRelCoor2D(*this->toCoordinate+moveVect);
         PRINTF(5)("SmoothMove of %s finished\n", this->getName());
       }
@@ -637 +636 @@
     if (unlikely(this->toDirection != NULL))
     {
-      float rotFlot = (*this->toDirection - this->getRelDir2D()) *fabsf(dt)*bias;
-      if (likely(rotFlot >= .001))//PNODE_ITERATION_DELTA))
+      float rotFlot = (*this->toDirection - this->relDirection) *fabsf(dt)*bias;
+      if (likely(fabsf(rotFlot) >= .001))//PNODE_ITERATION_DELTA))
       {
         this->shiftDir2D(rotFlot);
@@ -644 +643 @@
       else
       {
-        delete this->toDirection;
-        this->toDirection = NULL;
+        this->setRelDir2D(*this->toDirection+rotFlot);
         PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
       }
@@ -722 +720 @@
     {
       this->prevRelDirection = this->relDirection;
-      this->absDirection = this->getAbsDir2D() * this->relDirection;
+      this->absDirection = this->getAbsDir2D() + this->relDirection;
     }
   }

trunk/src/lib/graphics/text_engine/text.cc

@@ -235 +235 @@
       glBindTexture(GL_TEXTURE_2D, Font::getDefaultFont()->getFastTextureID());
     }
-    glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
-//      glRotatef(this->getAbsDir2D(), 0,0,1);
     const char* tmpText = this->externText;
     if (this->externText == NULL)
@@ -242 +240 @@
     if (likely(tmpText != NULL))
     {
+      glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
+      glRotatef(this->getAbsDir2D(), 0,0,1);
       Glyph* tmpGlyph;
       float posX = 0.0f;