Reimplement Animation using splines

[libs/gl.git] / source / objectinstance.h

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 273d348579b4b8a34e71d2ebcb33a73f9394c60b..7c2cc9a755afca9fe8e8a17981c80ecaf9920c44 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -8,8 +8,6 @@
 namespace Msp {
 namespace GL {
 
-class ProgramData;
-
 /**
 Represents a single instance of an Object.  Thanks to being derived from
 Placeable in can be positioned without additional effort.  Other instance
@@ -20,6 +18,16 @@ render all instances of the same object consecutively.
 */
 class ObjectInstance: public PlacedRenderable
 {
+public:
+       class Loader: public DataFile::ObjectLoader<ObjectInstance>
+       {
+       public:
+               Loader(ObjectInstance &);
+
+       private:
+               void transform();
+       };
+
 protected:
        const Object &object;
 
@@ -36,7 +44,7 @@ public:
 
        /** Hook function, called from Object just before rendering the mesh.
        Renderer state will have been pushed before this is called. */
-       virtual void setup_render(Renderer &, const Tag &) const { }
+       virtual void setup_render(Renderer &, const Tag &) const;
 
        /** Hook function, called from Object right after rendering the mesh.  Since
        Object takes care of pushing Renderer state, this rarely needs to do