]> git.tdb.fi Git - libs/gl.git/blobdiff - source/object.cpp
Add class Technique to share passes between Objects
[libs/gl.git] / source / object.cpp
index db2866115a05561500843a7c7b0c7540b3be328c..b53a3f0802767e9e6e80b7a6e1d0434aa4d0c474 100644 (file)
@@ -14,6 +14,7 @@ Distributed under the LGPL
 #include "objectpass.h"
 #include "program.h"
 #include "programdata.h"
+#include "technique.h"
 #include "texture.h"
 #include "texunit.h"
 
@@ -24,66 +25,74 @@ namespace GL {
 
 Object::Object():
        meshes(1, static_cast<Mesh *>(0)),
+       technique(0),
        main_texture(0),
        material(0)
-{
-       normal_pass=&passes[0];
-}
+{ }
 
 Object::~Object()
 {
-       for(map<unsigned, ObjectPass>::iterator i=passes.begin(); i!=passes.end(); ++i)
-               delete i->second.shdata;
 }
 
 bool Object::has_pass(const Tag &tag) const
 {
-       return passes.count(tag.id);
+       if(technique)
+               return technique->has_pass(tag);
+       else
+               return tag.id==0;
 }
 
-const ObjectPass &Object::get_pass(const Tag &tag) const
+void Object::render(const Tag &tag) const
 {
-       map<unsigned, ObjectPass>::const_iterator i=passes.find(tag.id);
-       if(i==passes.end())
-               throw KeyError("Unknown pass");
-       return i->second;
+       const ObjectPass *pass=get_pass(tag);
+       setup_render(pass);
+       meshes[0]->draw();
+       finish_render(pass);
 }
 
-void Object::render(const Tag &tag) const
+void Object::render(const ObjectInstance &inst, const Tag &tag) const
 {
-       render(get_pass(tag), 0);
+       const ObjectPass *pass=get_pass(tag);
+       setup_render(pass);
+       render_instance(inst, tag);
+       meshes[0]->draw();
+       finish_render(pass);
 }
 
-void Object::render(const ObjectInstance &inst, const Tag &tag) const
+const ObjectPass *Object::get_pass(const Tag &tag) const
 {
-       render(get_pass(tag), &inst);
+       if(technique)
+               return &technique->get_pass(tag);
+       else if(tag.id==0)
+               return 0;
+       throw KeyError("Unknown pass");
 }
 
-void Object::setup_render(const ObjectPass &pass) const
+void Object::setup_render(const ObjectPass *pass) const
 {
        if(!meshes[0])
                throw InvalidState("Trying to render Object without mesh");
 
-       if(pass.shprog)
+       if(pass && pass->shprog)
        {
-               pass.shprog->bind();
-               pass.shdata->apply();
+               pass->shprog->bind();
+               pass->shdata->apply();
                for(unsigned i=0; i<textures.size(); ++i)
                {
                        TexUnit::activate(i);
                        textures[i]->bind();
                }
        }
-       else if(main_texture && pass.use_textures)
+       else if(main_texture && (!pass || pass->use_textures))
                main_texture->bind();
 
        if(material)
                material->bind();
 }
 
-void Object::finish_render(const ObjectPass &pass) const
+void Object::finish_render(const ObjectPass *pass) const
 {
-       if(pass.shprog)
+       if(pass && pass->shprog)
        {
                Program::unbind();
                for(unsigned i=textures.size(); i--;)
@@ -99,24 +108,12 @@ void Object::finish_render(const ObjectPass &pass) const
                Material::unbind();
 }
 
-void Object::render(const ObjectPass &pass, const ObjectInstance *inst) const
-{
-       setup_render(pass);
-
-       if(inst)
-               render_instance(pass, *inst);
-       else
-               meshes[0]->draw();
-
-       finish_render(pass);
-}
-
-void Object::render_instance(const ObjectPass &pass, const ObjectInstance &inst) const
+void Object::render_instance(const ObjectInstance &inst, const Tag &tag) const
 {
-       inst.setup_render(pass);
+       inst.setup_render(tag);
        unsigned lod=min(inst.get_level_of_detail(), meshes.size()-1);
        meshes[lod]->draw();
-       inst.finish_render(pass);
+       inst.finish_render(tag);
 }
 
 
@@ -128,20 +125,22 @@ Object::Loader::Loader(Object &o, Collection &c):
        add("material", &Object::material);
        add("material_inline", &Loader::material_inline);
        add("mesh",     &Loader::mesh);
-       add("pass",     &Loader::pass);
-       add("shader",   &Loader::shader);
        add("shader_texture", &Loader::shader_texture);
+       add("technique", &Loader::technique);
        add("texture",  &Loader::texture);
 }
 
 void Object::Loader::finish()
 {
-       for(map<unsigned, ObjectPass>::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
-               if(i->second.shdata)
+       for(unsigned i=0; i<obj.textures.size(); ++i)
+       {
+               if(!obj.textures[i])
                {
-                       for(unsigned j=0; j<textures.size(); ++j)
-                               i->second.shdata->uniform(i->second.shprog->get_uniform_location(textures[j]), static_cast<int>(j));
+                       obj.textures[i]=obj.technique->get_texture(i);
+                       if(!obj.textures[i])
+                               throw Exception("Object does not specify all textures required by Technique");
                }
+       }
 }
 
 void Object::Loader::lod_mesh(unsigned l, const string &n)
@@ -154,7 +153,7 @@ void Object::Loader::material_inline()
 {
        RefPtr<Material> mat=new Material;
        load_sub(*mat);
-       coll.add(format("%p%p", &obj, mat.get()), mat.get());
+       coll.add(format("_%p", mat.get()), mat.get());
        obj.material=mat.release();
 }
 
@@ -163,44 +162,23 @@ void Object::Loader::mesh(const string &n)
        obj.meshes[0]=coll.get<Mesh>(n);
 }
 
-void Object::Loader::pass(const string &n)
+void Object::Loader::shader_texture(const string &n)
 {
-       unsigned id=Tag(n).id;
-       if(obj.passes.count(id))
-               throw KeyError("Duplicate pass name");
-       ObjectPass p;
-       load_sub(p, coll);
-       obj.passes[id]=p;
-}
+       if(!obj.technique)
+               throw InvalidState("Can't specify shader textures without a Technique");
 
-void Object::Loader::shader(const string &n)
-{
-       Program *shprog=coll.get<Program>(n);
-       if(shprog)  // Allow for unsupported shaders
-       {
-               RefPtr<ProgramData> shdata=new ProgramData;
-               load_sub(*shdata, *shprog);
+       unsigned eqsign=n.find('=');
+       if(eqsign==string::npos)
+               throw InvalidParameterValue("Must specify texture slot name");
 
-               obj.normal_pass->shprog=shprog;
-               if(obj.normal_pass->shdata)
-                       delete obj.normal_pass->shdata;
-               obj.normal_pass->shdata=shdata.release();
-       }
+       obj.textures[obj.technique->get_texture_index(n.substr(0, eqsign))]=coll.get<Texture>(n.substr(eqsign+1));
 }
 
-void Object::Loader::shader_texture(const string &n)
+void Object::Loader::technique(const string &n)
 {
-       unsigned eqsign=n.find('=');
-       if(eqsign!=string::npos)
-       {
-               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));
-               textures.push_back(n);
-       }
+       obj.technique=coll.get<Technique>(n);
+       obj.textures.resize(obj.technique->get_n_textures());
+       obj.material=obj.technique->get_material();
 }
 
 void Object::Loader::texture(const string &n)
@@ -208,9 +186,10 @@ void Object::Loader::texture(const string &n)
        if(obj.main_texture)
                throw Exception("Only one main texture may be specified");
 
-       obj.main_texture=coll.get<Texture>(n);
-       obj.textures.push_back(obj.main_texture);
-       textures.push_back("texture");
+       Texture *tex=coll.get<Texture>(n);
+       if(obj.technique)
+               obj.textures[obj.technique->get_texture_index("texture")]=tex;
+       obj.main_texture=tex;
 }
 
 } // namespace GL