Changeset 5090 in orxonox.OLD

Timestamp:

Aug 21, 2005, 8:50:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: math should be easy…

Location:

trunk/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (6 diffs)
• lib/graphics/text_engine.cc (modified) (1 diff)
• util/shell.cc (modified) (2 diffs)

trunk/src/glmenu/glmenu_imagescreen.cc

@@ -44 +44 @@
   // End of Background image code.
 
-  if (root)
+  if (root != NULL)
     this->loadParams(root);
 }

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

@@ -194 +194 @@
 void Element2D::setRelCoor2Dpx (int x, int y)
 {
-  this->setRelCoor2D(Vector((float)GraphicsEngine::getInstance()->getResolutionX()/(float)x,
-                     (float)GraphicsEngine::getInstance()->getResolutionY()/(float)y,
+  this->setRelCoor2D(Vector((float)x/(float)GraphicsEngine::getInstance()->getResolutionX(),
+                     (float)y/(float)GraphicsEngine::getInstance()->getResolutionY(),
                      0
                            ));
@@ -212 +212 @@
 void Element2D::setRelCoorSoft2Dpx (int x, int y, float bias)
 {
-  this->setRelCoorSoft2D(Vector((float)GraphicsEngine::getInstance()->getResolutionX()/(float)x,
-                         (float)GraphicsEngine::getInstance()->getResolutionY()/(float)y,
+  this->setRelCoorSoft2D(Vector((float)x/(float)GraphicsEngine::getInstance()->getResolutionX(),
+                         (float)y/(float)GraphicsEngine::getInstance()->getResolutionY(),
                          0),
                          bias);
@@ -253 +253 @@
 void Element2D::setAbsCoor2Dpx (int x, int y)
 {
-  this->setAbsCoor2D(Vector((float)GraphicsEngine::getInstance()->getResolutionX()/(float)x,
-                     (float)GraphicsEngine::getInstance()->getResolutionY()/(float)y,
+  this->setAbsCoor2D(Vector((float)x/(float)GraphicsEngine::getInstance()->getResolutionX(),
+                     (float)y/(float)GraphicsEngine::getInstance()->getResolutionY(),
                      0
                            ));
@@ -269 +269 @@
 void Element2D::shiftCoor2Dpx (int x, int y)
 {
-  this->shiftCoor2D(Vector((float)GraphicsEngine::getInstance()->getResolutionX()/(float)x,
-                     (float)GraphicsEngine::getInstance()->getResolutionY()/(float)y,
+  this->shiftCoor2D(Vector((float)x/(float)GraphicsEngine::getInstance()->getResolutionX(),
+                    (float)y/(float)GraphicsEngine::getInstance()->getResolutionY(),
                      0));
 }
@@ -453 +453 @@
     {
       /* update the current absDirection - remember * means rotation around sth.*/
-      this->prevRelCoordinate = this->relCoordinate;
+      this->prevRelDirection = this->relDirection;
       this->absDirection = this->relDirection + parent->getAbsDir2D();;
     }
@@ -493 +493 @@
         /* update the current absCoordinate */
         this->prevRelCoordinate = this->relCoordinate;
+        float sine = sin(this->parent->getAbsDir2D());
+        float cose = cos(this->parent->getAbsDir2D());
+//        this->absCoordinate.x = this->relCoordinate.x*cose - this->relCoordinate.y*sine + this->parent->getRelCoor2D().x*(1-cose) +this->parent->getRelCoor2D().y*sine;
+//        this->absCoordinate.y = this->relCoordinate.x*sine + this->relCoordinate.y*cose + this->parent->getRelCoor2D().y*(1-cose) +this->parent->getRelCoor2D().x*sine;
+
         this->absCoordinate.x = this->parent->getAbsCoor2D().x + (this->relCoordinate.x*cos(this->parent->getAbsDir2D()) - this->relCoordinate.y * sin(this->parent->getAbsDir2D()));
         this->absCoordinate.y = this->parent->getAbsCoor2D().y + (this->relCoordinate.x*sin(this->parent->getAbsDir2D()) + this->relCoordinate.y * cos(this->parent->getAbsDir2D()));

trunk/src/lib/graphics/text_engine.cc

@@ -209 +209 @@
       //      glEnable(GL_TEXTURE_2D);
       glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
+//      glRotatef(this->getAbsDir2D(), 0,0,1);
 
       const char* tmpText = this->text;

trunk/src/util/shell.cc

@@ -43 +43 @@
   this->setBufferSize(100);
   this->setBufferDisplaySize(10);
+  this->setAbsCoor2D(2, 400);
+  this->setAbsDir2D(0);
 
   this->inputLineText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 255, 0, 0);
@@ -83 +85 @@
     this->bufferText[i] = TextEngine::getInstance()->createText("fonts/earth.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
     this->bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
-    this->bufferText[i]->setRelCoor2D(5, 400 + 12*i);
+    this->bufferText[i]->setRelCoor2D(5, 12*i);
     this->bufferText[i]->setText(NULL);
     this->bufferText[i]->setParent2D(this);