- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/ForceField.h
r3196 r5693 33 33 #include "OrxonoxPrereqs.h" 34 34 35 #include " interfaces/Tickable.h"35 #include "tools/interfaces/Tickable.h" 36 36 #include "StaticEntity.h" 37 37 … … 43 43 ForceField(BaseObject* creator); 44 44 virtual ~ForceField(); 45 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CheckPoint object through XML.45 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 46 46 virtual void tick(float dt); 47 47 48 48 inline void setVelocity(float vel) 49 49 { this->velocity_ = vel; } 50 50 51 51 inline float getVelocity() 52 52 { return velocity_; } 53 53 54 54 inline void setDiameter(float diam) 55 55 { this->diameter_ = diam; } … … 57 57 inline float getDiameter() 58 58 { return diameter_; } 59 59 60 60 inline void setLength(float l) 61 61 { this->length_ = l; }
Note: See TracChangeset
for help on using the changeset viewer.