Conditionally compile ABuffer Renderer (closes #509)

This commit is contained in:
Alexander Bock
2018-06-26 17:16:25 -04:00
parent 3e107fa370
commit 8d44b74db4
4 changed files with 19 additions and 0 deletions
+6
View File
@@ -271,6 +271,12 @@ handle_applications()
##########################################################################################
# Misc settings #
##########################################################################################
option(OPENSPACE_WITH_ABUFFER_RENDERER "Compile ABuffer Renderer" OFF)
if (OPENSPACE_WITH_ABUFFER_RENDERER)
target_compile_definitions(libOpneSpace PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER")
endif ()
# Just in case, create the bin directory
add_custom_command(
TARGET libOpenSpace
@@ -25,6 +25,8 @@
#ifndef __OPENSPACE_CORE___ABUFFERRENDERER___H__
#define __OPENSPACE_CORE___ABUFFERRENDERER___H__
#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
#include <openspace/rendering/renderer.h>
#include <openspace/rendering/raycasterlistener.h>
@@ -143,4 +145,6 @@ private:
} // namespace openspace
#endif // OPENSPACE_WITH_ABUFFER_RENDERER
#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__
+4
View File
@@ -22,6 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
#include <openspace/rendering/abufferrenderer.h>
#include <openspace/engine/openspaceengine.h>
@@ -985,3 +987,5 @@ void ABufferRenderer::saveTextureToMemory(GLenum color_buffer_attachment, int wi
}
} // namespace openspace
#endif // OPENSPACE_WITH_ABUFFER_RENDERER
+5
View File
@@ -304,10 +304,13 @@ void RenderEngine::setRendererFromString(const std::string& renderingMethod) {
newRenderer = std::make_unique<FramebufferRenderer>();
break;
case RendererImplementation::ABuffer:
#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
newRenderer = std::make_unique<ABufferRenderer>();
#endif // OPENSPACE_WITH_ABUFFER_RENDERER
break;
case RendererImplementation::Invalid:
LFATAL(fmt::format("Rendering method '{}' not available", renderingMethod));
return;
}
setRenderer(std::move(newRenderer));
@@ -1013,7 +1016,9 @@ RenderEngine::RendererImplementation RenderEngine::rendererFromString(
const std::string& renderingMethod) const
{
const std::map<std::string, RenderEngine::RendererImplementation> RenderingMethods = {
#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
{ "ABuffer", RendererImplementation::ABuffer },
#endif // OPENSPACE_WITH_ABUFFER_RENDERER
{ "Framebuffer", RendererImplementation::Framebuffer }
};