Changeset 10290 for code/trunk/src/orxonox
- Timestamp:
- Mar 1, 2015, 2:17:08 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/controllers/FormationController.cc
r9800 r10290 678 678 (*it)->state_=FREE; 679 679 (*it)->forceFreedom(); 680 (*it)-> target_=originator;680 (*it)->setTarget(originator); 681 681 } 682 682 i++; … … 935 935 < this->targetPosition_.squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceCurrent) / speed / distanceCurrent.length()) / math::twoPi) + rnd(-250, 250)) 936 936 { 937 this->target_ = (*it); 938 this->targetPosition_ = it->getPosition(); 937 this->setTarget(*it); 939 938 } 940 939 }
Note: See TracChangeset
for help on using the changeset viewer.