Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 11:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing iteration through list of avatars.

Browse source
This commit is contained in:
Andrew Meadows 2014-01-29 14:36:22 -08:00
parent f093a571c5
commit b2d60ec1f8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/src/avatar/MyAvatar.cpp
View file

@ -110,7 +110,6 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
_velocity += _scale * _gravity * (GRAVITY_EARTH * deltaTime);
}
// Only collide if we are not moving to a target
if (_collisionFlags != 0) {
Camera* myCamera = Application::getInstance()->getCamera();
@ -758,17 +757,18 @@ void MyAvatar::updateAvatarCollisions(float deltaTime) {
// Reset detector for nearest avatar
_distanceToNearestAvatar = std::numeric_limits<float>::max();
float myRadius = (0.5f + COLLISION_RADIUS_SCALE) * getHeight();
foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
//qDebug() << "updateCollisionWithAvatars()... node:" << *node << "\n";
if (node->getLinkedData() && node->getType() == NODE_TYPE_AGENT) {
Avatar* avatar = static_cast<Avatar*>(node->getLinkedData());
float theirRadius = (0.5f + COLLISION_RADIUS_SCALE) * avatar->getHeight();
float distance = glm::length(_position - avatar->_position);
if (distance < myRadius + theirRadius) {
//printf("potential avatar collision d = %e\n", distance);
}
foreach (const AvatarSharedPointer& avatarPointer, Application::getInstance()->getAvatarManager().getAvatarHash()) {
Avatar* avatar = static_cast<Avatar*>(avatarPointer.data());
float distance = glm::length(_position - avatar->_position);
if (_distanceToNearestAvatar > distance) {
_distanceToNearestAvatar = distance;
}
float theirRadius = (0.5f + COLLISION_RADIUS_SCALE) * avatar->getHeight();
if (distance < myRadius + theirRadius) {
//printf("potential avatar collision d = %e\n", distance);
}
}
}
class SortedAvatar {