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

Timestamp:

Oct 15, 2005, 8:22:30 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a reparenting bug
made the naming more compliant

File:

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

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

@@ -555 +555 @@
  * @param bias the speed to iterate to this new Positions
  */
-void Element2D::softReparent2D(Element2D* parentNode, float bias)
+void Element2D::setParentSoft2D(Element2D* parentNode, float bias)
 {
   if (this->parent == parentNode)
@@ -578 +578 @@
   parentNode->addChild2D(this);
 
-  if (this->parentMode & PNODE_ROTATE_MOVEMENT)
+  if (this->parentMode & PNODE_ROTATE_MOVEMENT) //! @todo implement this.
     ;//this->setRelCoor(this->parent->getAbsDir().inverse().apply(tmpV - this->parent->getAbsCoor()));
   else
-    this->setRelCoor2D(tmpV - parentNode->getAbsCoor2D());
-
-  this->setRelDir2D(tmpQ - parentNode->getAbsDir2D());
+    this->relCoordinate = (tmpV - parentNode->getAbsCoor2D());
+  this->bRelCoorChanged = true;
+
+  this->relDirection = (tmpQ - parentNode->getAbsDir2D());
+  this->bRelDirChanged = true;
 }
 
@@ -591 +593 @@
  * @param bias the speed to iterate to this new Positions
  */
-void Element2D::softReparent2D(const char* parentName, float bias)
+void Element2D::setParentSoft2D(const char* parentName, float bias)
 {
   Element2D* parentNode = dynamic_cast<Element2D*>(ClassList::getObject(parentName, CL_ELEMENT_2D));
   if (parentNode != NULL)
-    this->softReparent2D(parentNode, bias);
+    this->setParentSoft2D(parentNode, bias);
 }
 
@@ -852 +854 @@
 
 
-
 ///////////////////
 // NullElement2D //