Merge pull request #2112 from ey6es/master

Fix for billboards' rendering incorrectly when rear view mirror is disabled.
This commit is contained in:
Andrzej Kapolka 2014-02-26 12:13:45 -08:00
commit 959c225843
2 changed files with 2 additions and 3 deletions

View file

@ -1487,8 +1487,7 @@ void Application::init() {
_myCamera.setModeShiftPeriod(1.0f);
_mirrorCamera.setMode(CAMERA_MODE_MIRROR);
_mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
_mirrorCamera.setFieldOfView(30);
_mirrorCamera.setModeShiftPeriod(0.0f);
OculusManager::connect();
if (OculusManager::isConnected()) {

View file

@ -126,7 +126,7 @@ void Camera::setModeShiftPeriod (float period) {
// if a zero period was requested, we clearly want to snap immediately to the target
if (period == 0.0f) {
update(MIN_PERIOD);
update(MAX_PERIOD);
}
}