- Timestamp:
- May 26, 2011, 12:58:09 AM (13 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/bigships (added) merged: 8426,8503-8504,8588
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/worldentities/MobileEntity.h
r5781 r8589 70 70 { return this->linearAcceleration_; } 71 71 72 // Added for making N engines work with spaceships 73 void addAcceleration(const Vector3& acceleration, const Vector3 &relativePosition); 74 inline void addAcceleration(float x, float y, float z) 75 { this->addAcceleration(Vector3(x, y, z), Vector3(0,0,0)); } 76 // Getter function above 77 72 78 void setAngularAcceleration(const Vector3& acceleration); 73 79 inline void setAngularAcceleration(float x, float y, float z)
Note: See TracChangeset
for help on using the changeset viewer.