Deprecated InstanceScene and Renderable::get_instance_key

InstanceArray is a superior way of rendering multiple instances of an
object.

diff --git a/source/render/instancescene.cpp b/source/render/instancescene.cpp
index 20ac0f688a24ce4e1ac811b4c72247c9dd0be217..c1f109793a6921a9ab2a68f9cd726c876baf0bbc 100644 (file)
--- a/source/render/instancescene.cpp
+++ b/source/render/instancescene.cpp
@@ -3,6 +3,8 @@
 #include "instancescene.h"
 #include "renderer.h"
 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 namespace Msp {
 namespace GL {
 

diff --git a/source/render/instancescene.h b/source/render/instancescene.h
index 85ec3794493e1d27fedb1094a917d7f33dd66eb3..ae9b637b8560543cda0b83e625507e4d9dd5e0be 100644 (file)
--- a/source/render/instancescene.h
+++ b/source/render/instancescene.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <set>
+#include <msp/core/attributes.h>
 #include <msp/core/inttypes.h>
 #include "scene.h"
 
@@ -14,7 +15,7 @@ A Scene optimized for rendering instanced Renderables, such as ObjectInstances.
 All Renderables with the same instance key are rendered consecutively; within
 the same key rendering order is unspecified.
 */
-class InstanceScene: public Scene
+class DEPRECATED InstanceScene: public Scene
 {
 private:
        typedef std::set<Renderable *> RenderableSet;

diff --git a/source/render/objectinstance.h b/source/render/objectinstance.h
index c3128877728eb1b7623c41b7f1212527de8f94ae..c5358b06c63927bfd210092a171850bc52b6a9ce 100644 (file)
--- a/source/render/objectinstance.h
+++ b/source/render/objectinstance.h
@@ -32,7 +32,7 @@ public:
        ObjectInstance(const Object &);
 
        const Object &get_object() const { return object; }
-       virtual IntPtr get_instance_key() const { return reinterpret_cast<IntPtr>(&object); }
+       DEPRECATED virtual IntPtr get_instance_key() const { return reinterpret_cast<IntPtr>(&object); }
 
        virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return object.get_bounding_sphere(); }
 

diff --git a/source/render/renderable.h b/source/render/renderable.h
index 8af524fd64de0d73613001c7ad7ac877acb23612..30386392586066ffedcf847bd4d9b533e96d4004 100644 (file)
--- a/source/render/renderable.h
+++ b/source/render/renderable.h
@@ -2,6 +2,7 @@
 #define MSP_GL_RENDERABLE_H_
 
 #include <string>
+#include <msp/core/attributes.h>
 #include <msp/core/inttypes.h>
 #include <msp/geometry/boundingsphere.h>
 #include "tag.h"
@@ -35,7 +36,7 @@ public:
 
        /** 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; }
+       DEPRECATED 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