Changeset 5406 in orxonox.OLD for trunk/src/lib/coord

Timestamp:

Oct 19, 2005, 6:30:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: update the Element2D-tree in the right order

Location:

trunk/src/lib/coord

Files:

• p_node.cc (modified) (5 diffs)
• p_node.h (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -12 +12 @@
    main-programmer: Patrick Boenzli
    co-programmer:
-
-   @todo Smooth-Parent: delay, speed
 */
 
@@ -31 +29 @@
 #include "vector.h"
 
-//#include "vector.h"
-//#include "quaternion.h"
+#include "color.h"
 
 using namespace std;
@@ -278 +275 @@
   this->setAbsCoor(Vector(x, y, z));
 }
+
+/**
+ * @param absCoord set absolute coordinate
+ * @todo check off
+ */
+void PNode::setAbsCoorSoft (const Vector& absCoordSoft, float bias)
+{
+  if (this->toCoordinate == NULL)
+    this->toCoordinate = new Vector;
+
+  if( likely(this->parentMode & PNODE_MOVEMENT))
+  {
+      /* if you have set the absolute coordinates this overrides all other changes */
+    if (likely(this->parent != NULL))
+      *this->toCoordinate = absCoordSoft - parent->getAbsCoor ();
+    else
+      *this->toCoordinate = absCoordSoft;
+  }
+  if( this->parentMode & PNODE_ROTATE_MOVEMENT)
+  {
+    if (likely(this->parent != NULL))
+      *this->toCoordinate = absCoordSoft - parent->getAbsCoor ();
+    else
+      *this->toCoordinate = absCoordSoft;
+  }
+}
+
 
 /**
@@ -695 +719 @@
   }
 }
-#include "color.h"
 
 /**
@@ -767 +790 @@
     {
       // drawing the Dependency graph
-      if (this != NullParent::getInstance())
+     if (this != NullParent::getInstance())
       {
        glBegin(GL_LINES);

trunk/src/lib/coord/p_node.h

@@ -65 +65 @@
   void setAbsCoor (const Vector& absCoord);
   void setAbsCoor (float x, float y, float z);
+  void setAbsCoorSoft(const Vector& absCoordSoft, float bias = 1.0);
+  void setAbsCoorSoft(float x, float y, float z, float bias = 1.0);
   /** @returns the absolute position */
   inline const Vector& getAbsCoor () const { return this->absCoordinate; };