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

Decrease the distance between members, increase the influence of the circle,

Browse source 
don't rotate members.
This commit is contained in:
Andrzej Kapolka 2013-10-16 17:21:09 -07:00
parent d7b98dbc05
commit 89d6c7905b
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1127,8 +1127,8 @@ void MyAvatar::updateChatCircle(float deltaTime) {
} }
// remove members whose accumulated circles are too far away to influence us // remove members whose accumulated circles are too far away to influence us
const float CIRCUMFERENCE_PER_MEMBER = 1.0f; const float CIRCUMFERENCE_PER_MEMBER = 0.5f;
const float CIRCLE_INFLUENCE_SCALE = 1.1f; const float CIRCLE_INFLUENCE_SCALE = 1.5f;
for (int i = sortedAvatars.size() - 1; i >= 0; i--) { for (int i = sortedAvatars.size() - 1; i >= 0; i--) {
float radius = (CIRCUMFERENCE_PER_MEMBER * (i + 2)) / PI_TIMES_TWO; float radius = (CIRCUMFERENCE_PER_MEMBER * (i + 2)) / PI_TIMES_TWO;
if (glm::distance(_position, sortedAvatars[i].accumulatedCenter) > radius * CIRCLE_INFLUENCE_SCALE) { if (glm::distance(_position, sortedAvatars[i].accumulatedCenter) > radius * CIRCLE_INFLUENCE_SCALE) {
@ -1182,15 +1182,9 @@ void MyAvatar::updateChatCircle(float deltaTime) {
float targetAngle = myAngle + (rightDistance - leftDistance) / 2.0f; float targetAngle = myAngle + (rightDistance - leftDistance) / 2.0f;
glm::vec3 targetPosition = center + (front * sinf(targetAngle) + right * cosf(targetAngle)) * radius; glm::vec3 targetPosition = center + (front * sinf(targetAngle) + right * cosf(targetAngle)) * radius;
// face the center of the circle // approach the target position
glm::quat orientation = getOrientation();
glm::quat targetOrientation = rotationBetween(orientation * IDENTITY_FRONT, center - targetPosition) * orientation;
targetOrientation = rotationBetween(targetOrientation * IDENTITY_UP, up) * targetOrientation;
// approach the target position/orientation
const float APPROACH_RATE = 0.025f; const float APPROACH_RATE = 0.025f;
_position = glm::mix(_position, targetPosition, APPROACH_RATE); _position = glm::mix(_position, targetPosition, APPROACH_RATE);
setOrientation(safeMix(orientation, targetOrientation, APPROACH_RATE));
} }
void MyAvatar::setGravity(glm::vec3 gravity) { void MyAvatar::setGravity(glm::vec3 gravity) {