Separate main and shader textures in Object

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

diff --git a/source/object.h b/source/object.h
index 0b808983099e08ffba4caf01da9ad943b3966f0f..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::vector<const Mesh *> meshes;
+       std::vector<const Texture *> textures;
+       const Texture *main_texture;
        std::map<unsigned, ObjectPass> passes;
-       Material *material;
+       const Material *material;
        ObjectPass *normal_pass;
 
 public:
@@ -53,16 +54,17 @@ 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 &);
        };