untabify to make merge easier

include/openspace/rendering/abufferrenderer.h

@@ -41,14 +41,14 @@
 #include <openspace/util/updatestructures.h>
 
 namespace ghoul {
-	
+    
     namespace filesystem {
         class File;
     }
-	namespace opengl {
+    namespace opengl {
         class ProgramObject;
-		class Texture;
-	}
+        class Texture;
+    }
 }
 
 namespace openspace {
@@ -56,11 +56,11 @@ namespace openspace {
 class RenderableVolume;
 class Camera;
 class Scene;
-	
+    
 class ABufferRenderer : public Renderer, public RaycasterListener {
 public:
-	ABufferRenderer();
-	virtual ~ABufferRenderer();
+    ABufferRenderer();
+    virtual ~ABufferRenderer();
 
     void initialize() override;
     void deinitialize() override;
@@ -70,7 +70,7 @@ public:
     void setResolution(glm::ivec2 res) override;
 
     void update();
-	void render(float blackoutFactor, bool doPerformanceMeasurements) override;
+    void render(float blackoutFactor, bool doPerformanceMeasurements) override;
 
 
     /**
@@ -120,7 +120,7 @@ private:
     int _nAaSamples;
 
     ghoul::Dictionary _rendererData;
-};		// ABufferRenderer
-}		// openspace
+};        // ABufferRenderer
+}        // openspace
 
-#endif 	// __RENDERER_H__
+#endif     // __RENDERER_H__

include/openspace/rendering/framebufferrenderer.h

@@ -37,15 +37,15 @@
 #include <openspace/util/updatestructures.h>
 
 namespace ghoul {
-	class Dictionary;
-	
+    class Dictionary;
+    
     namespace filesystem {
         class File;
     }
-	namespace opengl {
+    namespace opengl {
         class ProgramObject;
-		class Texture;
-	}
+        class Texture;
+    }
 }
 
 namespace openspace {
@@ -53,11 +53,11 @@ namespace openspace {
 class RenderableVolume;
 class Camera;
 class Scene;
-	
+    
 class FramebufferRenderer : public Renderer, public RaycasterListener {
 public:
-	FramebufferRenderer();
-	virtual ~FramebufferRenderer();
+    FramebufferRenderer();
+    virtual ~FramebufferRenderer();
 
     void initialize() override;
     void deinitialize() override;
@@ -70,7 +70,7 @@ public:
     void setResolution(glm::ivec2 res) override;
 
     void update() override;
-	void render(float blackoutFactor, bool doPerformanceMeasurements) override;
+    void render(float blackoutFactor, bool doPerformanceMeasurements) override;
     
     /**
      * Update render data
@@ -105,7 +105,7 @@ private:
     int _nAaSamples;
 
     ghoul::Dictionary _rendererData;
-};		// FramebufferRenderer
-}		// openspace
+};        // FramebufferRenderer
+}        // openspace
 
-#endif 	// __FRAMEBUFFERRENDERER_H__
+#endif     // __FRAMEBUFFERRENDERER_H__

include/openspace/rendering/renderable.h

@@ -36,10 +36,10 @@
 
 // Forward declare to minimize dependencies
 namespace ghoul {
-	namespace opengl {
-		class Texture;
-	}
-	class Dictionary;
+    namespace opengl {
+        class Texture;
+    }
+    class Dictionary;
 }
 
 namespace openspace {
@@ -60,8 +60,8 @@ public:
     virtual bool initialize() = 0;
     virtual bool deinitialize() = 0;
 
-	virtual bool isReady() const = 0;
-	bool isEnabled() const;
+    virtual bool isReady() const = 0;
+    bool isEnabled() const;
 
     void setBoundingSphere(const PowerScaledScalar& boundingSphere);
     const PowerScaledScalar& getBoundingSphere();
@@ -70,29 +70,29 @@ public:
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
     virtual void update(const UpdateData& data);
 
-	bool isVisible() const;
-	
-	bool hasTimeInterval();
-	bool getInterval(double& start, double& end);
-	
-	bool hasBody();
-	bool getBody(std::string& body);
-	void setBody(std::string& body);
+    bool isVisible() const;
+    
+    bool hasTimeInterval();
+    bool getInterval(double& start, double& end);
+    
+    bool hasBody();
+    bool getBody(std::string& body);
+    void setBody(std::string& body);
 
     void onEnabledChange(std::function<void(bool)> callback);
 
     static void setPscUniforms(ghoul::opengl::ProgramObject& program, const Camera& camera, const PowerScaledCoordinate& position);
 
 protected:
-	properties::BoolProperty _enabled;
-	
+    properties::BoolProperty _enabled;
+    
 private:
     PowerScaledScalar boundingSphere_;
-	std::string _startTime;
-	std::string _endTime;
-	std::string _targetBody;
-	bool _hasBody;
-	bool _hasTimeInterval;
+    std::string _startTime;
+    std::string _endTime;
+    std::string _targetBody;
+    bool _hasBody;
+    bool _hasTimeInterval;
 };
 
 }  // namespace openspace

include/openspace/rendering/renderer.h

@@ -33,15 +33,15 @@
 #include <map>
 
 namespace ghoul {
-	class Dictionary;
-	
+    class Dictionary;
+    
     namespace filesystem {
         class File;
     }
-	namespace opengl {
+    namespace opengl {
         class ProgramObject;
-		class Texture;
-	}
+        class Texture;
+    }
 }
 
 namespace openspace {
@@ -49,7 +49,7 @@ namespace openspace {
 class RenderableVolume;
 class Camera;
 class Scene;
-	
+    
 class Renderer {
 public:
     virtual void initialize() = 0;
@@ -60,14 +60,14 @@ public:
     virtual void setResolution(glm::ivec2 res) = 0;
 
     virtual void update() = 0;
-	virtual void render(float blackoutFactor, bool doPerformanceMeasurements) = 0;
+    virtual void render(float blackoutFactor, bool doPerformanceMeasurements) = 0;
     /**
      * Update render data
      * Responsible for calling renderEngine::setRenderData
      */
     virtual void updateRendererData() = 0;
     
-};		// Renderer
-}		// openspace
+};        // Renderer
+}        // openspace
 
