From e4f8f8c830129d24e7c6844ab5f2be195ca64e6b Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 11 Apr 2016 11:18:50 -0400
Subject: [PATCH] Clang compile fixes

---
 modules/fieldlines/rendering/renderablefieldlines.cpp       | 2 +-
 modules/multiresvolume/rendering/renderablemultiresvolume.h | 2 +-
 modules/multiresvolume/rendering/tsp.cpp                    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 76b18d889a..c22c343cca 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -225,7 +225,7 @@ void RenderableFieldlines::render(const RenderData& data) {
 	_program->setUniform("modelViewProjection", data.camera.viewProjectionMatrix());
 	_program->setUniform("modelTransform", glm::mat4(1.0));
 	_program->setUniform("cameraViewDir", data.camera.viewDirection());
-	setPscUniforms(_program.get(), &data.camera, data.position);
+	setPscUniforms(*_program, data.camera, data.position);
 
 	_program->setUniform("classification", _classification);
 	if (!_classification)
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h
index bf8f23939e..408f5eea0a 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.h
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h
@@ -80,7 +80,7 @@ public:
     bool isReady() const override;
 
     virtual void update(const UpdateData& data) override;
-    virtual void RenderableMultiresVolume::render(const RenderData& data, RendererTasks& tasks);
+    virtual void render(const RenderData& data, RendererTasks& tasks);
     //virtual void preResolve(ghoul::opengl::ProgramObject* program) override;
     //virtual std::string getHeaderPath() override;
     //virtual std::string getHelperPath() override;
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 0aa18704dd..886f903dbe 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -22,16 +22,18 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <sgct.h>
+//#include <sgct.h>
 #include <modules/multiresvolume/rendering/tsp.h>
 
 // ghoul
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/glm.h>
 
 // std
 #include <algorithm>
+#include <math.h>
 #include <queue>
 
 namespace {