Merge branch 'feature/fieldlines' into feature/ABuffer

Conflicts:
	src/rendering/renderablevolumegl.cpp

include/openspace/rendering/renderable.h

@@ -52,9 +52,10 @@ public:
     virtual void update();
 
 protected:
-    // Renderable();
+    std::string findPath(const std::string& path);
 private:
     PowerScaledScalar boundingSphere_;
+    std::string _relativePath;
 };
 
 }  // namespace openspace

include/openspace/rendering/renderablefieldlines.h

@@ -0,0 +1,77 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014                                                                    *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef RENDERABLEFIELDLINES_H_
+#define RENDERABLEFIELDLINES_H_
+
+// open space includes
+#include <openspace/rendering/renderable.h>
+
+// ghoul includes
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/filesystem/file.h>
+
+#ifdef __APPLE__
+    #include <memory>
+#else
+    #include <mutex>
+#endif
+
+namespace openspace {
+
+class RenderableFieldlines : public Renderable {
+public:
+	RenderableFieldlines(const ghoul::Dictionary& dictionary);
+	~RenderableFieldlines();
+
+	bool initialize();
+	bool deinitialize();
+
+	virtual void render(const Camera *camera, const psc& thisPosition);
+	virtual void update();
+
+private:
+	ghoul::Dictionary _hintsDictionary;
+	std::string _filename;
+	std::vector<glm::vec3> _seedPoints;
+
+	ghoul::opengl::ProgramObject* _fieldlinesProgram;
+	GLuint _VAO;
+
+	std::mutex* _shaderMutex;
+
+	ghoul::filesystem::File* _vertexSourceFile;
+	ghoul::filesystem::File* _fragmentSourceFile;
+
+	std::vector<GLint> _lineStart;
+	std::vector<GLsizei> _lineCount;
+
+	bool _programUpdateOnSave;
+	void safeShaderCompilation();
+
+
+};
+
+} // namespace openspace
+#endif // RENDERABLEFIELDLINES_H_

include/openspace/rendering/renderablevolume.h

@@ -29,7 +29,6 @@
 #include <openspace/rendering/renderable.h>
 
 // ghoul includes
-#include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/io/rawvolumereader.h>
 
@@ -37,23 +36,18 @@ namespace openspace {
 
 class RenderableVolume: public Renderable {
 public:
-
 	// constructors & destructor
 	RenderableVolume(const ghoul::Dictionary& dictionary);
 	~RenderableVolume();
     
 protected:
-    std::string findPath(const std::string& path);
     ghoul::opengl::Texture* loadVolume(const std::string& filepath, const ghoul::Dictionary& hintsDictionary);
     ghoul::RawVolumeReader::ReadHints readHints(const ghoul::Dictionary& dictionary);
     ghoul::opengl::Texture* loadTransferFunction(const std::string& filepath);
 
 private:
-
-    // relative path
-    std::string _relativePath;
 };
 
 } // namespace openspace
 
-#endif
+#endif

include/openspace/util/kameleonwrapper.h

@@ -25,7 +25,7 @@
 #ifndef KAMELEONWRAPPER_H_
 #define KAMELEONWRAPPER_H_
 
-#include <glm/glm.hpp>
+//#include <glm/glm.hpp>
 #include <glm/gtx/std_based_type.hpp>
 
 namespace ccmc {
@@ -43,14 +43,42 @@ public:
 		BATSRUS		// Magnetosphere
 	};
 
+	enum TraceDirection {
+		FORWARD = 1,
+		BACK 	= -1
+	};
+
 	KameleonWrapper(const std::string& filename, Model model);
 	~KameleonWrapper();
 	float* getUniformSampledValues(const std::string& var, glm::size3_t outDimensions);
+	float* getUniformSampledVectorValues(const std::string& xVar, const std::string& yVar,
+			const std::string& zVar, glm::size3_t outDimensions);
+
+	float* getVolumeFieldLines(const std::string& xVar, const std::string& yVar,
+			const std::string& zVar, glm::size3_t outDimensions, std::vector<glm::vec3> seedPoints);
+
+	std::vector<std::vector<glm::vec3> > getFieldLines(const std::string& xVar,
+			const std::string& yVar, const std::string& zVar,
+			std::vector<glm::vec3> seedPoints);
 
 private:
+	std::vector<glm::vec3> traceCartesianFieldline(const std::string& xVar,
+			const std::string& yVar, const std::string& zVar,
+			glm::vec3 seedPoint, TraceDirection direction);
+
+	void getGridVariables(std::string& x, std::string& y, std::string& z);
+	void progressBar(int current, int end);
+
 	ccmc::Model* _model;
     Model _type;
 	ccmc::Interpolator* _interpolator;
+
+	// Model parameters
+	float _xMin, _xMax, _yMin, _yMax, _zMin, _zMax;
+	std::string _xCoordVar, _yCoordVar, _zCoordVar;
+
+	 // For progressbar
+	int _lastiProgress;
 };
 
 } // namespace openspace