Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 20:56:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updateCollisionsWithAvatars() --> updateCollisionWithAvatars()

Browse source
This commit is contained in:
Andrew Meadows 2014-02-06 14:49:25 -08:00
parent d2d32d0ed9
commit eae0f8b2e6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,7 +225,7 @@ void MyAvatar::simulate(float deltaTime) {
updateCollisionWithVoxels(deltaTime, radius); updateCollisionWithVoxels(deltaTime, radius);
} }
if (_collisionFlags & COLLISION_GROUP_AVATARS) { if (_collisionFlags & COLLISION_GROUP_AVATARS) {
updateCollisionsWithAvatars(deltaTime); updateCollisionWithAvatars(deltaTime);
} }
} }
@ -970,7 +970,7 @@ public:
const float DEFAULT_HAND_RADIUS = 0.1f; const float DEFAULT_HAND_RADIUS = 0.1f;
void MyAvatar::updateCollisionsWithAvatars(float deltaTime) { void MyAvatar::updateCollisionWithAvatars(float deltaTime) {
// Reset detector for nearest avatar // Reset detector for nearest avatar
_distanceToNearestAvatar = std::numeric_limits<float>::max(); _distanceToNearestAvatar = std::numeric_limits<float>::max();
const AvatarHash& avatars = Application::getInstance()->getAvatarManager().getAvatarHash(); const AvatarHash& avatars = Application::getInstance()->getAvatarManager().getAvatarHash();

2
interface/src/avatar/MyAvatar.h
View file

@ -123,7 +123,7 @@ private:
void renderBody(bool forceRenderHead); void renderBody(bool forceRenderHead);
void updateThrust(float deltaTime); void updateThrust(float deltaTime);
void updateHandMovementAndTouching(float deltaTime); void updateHandMovementAndTouching(float deltaTime);
void updateCollisionsWithAvatars(float deltaTime); void updateCollisionWithAvatars(float deltaTime);
void updateCollisionWithEnvironment(float deltaTime, float radius); void updateCollisionWithEnvironment(float deltaTime, float radius);
void updateCollisionWithVoxels(float deltaTime, float radius); void updateCollisionWithVoxels(float deltaTime, float radius);
void applyHardCollision(const glm::vec3& penetration, float elasticity, float damping); void applyHardCollision(const glm::vec3& penetration, float elasticity, float damping);