Use DevIL for loading images

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

diff --git a/source/object.h b/source/object.h
index 7a40a40ba24bc71ff40af47c46af642a229e0249..e38afb5c4c1b16fb92946785143bed0fb4824a6d 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -10,6 +10,7 @@ Distributed under the LGPL
 
 #include <vector>
 #include <msp/datafile/collection.h>
+#include "objectpass.h"
 
 namespace Msp {
 namespace GL {
@@ -31,11 +32,11 @@ See also class ObjectInstance.
 class Object
 {
 private:
-       Mesh *mesh;
+       std::vector<Mesh *> meshes;
        std::vector<Texture *> textures;
-       Program *shprog;
-       ProgramData *shdata;
+       std::map<std::string, ObjectPass> passes;
        Material *material;
+       ObjectPass *normal_pass;
 
 public:
        class Loader: public DataFile::Loader
@@ -56,6 +57,10 @@ public:
                Object &get_object() const { return obj; }
                Collection &get_collection() const { return coll; }
        private:
+               void lod_mesh(unsigned, const std::string &);
+               void material_inline();
+               void mesh(const std::string &);
+               void pass(const std::string &);
                void shader(const std::string &);
                void texture(const std::string &);
        };
@@ -63,13 +68,15 @@ public:
        Object();
        ~Object();
 
-       Program *get_shader() const { return shprog; }
+       bool has_pass(const std::string &) const;
+       const ObjectPass &get_pass(const std::string &) const;
 
        /**
        Renders the object.  If an ObjectInstance is provided, its hook functions
        are called.
        */
        void render(const ObjectInstance * =0) const;
+       void render(const std::string &, const ObjectInstance *) const;
 
        /**
        Renders multiple instances of the object in one go.  This may be a
@@ -77,9 +84,12 @@ public:
        done once.
        */
        void render(const std::list<const ObjectInstance *> &) const;
+       void render(const std::string &, const std::list<const ObjectInstance *> &) const;
 private:
-       void setup_render() const;
-       void finish_render() const;
+       void setup_render(const ObjectPass &) const;
+       void finish_render(const ObjectPass &) const;
+       void render(const ObjectPass &, const ObjectInstance *) const;
+       void render(const ObjectPass &, const std::list<const ObjectInstance *> &) const;
 };
 
 } // namespace GL