From 203db2357ef570dacc5ce4a2b46cb6fc7620cc0b Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 3 Dec 2018 09:55:13 -0500 Subject: [PATCH] Compile fix for touch module Compile fix for AbfferRenderer --- modules/touch/src/touchinteraction.cpp | 1 - src/rendering/abufferrenderer.cpp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 4551e951c2..d0878ed4c6 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -445,7 +445,6 @@ bool TouchInteraction::guiMode(const std::vector& list) { // pressed invisible button _guiON = !_guiON; module.gui.setEnabled(_guiON); - module.gui.setHidden(!_guiON); LINFO(fmt::format( "GUI mode is {}. Inside box by: ({}%, {}%)", diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp index b490a8659a..a3c56fb98d 100644 --- a/src/rendering/abufferrenderer.cpp +++ b/src/rendering/abufferrenderer.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -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& raycasters = - global::renderEngine.raycasterManager().raycasters(); + global::raycasterManager.raycasters(); std::map namespaceIndices; // raycaster ids are positive integers starting at 0. (for raycasters,