Support for loading materials from datafiles

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

diff --git a/source/object.cpp b/source/object.cpp
index 7250caf8f9bc22272c4e859882ee17229298f97a..19abe36b766c9f650644824c967060847f6a7b38 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -26,46 +26,41 @@ Object::Object():
        meshes(1, static_cast<Mesh *>(0)),
        material(0)
 {
-       normal_pass=&passes[""];
+       normal_pass=&passes[0];
 }
 
 Object::~Object()
 {
-       for(map<string, ObjectPass>::iterator i=passes.begin(); i!=passes.end(); ++i)
+       for(map<unsigned, ObjectPass>::iterator i=passes.begin(); i!=passes.end(); ++i)
                delete i->second.shdata;
 }
 
-bool Object::has_pass(const string &pn) const
+bool Object::has_pass(const Tag &tag) const
 {
-       return passes.count(pn);
+       return passes.count(tag.id);
 }
 
-const ObjectPass &Object::get_pass(const string &pn) const
+const ObjectPass &Object::get_pass(const Tag &tag) const
 {
-       map<string, ObjectPass>::const_iterator i=passes.find(pn);
+       map<unsigned, ObjectPass>::const_iterator i=passes.find(tag.id);
        if(i==passes.end())
                throw KeyError("Unknown pass");
        return i->second;
 }
 
-void Object::render(const ObjectInstance *inst) const
+void Object::render(const Tag &tag) const
 {
-       render(*normal_pass, inst);
+       render(get_pass(tag), 0);
 }
 
-void Object::render(const string &pn, const ObjectInstance *inst) const
+void Object::render(const ObjectInstance &inst, const Tag &tag) const
 {
-       render(get_pass(pn), inst);
+       render(get_pass(tag), &inst);
 }
 
-void Object::render(const list<const ObjectInstance *> &insts) const
+void Object::render(const list<const ObjectInstance *> &insts, const Tag &tag) const
 {
-       render(*normal_pass, insts);
-}
-
-void Object::render(const string &pn, const list<const ObjectInstance *> &insts) const
-{
-       render(get_pass(pn), insts);
+       render(get_pass(tag), insts);
 }
 
 void Object::setup_render(const ObjectPass &pass) const
@@ -153,7 +148,7 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 Object::Loader::~Loader()
 {
-       for(map<string, ObjectPass>::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
+       for(map<unsigned, ObjectPass>::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
                if(i->second.shdata)
                {
                        for(unsigned j=0; j<textures.size(); ++j)
@@ -164,35 +159,35 @@ Object::Loader::~Loader()
 void Object::Loader::lod_mesh(unsigned l, const string &n)
 {
        obj.meshes.resize(l+1, 0);
-       obj.meshes[l]=&coll.get<Mesh>(n);
+       obj.meshes[l]=coll.get<Mesh>(n);
 }
 
 void Object::Loader::material_inline()
 {
-       throw Exception("material_inline not supported yet");
-       /*RefPtr<Material> mat=new Material;
+       RefPtr<Material> mat=new Material;
        load_sub(*mat);
        coll.add(format("%p%p", &obj, mat.get()), mat.get());
-       obj.material=mat.release();*/
+       obj.material=mat.release();
 }
 
 void Object::Loader::mesh(const string &n)
 {
-       obj.meshes[0]=&coll.get<Mesh>(n);
+       obj.meshes[0]=coll.get<Mesh>(n);
 }
 
 void Object::Loader::pass(const string &n)
 {
-       if(obj.passes.count(n))
+       unsigned id=Tag(n).id;
+       if(obj.passes.count(id))
                throw KeyError("Duplicate pass name");
        ObjectPass p;
        load_sub(p, coll);
-       obj.passes[n]=p;
+       obj.passes[id]=p;
 }
 
 void Object::Loader::shader(const string &n)
 {
-       Program *shprog=&coll.get<Program>(n);
+       Program *shprog=coll.get<Program>(n);
        if(shprog)  // Allow for unsupported shaders
        {
                RefPtr<ProgramData> shdata=new ProgramData;
@@ -210,12 +205,12 @@ void Object::Loader::texture(const string &n)
        unsigned eqsign=n.find('=');
        if(eqsign!=string::npos)
        {
-               obj.textures.push_back(&coll.get<Texture>(n.substr(eqsign+1)));
+               obj.textures.push_back(coll.get<Texture>(n.substr(eqsign+1)));
                textures.push_back(n.substr(0, eqsign));
        }
        else
        {
-               obj.textures.push_back(&coll.get<Texture>(n));
+               obj.textures.push_back(coll.get<Texture>(n));
                textures.push_back(n);
        }
 }