From 6daf8cb6a07fb224a6afd9cfc21c8d0f10501661 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sun, 1 May 2016 13:08:30 +0200
Subject: [PATCH] Move nighttexture shader into base module

---
 modules/base/CMakeLists.txt                            | 2 ++
 modules/base/rendering/renderableplanet.cpp            | 7 ++++---
 {shaders => modules/base/shaders}/nighttexture_fs.glsl | 0
 {shaders => modules/base/shaders}/nighttexture_vs.glsl | 0
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename {shaders => modules/base/shaders}/nighttexture_fs.glsl (100%)
 rename {shaders => modules/base/shaders}/nighttexture_vs.glsl (100%)

diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 5f8c46ca69..d3ad6bdb1c 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -71,6 +71,8 @@ set(SHADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_vs.glsl
     ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_fs.glsl
     ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_vs.glsl
+    ${CMAKE_CURRENT_SOURCE_DIR}/shaders/nighttexture_fs.glsl
+    ${CMAKE_CURRENT_SOURCE_DIR}/shaders/nighttexture_vs.glsl
     ${CMAKE_CURRENT_SOURCE_DIR}/shaders/path_fs.glsl
     ${CMAKE_CURRENT_SOURCE_DIR}/shaders/path_gs.glsl
     ${CMAKE_CURRENT_SOURCE_DIR}/shaders/path_vs.glsl
diff --git a/modules/base/rendering/renderableplanet.cpp b/modules/base/rendering/renderableplanet.cpp
index 6a3c333c1a..c25d3e93ea 100644
--- a/modules/base/rendering/renderableplanet.cpp
+++ b/modules/base/rendering/renderableplanet.cpp
@@ -131,9 +131,10 @@ bool RenderablePlanet::initialize() {
         // Night texture program
         _programObject = renderEngine.buildRenderProgram(
             "nightTextureProgram",
-            "${SHADERS}/nighttexture_vs.glsl",
-            "${SHADERS}/nighttexture_fs.glsl");
-        if (!_programObject) return false;
+            "${MODULE_BASE}/shaders/nighttexture_vs.glsl",
+            "${MODULE_BASE}/shaders/nighttexture_fs.glsl");
+        if (!_programObject)
+            return false;
     }
     else if (_programObject == nullptr) {
         // pscstandard
diff --git a/shaders/nighttexture_fs.glsl b/modules/base/shaders/nighttexture_fs.glsl
similarity index 100%
rename from shaders/nighttexture_fs.glsl
rename to modules/base/shaders/nighttexture_fs.glsl
diff --git a/shaders/nighttexture_vs.glsl b/modules/base/shaders/nighttexture_vs.glsl
similarity index 100%
rename from shaders/nighttexture_vs.glsl
rename to modules/base/shaders/nighttexture_vs.glsl