Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/object.h b/source/object.h
index 42541eaf28004807d1e088f32f1281c1788b7800..bf4a05249436f5453ec678a274431958597a61fb 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -9,7 +9,6 @@ Distributed under the LGPL
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include <msp/datafile/collection.h>
 #include "objectpass.h"
 #include "renderable.h"
 
@@ -19,60 +18,47 @@ namespace GL {
 class Material;
 class Mesh;
 class ObjectInstance;
-class Program;
-class ProgramData;
+class Technique;
 class Texture;
 
 /**
-Stores data for a complete 3D object.  This includes a mesh, a shader and data
-for it and a number of textures.  Only the mesh is mandatory, other components
-are optional.
+Stores data for a complete 3D object.  An Object must always have a Mesh, and
+may also have a Technique to determine its appearance.  Textures and material
+specified by the Technique may be overridden.  Simple textured objects are also
+possible without a Technique.
 
-See also class ObjectInstance.
+It is possible to use a single Object for rendering multiple identical or
+similar objects.  See class ObjectInstance.
 */
 class Object: public Renderable
 {
 private:
        std::vector<const Mesh *> meshes;
+       const Technique *technique;
        std::vector<const Texture *> textures;
        const Texture *main_texture;
-       std::map<unsigned, ObjectPass> passes;
        const Material *material;
-       ObjectPass *normal_pass;
 
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::CollectionObjectLoader<Object>
        {
-       public:
-               typedef DataFile::Collection Collection;
-
-       protected:
-               Object &obj;
-               Collection &coll;
-       private:
-               std::vector<std::string> textures;
-       
        public:
                Loader(Object &, Collection &);
 
-               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 technique(const std::string &);
                void texture(const std::string &);
        };
 
        Object();
        ~Object();
 
-       virtual bool has_pass(const Tag &) const;
-       const ObjectPass &get_pass(const Tag &) const;
+       const Technique *get_technique() const { return technique; }
 
        /**
        Renders the object.  A tag can be provided to render a non-default pass.
@@ -94,22 +80,22 @@ public:
        */
        template<typename Iter>
        void render(Iter begin, Iter end, const Tag &tag=Tag()) const
-       { render(get_pass(tag), begin, end); }
-private:
-       void setup_render(const ObjectPass &) const;
-       void finish_render(const ObjectPass &) const;
-       void render(const ObjectPass &, const ObjectInstance *) const;
-
-       template<typename Iter>
-       void render(const ObjectPass &pass, Iter begin, Iter end) const
        {
+               if(!can_render(tag))
+                       return;
+
+               const ObjectPass *pass=get_pass(tag);
                setup_render(pass);
                for(Iter i=begin; i!=end; ++i)
-                       render_instance(pass, **i);
+                       render_instance(**i, tag);
                finish_render(pass);
        }
-
-       void render_instance(const ObjectPass &, const ObjectInstance &) const;
+private:
+       bool can_render(const Tag &) const;
+       const ObjectPass *get_pass(const Tag &) const;
+       void setup_render(const ObjectPass *) const;
+       void finish_render(const ObjectPass *) const;
+       void render_instance(const ObjectInstance &, const Tag &) const;
 };
 
 } // namespace GL