Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-28 23:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #882 from birarda/oculus

Browse source 
fix for collisions when wearing Oculus
This commit is contained in:
ZappoMan 2013-08-21 21:03:49 -07:00
commit 5897ff37c0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter, float gyroCam
if (_isCollisionsOn) { if (_isCollisionsOn) {
Camera* myCamera = Application::getInstance()->getCamera(); Camera* myCamera = Application::getInstance()->getCamera();
if (myCamera->getMode() == CAMERA_MODE_FIRST_PERSON) { if (myCamera->getMode() == CAMERA_MODE_FIRST_PERSON && !OculusManager::isConnected()) {
_collisionRadius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.f)); _collisionRadius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.f));
_collisionRadius *= COLLISION_RADIUS_SCALAR; _collisionRadius *= COLLISION_RADIUS_SCALAR;
} else { } else {