Merge pull request #442 from Ventrella/master

camera bug
This commit is contained in:
birarda 2013-05-28 18:00:23 -07:00
commit 0d81d0a451
2 changed files with 1 additions and 1 deletions

View file

@ -915,7 +915,7 @@ void Application::idle() {
_myAvatar.simulate(deltaTime, NULL);
}
if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
if (_myCamera.getMode() != CAMERA_MODE_MIRROR && !OculusManager::isConnected()) {
if (_manualFirstPerson) {
if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON ) {
_myCamera.setMode(CAMERA_MODE_FIRST_PERSON);

0
libraries/voxels/src/AABox.h Executable file → Normal file
View file