Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 13:56:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3488 from PhilipRosedale/master

Browse source 
Correct eye contact for Oculus users
This commit is contained in:
Stephen Birarda 2014-09-26 15:42:03 -07:00
commit 7c738edbd8
8 changed files with 102 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/src/Application.cpp
View file

@ -1997,8 +1997,16 @@ void Application::updateMyAvatarLookAtPosition() {
glm::vec3 lookAtSpot;
if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
// When I am in mirror mode, just look right at the camera (myself)
lookAtSpot = _myCamera.getPosition();
if (!OculusManager::isConnected()) {
lookAtSpot = _myCamera.getPosition();
} else {
if (_myAvatar->isLookingAtLeftEye()) {
lookAtSpot = OculusManager::getLeftEyePosition();
} else {
lookAtSpot = OculusManager::getRightEyePosition();
}
}
} else {
AvatarSharedPointer lookingAt = _myAvatar->getLookAtTargetAvatar().toStrongRef();
if (lookingAt && _myAvatar != lookingAt.data()) {
@ -2006,7 +2014,7 @@ void Application::updateMyAvatarLookAtPosition() {
isLookingAtSomeone = true;
// If I am looking at someone else, look directly at one of their eyes
if (tracker) {
// If tracker active, look at the eye for the side my gaze is biased toward
// If a face tracker is active, look at the eye for the side my gaze is biased toward
if (tracker->getEstimatedEyeYaw() > _myAvatar->getHead()->getFinalYaw()) {
// Look at their right eye
lookAtSpot = static_cast<Avatar*>(lookingAt.data())->getHead()->getRightEyePosition();
@ -2016,7 +2024,11 @@ void Application::updateMyAvatarLookAtPosition() {
}
} else {
// Need to add randomly looking back and forth between left and right eye for case with no tracker
lookAtSpot = static_cast<Avatar*>(lookingAt.data())->getHead()->getEyePosition();
if (_myAvatar->isLookingAtLeftEye()) {
lookAtSpot = static_cast<Avatar*>(lookingAt.data())->getHead()->getLeftEyePosition();
} else {
lookAtSpot = static_cast<Avatar*>(lookingAt.data())->getHead()->getRightEyePosition();
}
}
} else {
// I am not looking at anyone else, so just look forward

18
interface/src/avatar/Head.cpp
View file

@ -110,7 +110,7 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
bool forceBlink = false;
const float TALKING_LOUDNESS = 100.0f;
const float BLINK_AFTER_TALKING = 0.25f;
if (_averageLoudness > TALKING_LOUDNESS) {
if ((_averageLoudness - _longTermAverageLoudness) > TALKING_LOUDNESS) {
_timeWithoutTalking = 0.0f;
} else if (_timeWithoutTalking < BLINK_AFTER_TALKING && (_timeWithoutTalking += deltaTime) >= BLINK_AFTER_TALKING) {
@ -118,7 +118,8 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
}
// Update audio attack data for facial animation (eyebrows and mouth)
_audioAttack = 0.9f * _audioAttack + 0.1f * fabs((_audioLoudness - _longTermAverageLoudness) - _lastLoudness);
const float AUDIO_ATTACK_AVERAGING_RATE = 0.9f;
_audioAttack = AUDIO_ATTACK_AVERAGING_RATE * _audioAttack + (1.0f - AUDIO_ATTACK_AVERAGING_RATE) * fabs((_audioLoudness - _longTermAverageLoudness) - _lastLoudness);
_lastLoudness = (_audioLoudness - _longTermAverageLoudness);
const float BROW_LIFT_THRESHOLD = 100.0f;
@ -128,16 +129,23 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
_browAudioLift = glm::clamp(_browAudioLift *= 0.7f, 0.0f, 1.0f);
const float BLINK_SPEED = 10.0f;
const float BLINK_SPEED_VARIABILITY = 1.0f;
const float BLINK_START_VARIABILITY = 0.25f;
const float FULLY_OPEN = 0.0f;
const float FULLY_CLOSED = 1.0f;
if (_leftEyeBlinkVelocity == 0.0f && _rightEyeBlinkVelocity == 0.0f) {
// no blinking when brows are raised; blink less with increasing loudness
const float BASE_BLINK_RATE = 15.0f / 60.0f;
const float ROOT_LOUDNESS_TO_BLINK_INTERVAL = 0.25f;
if (forceBlink || (_browAudioLift < EPSILON && shouldDo(glm::max(1.0f, sqrt(_averageLoudness) *
if (forceBlink || (_browAudioLift < EPSILON && shouldDo(glm::max(1.0f, sqrt(fabs(_averageLoudness - _longTermAverageLoudness)) *
ROOT_LOUDNESS_TO_BLINK_INTERVAL) / BASE_BLINK_RATE, deltaTime))) {
_leftEyeBlinkVelocity = BLINK_SPEED;
_rightEyeBlinkVelocity = BLINK_SPEED;
_leftEyeBlinkVelocity = BLINK_SPEED + randFloat() * BLINK_SPEED_VARIABILITY;
_rightEyeBlinkVelocity = BLINK_SPEED + randFloat() * BLINK_SPEED_VARIABILITY;
if (randFloat() < 0.5f) {
_leftEyeBlink = BLINK_START_VARIABILITY;
} else {
_rightEyeBlink = BLINK_START_VARIABILITY;
}
}
} else {
_leftEyeBlink = glm::clamp(_leftEyeBlink + _leftEyeBlinkVelocity * deltaTime, FULLY_OPEN, FULLY_CLOSED);

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

@ -86,7 +86,8 @@ MyAvatar::MyAvatar() :
_shouldRender(true),
_billboardValid(false),
_physicsSimulation(),
_voxelShapeManager()
_voxelShapeManager(),
_isLookingAtLeftEye(true)
{
ShapeCollider::initDispatchTable();
for (int i = 0; i < MAX_DRIVE_KEYS; i++) {
@ -978,7 +979,11 @@ void MyAvatar::updateLookAtTargetAvatar() {
howManyLookingAtMe++;
// Have that avatar look directly at my camera
// Philip TODO: correct to look at left/right eye
avatar->getHead()->setCorrectedLookAtPosition(Application::getInstance()->getViewFrustum()->getPosition());
if (OculusManager::isConnected()) {
avatar->getHead()->setCorrectedLookAtPosition(OculusManager::getLeftEyePosition());
} else {
avatar->getHead()->setCorrectedLookAtPosition(Application::getInstance()->getViewFrustum()->getPosition());
}
} else {
avatar->getHead()->clearCorrectedLookAtPosition();
}
@ -993,6 +998,14 @@ void MyAvatar::clearLookAtTargetAvatar() {
_lookAtTargetAvatar.clear();
}
bool MyAvatar::isLookingAtLeftEye() {
float const CHANCE_OF_CHANGING_EYE = 0.01f;
if (randFloat() < CHANCE_OF_CHANGING_EYE) {
_isLookingAtLeftEye = !_isLookingAtLeftEye;
}
return _isLookingAtLeftEye;
}
glm::vec3 MyAvatar::getUprightHeadPosition() const {
return _position + getWorldAlignedOrientation() * glm::vec3(0.0f, getPelvisToHeadLength(), 0.0f);
}

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

@ -106,6 +106,8 @@ public:
void jump() { _shouldJump = true; };
bool isMyAvatar() { return true; }
bool isLookingAtLeftEye();
virtual int parseDataAtOffset(const QByteArray& packet, int offset);
@ -230,6 +232,8 @@ private:
QList<AnimationHandlePointer> _animationHandles;
PhysicsSimulation _physicsSimulation;
VoxelShapeManager _voxelShapeManager;
bool _isLookingAtLeftEye;
RecorderPointer _recorder;

16
interface/src/devices/OculusManager.cpp
View file

@ -55,6 +55,9 @@ bool OculusManager::_programInitialized = false;
Camera* OculusManager::_camera = NULL;
int OculusManager::_activeEyeIndex = -1;
glm::vec3 OculusManager::_leftEyePosition;
glm::vec3 OculusManager::_rightEyePosition;
#endif
void OculusManager::connect() {
@ -348,6 +351,17 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
_camera->setTargetRotation(bodyOrientation * orientation);
_camera->setTargetPosition(position + trackerPosition);
// Store the latest left and right eye render locations for things that need to know
glm::vec3 thisEyePosition = position + trackerPosition +
(bodyOrientation * glm::quat(orientation.x, orientation.y, orientation.z, orientation.w) *
glm::vec3(_eyeRenderDesc[eye].ViewAdjust.x, _eyeRenderDesc[eye].ViewAdjust.y, _eyeRenderDesc[eye].ViewAdjust.z));
if (eyeIndex == 0) {
_leftEyePosition = thisEyePosition;
} else {
_rightEyePosition = thisEyePosition;
}
_camera->update(1.0f / Application::getInstance()->getFps());
Matrix4f proj = ovrMatrix4f_Projection(_eyeRenderDesc[eye].Fov, whichCamera.getNearClip(), whichCamera.getFarClip(), true);
@ -362,7 +376,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(_eyeRenderDesc[eye].ViewAdjust.x, _eyeRenderDesc[eye].ViewAdjust.y, _eyeRenderDesc[eye].ViewAdjust.z);
Application::getInstance()->displaySide(*_camera);
applicationOverlay.displayOverlayTextureOculus(*_camera);

16
interface/src/devices/OculusManager.h
View file

@ -45,7 +45,16 @@ public:
static void overrideOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal,
float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane);
#ifdef HAVE_LIBOVR
static glm::vec3 getLeftEyePosition() { return _leftEyePosition; }
static glm::vec3 getRightEyePosition() { return _rightEyePosition; }
#else
static glm::vec3 getLeftEyePosition() { return glm::vec3(); }
static glm::vec3 getRightEyePosition() { return glm::vec3(); }
#endif
private:
#ifdef HAVE_LIBOVR
static void generateDistortionMesh();
@ -96,7 +105,12 @@ private:
static bool _programInitialized;
static Camera* _camera;
static int _activeEyeIndex;
static glm::vec3 _leftEyePosition;
static glm::vec3 _rightEyePosition;
#endif
};
#endif // hifi_OculusManager_h

38
libraries/shared/src/StdDev.cpp
View file

@ -13,50 +13,40 @@
#include <cmath>
#include "StdDev.h"
const int MAX_STDEV_SAMPLES = 1000;
const int NUM_SAMPLES = 1000;
StDev::StDev() {
data = new float[MAX_STDEV_SAMPLES];
sampleCount = 0;
_data = new float[NUM_SAMPLES];
_sampleCount = 0;
}
void StDev::reset() {
sampleCount = 0;
_sampleCount = 0;
}
void StDev::addValue(float v) {
data[sampleCount++] = v;
if (sampleCount == MAX_STDEV_SAMPLES) sampleCount = 0;
_data[_sampleCount++] = v;
if (_sampleCount == NUM_SAMPLES) _sampleCount = 0;
}
float StDev::getAverage() const {
float average = 0;
for (int i = 0; i < sampleCount; i++) {
average += data[i];
for (int i = 0; i < _sampleCount; i++) {
average += _data[i];
}
if (sampleCount > 0)
return average/(float)sampleCount;
if (_sampleCount > 0)
return average / (float)_sampleCount;
else return 0;
}
/*
float StDev::getMax() {
float average = -FLT_MAX;
for (int i = 0; i < sampleCount; i++) {
average += data[i];
}
if (sampleCount > 0)
return average/(float)sampleCount;
else return 0;
}*/
float StDev::getStDev() const {
float average = getAverage();
float stdev = 0;
for (int i = 0; i < sampleCount; i++) {
stdev += powf(data[i] - average, 2);
for (int i = 0; i < _sampleCount; i++) {
stdev += powf(_data[i] - average, 2);
}
if (sampleCount > 1)
return sqrt(stdev/(float)(sampleCount - 1.0));
if (_sampleCount > 1)
return sqrt(stdev / (float)(_sampleCount - 1.0f));
else
return 0;
}

20
libraries/shared/src/StdDev.h
View file

@ -13,16 +13,16 @@
#define hifi_StdDev_h
class StDev {
public:
StDev();
void reset();
void addValue(float v);
float getAverage() const;
float getStDev() const;
int getSamples() const { return sampleCount; }
private:
float * data;
int sampleCount;
public:
StDev();
void reset();
void addValue(float v);
float getAverage() const;
float getStDev() const;
int getSamples() const { return _sampleCount; }
private:
float* _data;
int _sampleCount;
};
#endif // hifi_StdDev_h