Drop Renderable::has_pass; renderables are now expected to ignore unknown passes

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

diff --git a/source/object.cpp b/source/object.cpp
index b53a3f0802767e9e6e80b7a6e1d0434aa4d0c474..d5d5231bab47dbdd9358a489ea975841298c4a87 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -34,16 +34,11 @@ Object::~Object()
 {
 }
 
-bool Object::has_pass(const Tag &tag) const
-{
-       if(technique)
-               return technique->has_pass(tag);
-       else
-               return tag.id==0;
-}
-
 void Object::render(const Tag &tag) const
 {
+       if(!can_render(tag))
+               return;
+
        const ObjectPass *pass=get_pass(tag);
        setup_render(pass);
        meshes[0]->draw();
@@ -52,6 +47,9 @@ void Object::render(const Tag &tag) const
 
 void Object::render(const ObjectInstance &inst, const Tag &tag) const
 {
+       if(!can_render(tag))
+               return;
+
        const ObjectPass *pass=get_pass(tag);
        setup_render(pass);
        render_instance(inst, tag);
@@ -59,6 +57,14 @@ void Object::render(const ObjectInstance &inst, const Tag &tag) const
        finish_render(pass);
 }
 
+bool Object::can_render(const Tag &tag) const
+{
+       if(technique)
+               return technique->has_pass(tag);
+       else
+               return tag.id==0;
+}
+
 const ObjectPass *Object::get_pass(const Tag &tag) const
 {
        if(technique)
@@ -111,7 +117,7 @@ void Object::finish_render(const ObjectPass *pass) const
 void Object::render_instance(const ObjectInstance &inst, const Tag &tag) const
 {
        inst.setup_render(tag);
-       unsigned lod=min(inst.get_level_of_detail(), meshes.size()-1);
+       unsigned lod=min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
        meshes[lod]->draw();
        inst.finish_render(tag);
 }
@@ -132,6 +138,8 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 void Object::Loader::finish()
 {
+       if(obj.technique && !obj.main_texture)
+               obj.main_texture=obj.technique->get_main_texture();
        for(unsigned i=0; i<obj.textures.size(); ++i)
        {
                if(!obj.textures[i])
@@ -167,7 +175,7 @@ void Object::Loader::shader_texture(const string &n)
        if(!obj.technique)
                throw InvalidState("Can't specify shader textures without a Technique");
 
-       unsigned eqsign=n.find('=');
+       string::size_type eqsign=n.find('=');
        if(eqsign==string::npos)
                throw InvalidParameterValue("Must specify texture slot name");