Changeset 7127 for code/branches/presentation3/src/orxonox/worldentities
- Timestamp:
- Jun 9, 2010, 9:32:58 PM (15 years ago)
- Location:
- code/branches/presentation3/src/orxonox/worldentities
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/orxonox/worldentities/Drone.h
r7060 r7127 53 53 virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick. 54 54 55 55 56 56 virtual void moveFrontBack(const Vector2& value); 57 57 virtual void moveRightLeft(const Vector2& value); … … 61 61 virtual void rotatePitch(const Vector2& value); 62 62 virtual void rotateRoll(const Vector2& value); 63 63 64 64 /** 65 65 @brief Moves the Drone in the Front/Back-direction by the specifed amount. … … 80 80 inline void moveUpDown(float value) 81 81 { this->moveUpDown(Vector2(value, 0)); } 82 82 83 83 /** 84 84 @brief Rotates the Drone around the y-axis by the specifed amount. … … 99 99 inline void rotateRoll(float value) 100 100 { this->rotateRoll(Vector2(value, 0)); } 101 101 102 102 /** 103 103 @brief Sets the primary thrust to the input amount. … … 105 105 */ 106 106 inline void setPrimaryThrust( float thrust ) 107 { this->primaryThrust_=thrust; } 107 { this->primaryThrust_=thrust; } 108 108 inline void setAuxilaryThrust( float thrust ) 109 { this->auxilaryThrust_=thrust; } 109 { this->auxilaryThrust_=thrust; } 110 110 inline void setRotationThrust( float thrust ) 111 { this->rotationThrust_=thrust; } 111 { this->rotationThrust_=thrust; } 112 112 inline void setMaxDistanceToOwner( float distance) 113 113 { this->maxDistanceToOwner_=distance; } … … 117 117 { this->maxShootingRange_=distance; } 118 118 119 119 120 120 /** 121 121 @brief Gets the primary thrust to the input amount. … … 134 134 inline float getMaxShootingRange() 135 135 { return this->maxShootingRange_; } 136 136 137 137 private: 138 138 DroneController *myController_; //!< The controller of the Drone. 139 139 140 140 btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Drone the next tick. 141 141 btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the Drone the next tick. 142 float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward. 142 float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward. 143 143 float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations). 144 144 float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only. -
code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc
r6524 r7127 81 81 this->node_->setPosition(Vector3::ZERO); 82 82 this->node_->setOrientation(Quaternion::IDENTITY); 83 83 84 84 // Activity and visibility memory. 85 85 this->bActiveMem_ = true; … … 205 205 registerVariable(this->parentID_, VariableDirection::ToClient, new NetworkCallback<WorldEntity>(this, &WorldEntity::networkcallback_parentChanged)); 206 206 } 207 207 208 208 /** 209 209 @brief … … 213 213 { 214 214 SUPER(WorldEntity, changedActivity); 215 215 216 216 for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++) 217 217 { … … 227 227 } 228 228 } 229 229 230 230 /** 231 231 @brief … … 235 235 { 236 236 SUPER(WorldEntity, changedVisibility); 237 237 238 238 for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++) 239 239 { -
code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h
r6524 r7127 105 105 static const Vector3 DOWN; 106 106 static const Vector3 UP; 107 107 108 108 virtual void changedActivity(void); 109 109 virtual void changedVisibility(void); … … 234 234 std::set<WorldEntity*> children_; 235 235 bool bDeleteWithParent_; 236 236 237 237 bool bActiveMem_; 238 238 bool bVisibleMem_;
Note: See TracChangeset
for help on using the changeset viewer.