Add support for integer vertex attributes

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

diff --git a/source/render/renderable.h b/source/render/renderable.h
index 80fe172eb7435b44f147d4324294b6c72b5d5fd2..4175dd81294821f7d8d7c82d76c286ca99ad8cc0 100644 (file)
--- a/source/render/renderable.h
+++ b/source/render/renderable.h
@@ -2,7 +2,7 @@
 #define MSP_GL_RENDERABLE_H_
 
 #include <string>
-#include <msp/core/inttypes.h>
+#include <msp/core/attributes.h>
 #include <msp/geometry/boundingsphere.h>
 #include "tag.h"
 
@@ -33,10 +33,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. */
@@ -55,7 +51,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