Compile fix for touch module

Compile fix for AbfferRenderer
This commit is contained in:
Alexander Bock
2018-12-03 09:55:13 -05:00
parent f8b72a3a04
commit 203db2357e
2 changed files with 4 additions and 2 deletions

View File

@@ -445,7 +445,6 @@ bool TouchInteraction::guiMode(const std::vector<TuioCursor>& list) {
// pressed invisible button
_guiON = !_guiON;
module.gui.setEnabled(_guiON);
module.gui.setHidden(!_guiON);
LINFO(fmt::format(
"GUI mode is {}. Inside box by: ({}%, {}%)",

View File

@@ -28,6 +28,7 @@
#include <openspace/engine/globals.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/performance/performancemanager.h>
#include <openspace/performance/performancemeasurement.h>
#include <openspace/rendering/raycastermanager.h>
#include <openspace/rendering/renderengine.h>
@@ -543,6 +544,8 @@ void ABufferRenderer::updateMSAASamplingPattern() {
}
void ABufferRenderer::render(Scene* scene, Camera* camera, float blackoutFactor) {
const bool doPerformanceMeasurements = global::performanceManager.isEnabled();
PerfMeasure("ABufferRenderer::render");
if (!scene || !camera) {
@@ -877,7 +880,7 @@ void ABufferRenderer::updateRaycastData() {
_helperPaths.clear();
const std::vector<VolumeRaycaster*>& raycasters =
global::renderEngine.raycasterManager().raycasters();
global::raycasterManager.raycasters();
std::map<std::string, int> namespaceIndices;
// raycaster ids are positive integers starting at 0. (for raycasters,