-#endif 	// __RENDERER_H__
+#endif     // __RENDERER_H__

include/openspace/rendering/screenspacerenderable.h

@@ -53,73 +53,73 @@ namespace openspace {
  */
 class ScreenSpaceRenderable : public properties::PropertyOwner {
 public:
-	ScreenSpaceRenderable();
-	~ScreenSpaceRenderable();
+    ScreenSpaceRenderable();
+    ~ScreenSpaceRenderable();
 
-	virtual void render() = 0;
-	virtual bool initialize() = 0;
-	virtual bool deinitialize() = 0;
-	virtual void update() = 0;
-	virtual bool isReady() const = 0;
-	bool isEnabled() const;
-	
-	glm::vec2 euclideanPosition() const {return _euclideanPosition.value();};
-	glm::vec2 sphericalPosition() const {return _sphericalPosition.value();};
-	float depth() const {return _depth.value();};
-	
+    virtual void render() = 0;
+    virtual bool initialize() = 0;
+    virtual bool deinitialize() = 0;
+    virtual void update() = 0;
+    virtual bool isReady() const = 0;
+    bool isEnabled() const;
+    
+    glm::vec2 euclideanPosition() const {return _euclideanPosition.value();};
+    glm::vec2 sphericalPosition() const {return _sphericalPosition.value();};
+    float depth() const {return _depth.value();};
+    
 protected:
-	void createPlane();
-	void useEuclideanCoordinates(bool b);
+    void createPlane();
+    void useEuclideanCoordinates(bool b);
 
-	/**
-	 * @brief Converts vec2 polar coordinates to euclidean 
-	 * 
-	 * @param polar the coordinates theta and phi
-	 * @param radius the radius position value of the plane
-	 * 
-	 * @return glm::vec2 with the x and y position value of the plane 
-	 */
-	glm::vec2 toEuclidean(glm::vec2 polar, float radius);
+    /**
+     * @brief Converts vec2 polar coordinates to euclidean 
+     * 
+     * @param polar the coordinates theta and phi
+     * @param radius the radius position value of the plane
+     * 
+     * @return glm::vec2 with the x and y position value of the plane 
+     */
+    glm::vec2 toEuclidean(glm::vec2 polar, float radius);
 
-	/**
-	 * @brief Converts vec2 euclidean coordinates to sperical
-	 * 
-	 * @param euclidean the coordinates x and y
-	 * @return glm::vec2 with the spherical coordinates theta and phi.
-	 */
-	glm::vec2 toSpherical(glm::vec2 euclidean);
-	void registerProperties();
-	void unregisterProperties();
+    /**
+     * @brief Converts vec2 euclidean coordinates to sperical
+     * 
+     * @param euclidean the coordinates x and y
+     * @return glm::vec2 with the spherical coordinates theta and phi.
+     */
+    glm::vec2 toSpherical(glm::vec2 euclidean);
+    void registerProperties();
+    void unregisterProperties();
 
-	void createShaders();
-	glm::mat4 scaleMatrix();
-	glm::mat4 rotationMatrix();
-	glm::mat4 translationMatrix();
-	void draw(glm::mat4 modelTransform);
+    void createShaders();
+    glm::mat4 scaleMatrix();
+    glm::mat4 rotationMatrix();
+    glm::mat4 translationMatrix();
+    void draw(glm::mat4 modelTransform);
 
-	properties::BoolProperty _enabled;
-	properties::BoolProperty _useFlatScreen;
-	properties::Vec2Property _euclideanPosition;
-	properties::Vec2Property _sphericalPosition;
-	properties::FloatProperty _depth;
-	properties::FloatProperty _scale;
-	properties::FloatProperty _alpha;
-	properties::TriggerProperty _delete;
+    properties::BoolProperty _enabled;
+    properties::BoolProperty _useFlatScreen;
+    properties::Vec2Property _euclideanPosition;
+    properties::Vec2Property _sphericalPosition;
+    properties::FloatProperty _depth;
+    properties::FloatProperty _scale;
+    properties::FloatProperty _alpha;
+    properties::TriggerProperty _delete;
 
-	GLuint _quad;
-	GLuint _vertexPositionBuffer;
-	const std::string _rendererPath;
-	ghoul::Dictionary _rendererData;
-	const std::string _vertexPath;
-	const std::string _fragmentPath;
-	std::unique_ptr<ghoul::opengl::Texture>  _texture;
-	std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
+    GLuint _quad;
+    GLuint _vertexPositionBuffer;
+    const std::string _rendererPath;
+    ghoul::Dictionary _rendererData;
+    const std::string _vertexPath;
+    const std::string _fragmentPath;
+    std::unique_ptr<ghoul::opengl::Texture>  _texture;
+    std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 
-	bool _useEuclideanCoordinates;
-	const float _planeDepth = -2.0;
-	glm::vec2 _originalViewportSize;
+    bool _useEuclideanCoordinates;
+    const float _planeDepth = -2.0;
+    glm::vec2 _originalViewportSize;
 
-	float _radius;
+    float _radius;
 };
 }  // namespace openspace
 #endif  // __SCREENSPACERENDERABLE_H__