Imagesequencer update:

- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.

include/openspace/rendering/model/modelgeometry.h

@@ -42,6 +42,8 @@ public:
     virtual bool initialize(RenderableModel* parent);
     virtual void deinitialize();
     virtual void render() = 0;
+	virtual void changeRenderMode(const GLenum mode) = 0;
+
 
 protected:
 	RenderableModel* _parent;

include/openspace/rendering/model/renderablemodel.h

@@ -63,7 +63,6 @@ private:
     ghoul::opengl::Texture* _texture;
 	ghoul::opengl::Texture* _bumpMap;
 
-
 	modelgeometry::ModelGeometry* _geometry;
 
 	glm::dmat3 _stateMatrix; 
@@ -75,8 +74,9 @@ private:
 
 	properties::BoolProperty _performShading;
 	properties::BoolProperty _performFade;
-
 	properties::FloatProperty _fading;
+	bool _isGhost;
+	double _time;
 
 };
 

include/openspace/rendering/model/wavefrontgeometry.h

@@ -40,6 +40,7 @@ public:
     bool initialize(RenderableModel* parent) override;
     void deinitialize() override;
     void render() override;
+	void changeRenderMode(const GLenum mode);
 	
 private:
     struct Vertex {
@@ -56,6 +57,7 @@ private:
 	GLuint _vaoID;
 	GLuint _vbo;
     GLuint _ibo;
+	GLenum _mode;
 
     std::vector<Vertex> _vertices;
     std::vector<int> _indices;

include/openspace/rendering/planets/renderableplanetprojection.h

@@ -28,7 +28,6 @@
 
 // open space includes
 #include <openspace/rendering/renderable.h>
-#include <openspace/util/imagesequencer.h>
 #include <openspace/util/imagesequencer2.h>
 
 #include <openspace/util/sequenceparser.h>
@@ -83,11 +82,13 @@ private:
     properties::StringProperty  _colorTexturePath;
 	properties::StringProperty  _projectionTexturePath;
 	properties::TriggerProperty _imageTrigger;
+	properties::FloatProperty _fadeProjection;
 
     ghoul::opengl::ProgramObject* _programObject;
 	ghoul::opengl::ProgramObject* _fboProgramObject;
 
     ghoul::opengl::Texture* _texture;
+	ghoul::opengl::Texture* _textureOriginal;
 	ghoul::opengl::Texture* _textureProj;
 	planetgeometryprojection::PlanetGeometryProjection* _geometry;
 	

include/openspace/rendering/renderablefov.h

@@ -76,9 +76,9 @@ public:
 	int _nrInserted = 0;
 	int _isteps;
 	bool _rebuild = false;
-	bool _interceptTag[5];
+	bool _interceptTag[9];
 	bool _withinFOV;
-	psc _projectionBounds[4];
+	psc _projectionBounds[8];
 	psc _interceptVector;
 
 	// spice

include/openspace/rendering/renderabletrail.h

@@ -86,6 +86,8 @@ private:
 
     float _increment;
     float _oldTime = 0;
+	float _time;
+	float _distanceFade;
 };
 
 } // namespace openspace