Separate main and shader textures in Object

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

diff --git a/source/object.h b/source/object.h
index f0940652992692bfce462258cf0d4a72e58b48ec..0039dffd42500f8daadaaff85c1071df279d9564 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -33,10 +33,11 @@ See also class ObjectInstance.
 class Object: public Renderable
 {
 private:
-       std::vector<Mesh *> meshes;
-       std::vector<Texture *> textures;
-       std::map<std::string, ObjectPass> passes;
-       Material *material;
+       std::vector<const Mesh *> meshes;
+       std::vector<const Texture *> textures;
+       const Texture *main_texture;
+       std::map<unsigned, ObjectPass> passes;
+       const Material *material;
        ObjectPass *normal_pass;
 
 public:
@@ -53,41 +54,45 @@ public:
        
        public:
                Loader(Object &, Collection &);
-               ~Loader();
 
                Object &get_object() const { return obj; }
                Collection &get_collection() const { return coll; }
        private:
+               virtual void finish();
                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 shader_texture(const std::string &);
                void texture(const std::string &);
        };
 
        Object();
        ~Object();
 
-       virtual bool has_pass(const std::string &) const;
-       const ObjectPass &get_pass(const std::string &) const;
+       virtual bool has_pass(const Tag &) const;
+       const ObjectPass &get_pass(const Tag &) const;
 
        /**
-       Renders the object.  If an ObjectInstance is provided, its hook functions
-       are called.
+       Renders the object.  A tag can be provided to render a non-default pass.
        */
-       virtual void render() const;
-       virtual void render(const ObjectInstance &) const;
-       virtual void render(const std::string &) const;
-       virtual void render(const std::string &, const ObjectInstance &) const;
+       virtual void render(const Tag &tag=Tag()) const;
 
        /**
-       Renders multiple instances of the object in one go.  This may be a
-       performance improvement, as the object-specific render setup only has to be
-       done once.
+       Renders the object with an instance.  The instance's hook functions are
+       called before and after drawing the mesh.  A tag may also be given to render
+       a non-default pass.
        */
-       void render(const std::list<const ObjectInstance *> &) const;
-       void render(const std::string &, const std::list<const ObjectInstance *> &) const;
+       virtual void render(const ObjectInstance &, const Tag &tag=Tag()) const;
+
+       /**
+       Renders multiple instances of the object in one go.  This may improve
+       performance, as the object-specific render setup only has to be done once.
+       Each instance's hook functions will be called before and after drawing the
+       mesh.
+       */
+       void render(const std::list<const ObjectInstance *> &, const Tag &tag=Tag()) const;
 private:
        void setup_render(const ObjectPass &) const;
        void finish_render(const ObjectPass &) const;