X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderable.h;h=a8da643029ae03ed5739522431ffd46f5740a1c7;hp=80fe172eb7435b44f147d4324294b6c72b5d5fd2;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/render/renderable.h b/source/render/renderable.h
index 80fe172e..a8da6430 100644
--- a/source/render/renderable.h
+++ b/source/render/renderable.h
@@ -1,8 +1,6 @@
 #ifndef MSP_GL_RENDERABLE_H_
 #define MSP_GL_RENDERABLE_H_
 
-#include <string>
-#include <msp/core/inttypes.h>
 #include <msp/geometry/boundingsphere.h>
 #include "tag.h"
 
@@ -16,7 +14,7 @@ class Renderer;
 Base class for renderable objects.  Rendering is performed with the help of a
 Renderer object.
 
-The render method takes a Tag to identify a render pass.  It can be used with
+The render method takes a Tag to identify a render method.  It can be used with
 a Technique to select alternative rendering methods, such as simplified shaders
 for a depth-only shadow pass.
 
@@ -29,13 +27,9 @@ will occur before a setup_frame call or after a finish_frame call.
 class Renderable
 {
 protected:
-	Renderable() { }
+	Renderable() = default;
 public:
-	virtual ~Renderable() { }
-
-	/** Returns a key used for grouping Renderables in an InstanceScene.  The
-	returned value is treated as opaque. */
-	virtual IntPtr get_instance_key() const { return 0; }
+	virtual ~Renderable() = default;
 
 	/** Returns the model matrix of the Renderable.  Null is returned if no such
 	matrix exists.  The matrix should be in world space for some effects to work
@@ -55,7 +49,7 @@ public:
 
 	/** Renders the Renderable.  Implementors should take care to return the
 	renderer to the state it was in, for example by using Renderer::Push. */
-	virtual void render(Renderer &, const Tag & = Tag()) const = 0;
+	virtual void render(Renderer &, Tag = Tag()) const = 0;
 };
 
 } // namespace Msp