Use DynamicObjectLoader for Material and Scene generic loaders

[libs/gl.git] / source / render / renderable.h

diff --git a/source/render/renderable.h b/source/render/renderable.h
index 8af524fd64de0d73613001c7ad7ac877acb23612..aa895eedbd0f0a128f6c1da617ca0e67b4ec2a44 100644 (file)
--- 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.
 
@@ -33,10 +31,6 @@ protected:
 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; }
-
        /** 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
        correctly. */