Changeset 5084 in orxonox.OLD for trunk/src/lib/graphics/render2D/element_2d.cc

Timestamp:

Aug 19, 2005, 2:37:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: flush
i am going into the weekend now
@patrick: ther might be some strange behaviour, and i noticed, that the CD-engine is iterating more through the entities, than it should
I hope, this is just a minor bug, because it almost killed me in the process of developing
i do not exactly know if it is from the CD-engine, but it is producing different outputs when i start the game five times in a row

File:

• trunk/src/lib/graphics/render2D/element_2d.cc (modified) (8 diffs)

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

@@ -33 +33 @@
  * @todo this constructor is not jet implemented - do it
 */
-Element2D::Element2D ()
-{
-  this->init();
+Element2D::Element2D (Element2D* parent)
+{
+  this->init(parent);
 }
 
@@ -51 +51 @@
  * initializes a Element2D
  */
-void Element2D::init()
+void Element2D::init(Element2D* parent)
 {
   this->setClassID(CL_ELEMENT_2D, "Element2D");
@@ -60 +60 @@
   this->setAlignment(E2D_ALIGN_NONE);
   this->layer = E2D_TOP;
+
   this->setParentMode2D(E2D_PARENT_ALL);
-
+  this->children = new tList<Element2D>;
   this->bRelCoorChanged = true;
   this->bRelDirChanged = true;
+  if (parent == NULL)
+    this->parent = NULL;
+//  else
+  //  this->setParent2D(parent);
 
   Render2D::getInstance()->registerElement2D(this);
@@ -148 +153 @@
  * this sets the position of the Element on the screen.
  * Use this in the your tick function, if you want the element to be automatically positioned.
+ *
+ * @todo must be in update
  */
 void Element2D::positioning()
@@ -279 +286 @@
   if( likely(child->parent != NULL))
   {
-    PRINTF(4)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+    PRINTF(4)("Element2D::addChild() - reparenting node: removing it and adding it again\n");
     child->parent->children->remove(child);
   }
@@ -414 +421 @@
     this->lastAbsCoordinate = this->absCoordinate;
 
-    PRINTF(5)("PNode::update - %s - (%f, %f, %f)\n", this->getName(), this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+    PRINTF(5)("Element2D::update - %s - (%f, %f, %f)\n", this->getName(), this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
 
 
@@ -434 +441 @@
       /* update the current absCoordinate */
       this->prevRelCoordinate = this->relCoordinate;
-      //this->absCoordinate = this->parent->getAbsCoor2D();
       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()));
@@ -443 +449 @@
   else
   {
-    PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+    PRINTF(5)("Element2D::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
     if (this->bRelCoorChanged)
       this->absCoordinate = this->relCoordinate;