From 74dd1873f0937078633dc3fdb50228cf58520913 Mon Sep 17 00:00:00 2001 From: Emil Axelsson Date: Tue, 4 Oct 2016 12:04:06 +0200 Subject: [PATCH] Clean up toy volume module --- modules/toyvolume/rendering/renderabletoyvolume.cpp | 7 ------- modules/toyvolume/rendering/toyvolumeraycaster.cpp | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 0ce1f7b70a..73ac923689 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -33,13 +33,6 @@ #include #include - -namespace { - const std::string GlslRayCastPath = "${MODULES}/toyvolume/shaders/rayCast.glsl"; - const std::string GlslBoundsVsPath = "${MODULES}/toyvolume/shaders/boundsVs.glsl"; - const std::string GlslBoundsFsPath = "${MODULES}/toyvolume/shaders/boundsFs.glsl"; -} - namespace openspace { RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary) diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp index 8687f93744..ef4c46fea8 100644 --- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp +++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp @@ -34,8 +34,8 @@ namespace { const std::string GlslRaycastPath = "${MODULES}/toyvolume/shaders/raycast.glsl"; - const std::string GlslBoundsVsPath = "${MODULES}/toyvolume/shaders/boundsVs.glsl"; - const std::string GlslBoundsFsPath = "${MODULES}/toyvolume/shaders/boundsFs.glsl"; + const std::string GlslBoundsVsPath = "${MODULES}/toyvolume/shaders/boundsvs.glsl"; + const std::string GlslBoundsFsPath = "${MODULES}/toyvolume/shaders/boundsfs.glsl"; } namespace openspace {