- Timestamp:
- May 19, 2011, 1:47:01 PM (14 years ago)
- Location:
- code/branches/spaceboundaries2/src/orxonox/worldentities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc
r8468 r8506 273 273 /* Checke, ob das Pawn innerhalb des nächsten Ticks, das erlaubte Gebiet verlassen würde. 274 274 Falls ja: Spicke es zurück. */ 275 if( currentDistance + normalSpeed * dt > this->maxDistance_ - 10 ) // -10: "security measure"275 if( currentDistance + normalSpeed * dt > this->maxDistance_ - 20 ) // -20: "security measure" 276 276 { 277 277 float dampingFactor = 0.5; … … 284 284 item->setAcceleration(acceleration * dampingFactor); 285 285 item->setVelocity(velocity * dampingFactor); 286 287 item->setPosition( item->getPosition() - normal * 10 ); 286 288 } 287 289 } -
code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h
r8468 r8506 50 50 #include <string> 51 51 #include <list> 52 #include <map>53 52 #include <vector> 54 53 … … 94 93 void positionBillboard(const Vector3 position); //!< Display a Billboard at the position 'position'. 95 94 void setBillboardOptions(Billboard *billy); 96 void removeAllBillboards(); //!< Hide all allelements of '*billboard_' and set their attribute 'usedYet' to 0.95 void removeAllBillboards(); //!< Hide all elements of '*billboard_' and set their attribute 'usedYet' to 0. 97 96 98 97 void setMaxDistance(float r);
Note: See TracChangeset
for help on using the changeset viewer.