Merge branch 'develop' into feature/globebrowsing

Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp

include/openspace/rendering/abufferrenderer.h

@@ -105,7 +105,7 @@ private:
     /**
      * When a volume is attached or detached from the scene graph,
      * the resolve program needs to be recompiled.
-     * The #_volumes map keeps track of which volumes that can
+     * The _volumes map keeps track of which volumes that can
      * be rendered using the current resolve program, along with their raycast data
      * (id, namespace, etc)
      */ 

include/openspace/rendering/renderable.h

@@ -1,4 +1,3 @@
-
 /*****************************************************************************************
  *                                                                                       *
  * OpenSpace                                                                             *
@@ -33,6 +32,8 @@
 
 #include <ghoul/opengl/programobject.h>
 
+#include <openspace/documentation/documentation.h>
+
 
 // Forward declare to minimize dependencies
 namespace ghoul {
@@ -51,6 +52,13 @@ class PowerScaledCoordinate;
 
 class Renderable : public properties::PropertyOwner {
 public:
+    enum class RenderBin : int {
+        Background = 1,
+        Opaque = 2,
+        Transparent = 4,
+        Overlay = 8
+    };
+
     static Renderable* createFromDictionary(const ghoul::Dictionary& dictionary);
 
     // constructors & destructor
@@ -64,14 +72,18 @@ public:
     virtual bool isReady() const = 0;
     bool isEnabled() const;
 
-    void setBoundingSphere(const PowerScaledScalar& boundingSphere);
-    const PowerScaledScalar& getBoundingSphere();
+    void setBoundingSphere(PowerScaledScalar boundingSphere);
+    PowerScaledScalar getBoundingSphere();
 
     virtual void render(const RenderData& data);
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
     virtual void postRender(const RenderData& data);
     virtual void update(const UpdateData& data);
 
+    RenderBin renderBin() const;
+    void setRenderBin(RenderBin bin);
+    bool matchesRenderBinMask(int binMask);
+
     bool isVisible() const;
     
     bool hasTimeInterval();
@@ -81,10 +93,13 @@ public:
 
     static void setPscUniforms(ghoul::opengl::ProgramObject& program, const Camera& camera, const PowerScaledCoordinate& position);
 
+    static Documentation Documentation();
+
 protected:
     properties::BoolProperty _enabled;
     
 private:
+    RenderBin _renderBin;
     PowerScaledScalar boundingSphere_;
     std::string _startTime;
     std::string _endTime;

include/openspace/rendering/screenspacerenderable.h

@@ -35,6 +35,8 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 
+#include <openspace/documentation/documentation.h>
+
 namespace openspace {
 
 /**
@@ -63,6 +65,8 @@ public:
     glm::vec3 sphericalPosition() const;
     float depth() const;
     
+    static openspace::Documentation Documentation();
+
 protected:
     void createPlane();
     void useEuclideanCoordinates(bool b);