shadder location fixed

core/tools/glreduction.cpp

@@ -43,24 +43,17 @@ namespace campvis {
 
     const std::string GlReduction::loggerCat_ = "CAMPVis.modules.registration.GlReduction";
 
-    GlReduction::GlReduction(ReductionOperator reductionOperator, bool isForTesting)
+    GlReduction::GlReduction(ReductionOperator reductionOperator)
         : _reductionOperator(reductionOperator)
         , _shader1d(0)
         , _shader2d(0)
         , _shader3d(0)
         , _fbo(0)
     {
-        //TODO: discuss details, and generalize this
-        if(!isForTesting) {
         _shader1d = ShdrMgr.load("core/glsl/passthrough.vert", "core/glsl/tools/glreduction.frag", generateGlslHeader(_reductionOperator) + "#define REDUCTION_1D\n");
         _shader2d = ShdrMgr.load("core/glsl/passthrough.vert", "core/glsl/tools/glreduction.frag", generateGlslHeader(_reductionOperator) + "#define REDUCTION_2D\n");
         _shader3d = ShdrMgr.load("core/glsl/passthrough.vert", "core/glsl/tools/glreduction.frag", generateGlslHeader(_reductionOperator) + "#define REDUCTION_3D\n");
-        }
-        else {
-            _shader1d = ShdrMgr.load("../src/core/glsl/passthrough.vert", "../src/core/glsl/tools/glreduction.frag", generateGlslHeader(_reductionOperator) + "#define REDUCTION_1D\n");
-            _shader2d = ShdrMgr.load("../src/core/glsl/passthrough.vert", "../src/core/glsl/tools/glreduction.frag", generateGlslHeader(_reductionOperator) + "#define REDUCTION_2D\n");
-            _shader3d = ShdrMgr.load("../src/core/glsl/passthrough.vert", "../src/core/glsl/tools/glreduction.frag", generateGlslHeader(_reductionOperator) + "#define REDUCTION_3D\n");
-        }
+
         if (_shader1d == 0 || _shader2d == 0 || _shader3d == 0) {
             LERROR("Could not load Shader for OpenGL reduction. Reduction will not work!");
             return;

core/tools/glreduction.h

@@ -63,7 +63,7 @@ namespace campvis {
          * Constructor
          * \param   reductionOperator   Operation to be performed by reduction
          */
-        GlReduction(ReductionOperator reductionOperator, bool isForTesting = false);
+        GlReduction(ReductionOperator reductionOperator);
 
         /**
          * Destructor

test/core/tools/glreductiontest.cpp

@@ -61,9 +61,7 @@ protected:
     }
 
     ~GlReductionTest() {
-        //delete localRep;
         delete imgData;
-        //delete rawData;
         delete glReduction;
     }
 
@@ -110,7 +108,7 @@ TEST_F(GlReductionTest, localRepCreationTest) {
  * Tests for ReducationOperator::MIN.
  */
 TEST_F(GlReductionTest, minTest) {
-    glReduction = new GlReduction(GlReduction::ReductionOperator::MIN, true);
+    glReduction = new GlReduction(GlReduction::ReductionOperator::MIN);
     std::vector<float> reduced = glReduction->reduce(imgData);
 
     ASSERT_NEAR(0, reduced[0], 0.0001);
@@ -121,7 +119,7 @@ TEST_F(GlReductionTest, minTest) {
  * Tests for ReducationOperator::MAX.
  */
 TEST_F(GlReductionTest, maxTest) {
-    glReduction = new GlReduction(GlReduction::ReductionOperator::MAX, true);
+    glReduction = new GlReduction(GlReduction::ReductionOperator::MAX);
     std::vector<float> reduced = glReduction->reduce(imgData);
 
     ASSERT_NEAR(1, reduced[0], 0.0001);
@@ -132,7 +130,7 @@ TEST_F(GlReductionTest, maxTest) {
  * Tests for ReducationOperator::PLUS.
  */
 TEST_F(GlReductionTest, sumTest) {
-    glReduction = new GlReduction(GlReduction::ReductionOperator::PLUS, true);
+    glReduction = new GlReduction(GlReduction::ReductionOperator::PLUS);
     std::vector<float> reduced = glReduction->reduce(imgData);
 
     ASSERT_NEAR(1, reduced[0], 0.0001);
@@ -143,7 +141,7 @@ TEST_F(GlReductionTest, sumTest) {
  * Tests for ReducationOperator::MULTIPLICATION.
  */
 TEST_F(GlReductionTest, multTest) {
-    glReduction = new GlReduction(GlReduction::ReductionOperator::MULTIPLICATION, true);
+    glReduction = new GlReduction(GlReduction::ReductionOperator::MULTIPLICATION);
     std::vector<float> reduced = glReduction->reduce(imgData);
 
     ASSERT_NEAR(0, reduced[0], 0.0001);

test/main.cpp

@@ -89,6 +89,14 @@ void init() {
 
     campvis::QuadRenderer::init();
 
+#ifdef CAMPVIS_SOURCE_DIR
+    {
+        std::string sourcePath = CAMPVIS_SOURCE_DIR;
+        ShdrMgr.addPath(sourcePath);
+        ShdrMgr.addPath(sourcePath + "/core/glsl");
+    }
+#endif
+
     // ensure matching OpenGL specs
     LINFO("Using Graphics Hardware " << GpuCaps.getVendorAsString() << " " << GpuCaps.getGlRendererString() << " on " << GpuCaps.getOSVersionString());
     LINFO("Supported OpenGL " << GpuCaps.getGlVersion() << ", GLSL " << GpuCaps.getShaderVersion());