mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 01:47:31 +02:00
Changing updateAvatarCollisions() to be updateCollisionsWithAvatars()
To agree with names of other similar methods.
This commit is contained in:
parent
082b7cf1a9
commit
d2d32d0ed9
2 changed files with 3 additions and 3 deletions
|
@ -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) {
|
||||||
updateAvatarCollisions(deltaTime);
|
updateCollisionsWithAvatars(deltaTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -970,7 +970,7 @@ public:
|
||||||
|
|
||||||
const float DEFAULT_HAND_RADIUS = 0.1f;
|
const float DEFAULT_HAND_RADIUS = 0.1f;
|
||||||
|
|
||||||
void MyAvatar::updateAvatarCollisions(float deltaTime) {
|
void MyAvatar::updateCollisionsWithAvatars(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();
|
||||||
|
|
|
@ -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 updateAvatarCollisions(float deltaTime);
|
void updateCollisionsWithAvatars(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);
|
||||||
|
|
Loading…
Reference in a new issue