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

Replace 0/1 with FULLY_OPEN/CLOSED.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-06-24 10:31:11 -07:00
parent 1e258aae99
commit a0ecd167fc
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Head.cpp
View file

@ -169,6 +169,8 @@ void Head::simulate(float deltaTime, bool isMine) {
// update eyelid blinking // update eyelid blinking
const float BLINK_SPEED = 5.0f; const float BLINK_SPEED = 5.0f;
const float FULLY_OPEN = 0.0f;
const float FULLY_CLOSED = 1.0f;
if (_leftEyeBlinkVelocity == 0.0f && _rightEyeBlinkVelocity == 0.0f) { if (_leftEyeBlinkVelocity == 0.0f && _rightEyeBlinkVelocity == 0.0f) {
const float BLINK_INTERVAL = 4.0f; const float BLINK_INTERVAL = 4.0f;
if (shouldDo(BLINK_INTERVAL, deltaTime)) { if (shouldDo(BLINK_INTERVAL, deltaTime)) {
@ -176,19 +178,19 @@ void Head::simulate(float deltaTime, bool isMine) {
_rightEyeBlinkVelocity = BLINK_SPEED; _rightEyeBlinkVelocity = BLINK_SPEED;
} }
} else { } else {
_leftEyeBlink = glm::clamp(_leftEyeBlink + _leftEyeBlinkVelocity * deltaTime, 0.0f, 1.0f); _leftEyeBlink = glm::clamp(_leftEyeBlink + _leftEyeBlinkVelocity * deltaTime, FULLY_OPEN, FULLY_CLOSED);
_rightEyeBlink = glm::clamp(_rightEyeBlink + _rightEyeBlinkVelocity * deltaTime, 0.0f, 1.0f); _rightEyeBlink = glm::clamp(_rightEyeBlink + _rightEyeBlinkVelocity * deltaTime, FULLY_OPEN, FULLY_CLOSED);
if (_leftEyeBlink == 1.0f) { if (_leftEyeBlink == FULLY_CLOSED) {
_leftEyeBlinkVelocity = -BLINK_SPEED; _leftEyeBlinkVelocity = -BLINK_SPEED;
} else if (_leftEyeBlink == 0.0f) { } else if (_leftEyeBlink == FULLY_OPEN) {
_leftEyeBlinkVelocity = 0.0f; _leftEyeBlinkVelocity = 0.0f;
} }
if (_rightEyeBlink == 1.0f) { if (_rightEyeBlink == FULLY_CLOSED) {
_rightEyeBlinkVelocity = -BLINK_SPEED; _rightEyeBlinkVelocity = -BLINK_SPEED;
} else if (_rightEyeBlink == 0.0f) { } else if (_rightEyeBlink == FULLY_OPEN) {
_rightEyeBlinkVelocity = 0.0f; _rightEyeBlinkVelocity = 0.0f;
} }
} }