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

Make field of view preference change be applied immediately

Browse source
This commit is contained in:
David Rowe 2015-06-25 15:41:10 -07:00
parent fec8318cfa
commit 377979e380
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -1029,7 +1029,7 @@ void Application::showEditEntitiesHelp() {
InfoView::show(INFO_EDIT_ENTITIES_PATH); InfoView::show(INFO_EDIT_ENTITIES_PATH);
} }
void Application::resetCamerasOnResizeGL(Camera& camera, const glm::uvec2& size) { void Application::resetCameras(Camera& camera, const glm::uvec2& size) {
if (OculusManager::isConnected()) { if (OculusManager::isConnected()) {
OculusManager::configureCamera(camera); OculusManager::configureCamera(camera);
} else if (TV3DManager::isConnected()) { } else if (TV3DManager::isConnected()) {
@ -1052,7 +1052,6 @@ void Application::resizeGL() {
if (_renderResolution != toGlm(renderSize)) { if (_renderResolution != toGlm(renderSize)) {
_renderResolution = toGlm(renderSize); _renderResolution = toGlm(renderSize);
DependencyManager::get<TextureCache>()->setFrameBufferSize(renderSize); DependencyManager::get<TextureCache>()->setFrameBufferSize(renderSize);
resetCamerasOnResizeGL(_myCamera, _renderResolution);
glViewport(0, 0, _renderResolution.x, _renderResolution.y); // shouldn't this account for the menu??? glViewport(0, 0, _renderResolution.x, _renderResolution.y); // shouldn't this account for the menu???
@ -1060,6 +1059,8 @@ void Application::resizeGL() {
glLoadIdentity(); glLoadIdentity();
} }
resetCameras(_myCamera, _renderResolution);
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
auto canvasSize = _glWidget->size(); auto canvasSize = _glWidget->size();

2
interface/src/Application.h
View file

@ -479,7 +479,7 @@ private slots:
void setCursorVisible(bool visible); void setCursorVisible(bool visible);
private: private:
void resetCamerasOnResizeGL(Camera& camera, const glm::uvec2& size); void resetCameras(Camera& camera, const glm::uvec2& size);
void updateProjectionMatrix(); void updateProjectionMatrix();
void updateProjectionMatrix(Camera& camera, bool updateViewFrustum = true); void updateProjectionMatrix(Camera& camera, bool updateViewFrustum = true);