From a3e65fc231ca26cdcc465c38f12aac841fbbd20d Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 17 Nov 2014 18:44:38 -0800 Subject: [PATCH] Simplification, window fix. --- interface/src/MetavoxelSystem.cpp | 5 +---- interface/src/ui/MetavoxelEditor.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/interface/src/MetavoxelSystem.cpp b/interface/src/MetavoxelSystem.cpp index 7edf96d1c6..28c2707049 100644 --- a/interface/src/MetavoxelSystem.cpp +++ b/interface/src/MetavoxelSystem.cpp @@ -2036,12 +2036,9 @@ void HeightfieldRenderer::render(bool cursor) { glColor4f(1.0f, 1.0f, 1.0f, 1.0f); DefaultMetavoxelRendererImplementation::getBaseHeightfieldProgram().bind(); - float sDistance = 2.0f / (innerWidth - 1); - float tDistance = 2.0f / (innerHeight - 1); - float distanceProduct = -sDistance * tDistance; DefaultMetavoxelRendererImplementation::getBaseHeightfieldProgram().setUniformValue( DefaultMetavoxelRendererImplementation::getBaseHeightScaleLocation(), 1.0f / width, 1.0f / height, - sDistance / distanceProduct, tDistance / distanceProduct); + (innerWidth - 1) / -2.0f, (innerHeight - 1) / -2.0f); DefaultMetavoxelRendererImplementation::getBaseHeightfieldProgram().setUniformValue( DefaultMetavoxelRendererImplementation::getBaseColorScaleLocation(), (float)width / innerWidth, (float)height / innerHeight); diff --git a/interface/src/ui/MetavoxelEditor.cpp b/interface/src/ui/MetavoxelEditor.cpp index f0634f5c40..43b542213d 100644 --- a/interface/src/ui/MetavoxelEditor.cpp +++ b/interface/src/ui/MetavoxelEditor.cpp @@ -48,7 +48,7 @@ enum GridPlane { const glm::vec2 INVALID_VECTOR(FLT_MAX, FLT_MAX); MetavoxelEditor::MetavoxelEditor() : - QWidget(Application::getInstance()->getGLWidget(), Qt::Tool) { + QWidget(Application::getInstance()->getWindow(), Qt::Tool) { setWindowTitle("Metavoxel Editor"); setAttribute(Qt::WA_DeleteOnClose);