Changeset 5750 in orxonox.OLD for trunk/src/lib/coord/p_node.h

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/lib/coord/p_node.h (modified) (2 diffs)

trunk/src/lib/coord/p_node.h

@@ -70 +70 @@
   inline const Vector& getAbsCoor () const { return this->absCoordinate; };
   void shiftCoor (const Vector& shift);
+  void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };
 
   void setRelDir (const Quaternion& relDir);
@@ -127 +128 @@
   static const char* parentingModeToChar(int parentingMode);
   static PARENT_MODE charToParentingMode(const char* parentingMode);
+
+
  private:
   void init(PNode* parent);