Changeset 2429 for code/branches/physics/src/orxonox/objects/collisionshapes

Timestamp:

Dec 13, 2008, 11:18:44 PM (16 years ago)

Author:

rgrieder

Message:

Added XML Parameters for restitution, angular factor, linear damping, angular damping and friction to WorldEntity.

File:

• code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) (1 diff)

code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -67 +67 @@
         XMLPortParamTemplate(CollisionShape, "position", setPosition, getPosition, xmlelement, mode, const Vector3&);
         XMLPortParamTemplate(CollisionShape, "orientation", setOrientation, getOrientation, xmlelement, mode, const Quaternion&);
+        XMLPortParamTemplate(CollisionShape, "scale3D", setScale3D, getScale3D, xmlelement, mode, const Vector3&);
+        XMLPortParamLoadOnly(CollisionShape, "scale", setScale, xmlelement, mode);
         XMLPortParamLoadOnly(CollisionShape, "yaw",   yaw,   xmlelement, mode);
         XMLPortParamLoadOnly(CollisionShape, "pitch", pitch, xmlelement, mode);
         XMLPortParamLoadOnly(CollisionShape, "roll",  roll,  xmlelement, mode);
-        XMLPortParamTemplate(CollisionShape, "scale3D", setScale3D, getScale3D, xmlelement, mode, const Vector3&);
-        XMLPortParamLoadOnly(CollisionShape, "scale", setScale, xmlelement, mode);
     }