Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:51:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drive body yaw and render pitch with oculus when connected

Browse source
This commit is contained in:
Stephen Birarda 2013-05-10 10:17:21 -07:00
parent adbca70eba
commit 04447dfcbd
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Camera.cpp
View file

@ -7,6 +7,7 @@
#include <SharedUtil.h> #include <SharedUtil.h>
#include <VoxelConstants.h> #include <VoxelConstants.h>
#include <OculusManager.h>
// #include "Log.h" // #include "Log.h"
#include "Camera.h" #include "Camera.h"
@ -69,8 +70,14 @@ void Camera::updateFollowMode(float deltaTime) {
t = 1.0; t = 1.0;
} }
// update _yaw (before position!) // update _yaw (before position!)
_yaw += (_idealYaw - _yaw) * t; if (OculusManager::isConnected()) {
// if using the oculus, just set the yaw
_yaw = _idealYaw;
} else {
_yaw += (_idealYaw - _yaw) * t;
}
_orientation.yaw(_yaw); _orientation.yaw(_yaw);
float radian = (_yaw / 180.0) * PIE; float radian = (_yaw / 180.0) * PIE;

7
interface/src/main.cpp
View file

@ -425,6 +425,13 @@ void updateAvatar(float deltaTime) {
myAvatar.setRenderPitch(myAvatar.getRenderPitch() * (1.f - RENDER_PITCH_DECAY * deltaTime)); myAvatar.setRenderPitch(myAvatar.getRenderPitch() * (1.f - RENDER_PITCH_DECAY * deltaTime));
} }
if (OculusManager::isConnected()) {
float yaw, pitch, roll;
OculusManager::getEulerAngles(yaw, pitch, roll);
myAvatar.setBodyYaw(yaw);
myAvatar.setRenderPitch(pitch);
}
// Get audio loudness data from audio input device // Get audio loudness data from audio input device
#ifndef _WIN32 #ifndef _WIN32
myAvatar.setLoudness(audio.getInputLoudness()); myAvatar.setLoudness(audio.getInputLoudness());