Use DevIL for loading images

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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 955ad1ddd7f0d9ac2f9ee2508c8bad3bdd49d88b..151e316c9e2e91faaff22fa31337f9bc9fa3d1ea 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -8,12 +8,16 @@ Distributed under the LGPL
 #ifndef MSP_GL_OBJETCINSTANCE_H_
 #define MSP_GL_OBJETCINSTANCE_H_
 
+#include <string>
+
 namespace Msp {
 namespace GL {
 
 class Object;
 class ProgramData;
 
+class ObjectPass;
+
 /**
 Represents a single instance of an Object.  An application can derive another
 class from this and overload the hook functions to specify location and other
@@ -26,19 +30,23 @@ protected:
 
 public:
        ObjectInstance(const Object &);
+
+       const Object &get_object() const { return object; }
+
        void render() const;
+       void render(const std::string &) const;
 
        /**
        Hook function, called from Object just before rendering the mesh.
        */
-       virtual void setup_render() const { }
+       virtual void setup_render(const ObjectPass &) const { }
 
        /**
        Hook function, called from Object right after rendering the mesh.
        */
-       virtual void finish_render() const { }
+       virtual void finish_render(const ObjectPass &) const { }
 
-       virtual unsigned get_detail_level() const { return 0; }
+       virtual unsigned get_level_of_detail() const { return 0; }
 };
 
 } // namespace GL