Add a Tag class to identify passes

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

diff --git a/source/object.cpp b/source/object.cpp
index dba9774e7531fa0f7549f56341ed08d19646a6be..3ba2d64c378862ea435f6d371cc4e5ec122a5579 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -26,56 +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
+void Object::render(const Tag &tag) const
 {
-       render(*normal_pass, 0);
+       render(get_pass(tag), 0);
 }
 
-void Object::render(const ObjectInstance &inst) const
+void Object::render(const ObjectInstance &inst, const Tag &tag) const
 {
-       render(*normal_pass, &inst);
+       render(get_pass(tag), &inst);
 }
 
-void Object::render(const string &pn) const
+void Object::render(const list<const ObjectInstance *> &insts, const Tag &tag) const
 {
-       render(get_pass(pn), 0);
-}
-
-void Object::render(const string &pn, const ObjectInstance &inst) const
-{
-       render(get_pass(pn), &inst);
-}
-
-void Object::render(const list<const ObjectInstance *> &insts) 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
@@ -163,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)
@@ -193,11 +178,12 @@ void Object::Loader::mesh(const string &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)