]> git.tdb.fi Git - libs/gl.git/blobdiff - source/object.cpp
Style update: add spaces around assignment operators
[libs/gl.git] / source / object.cpp
index f2d1f8bf74a9781c64d829e2f7950513296dbae1..938e83f911211cd75b2e50302b6ad00d67345005 100644 (file)
@@ -12,7 +12,6 @@ Distributed under the LGPL
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
-#include "objectpass.h"
 #include "program.h"
 #include "programdata.h"
 #include "technique.h"
@@ -25,179 +24,114 @@ namespace Msp {
 namespace GL {
 
 Object::Object():
-       meshes(1, static_cast<Mesh *>(0)),
+       meshes(1),
        technique(0),
-       main_texture(0),
-       material(0)
+       own_mesh(false),
+       own_technique(false)
 { }
 
 Object::~Object()
 {
+       if(own_technique)
+               delete technique;
+       if(own_mesh)
+               delete meshes[0];
 }
 
 void Object::render(const Tag &tag) const
 {
-       if(!can_render(tag))
+       const RenderPass *pass = get_pass(tag);
+       if(!pass)
                return;
 
-       const ObjectPass *pass=get_pass(tag);
-       setup_render(pass);
+       Bind bind(*pass);
        meshes[0]->draw();
-       finish_render(pass);
 }
 
 void Object::render(const ObjectInstance &inst, const Tag &tag) const
 {
-       if(!can_render(tag))
+       const RenderPass *pass = get_pass(tag);
+       if(!pass)
                return;
 
-       const ObjectPass *pass=get_pass(tag);
-       setup_render(pass);
+       Bind bind(*pass);
        render_instance(inst, tag);
        meshes[0]->draw();
-       finish_render(pass);
 }
 
-bool Object::can_render(const Tag &tag) const
+const RenderPass *Object::get_pass(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)
-               return &technique->get_pass(tag);
-       else if(tag.id==0)
+       if(!technique->has_pass(tag))
                return 0;
-       throw KeyError("Unknown pass");
-}
-
-void Object::setup_render(const ObjectPass *pass) const
-{
-       if(!meshes[0])
-               throw InvalidState("Trying to render Object without mesh");
-
-       if(pass && pass->shprog)
-       {
-               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 || pass->use_textures))
-               main_texture->bind();
-
-       if(material)
-               material->bind();
-}
-
-void Object::finish_render(const ObjectPass *pass) const
-{
-       if(pass && pass->shprog)
-       {
-               Program::unbind();
-               for(unsigned i=textures.size(); i--;)
-               {
-                       TexUnit::activate(i);
-                       Texture::unbind();
-               }
-       }
-       else if(main_texture)
-               Texture::unbind();
-
-       if(material)
-               Material::unbind();
+       return &technique->get_pass(tag);
 }
 
 void Object::render_instance(const ObjectInstance &inst, const Tag &tag) const
 {
        inst.setup_render(tag);
-       unsigned lod=min<unsigned>(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);
 }
 
 
+Object::Loader::Loader(Object &o):
+       DataFile::CollectionObjectLoader<Object>(o, 0)
+{
+       init();
+}
+
 Object::Loader::Loader(Object &o, Collection &c):
        DataFile::CollectionObjectLoader<Object>(o, &c)
 {
-       add("lod_mesh", &Loader::lod_mesh);
-       add("material", &Object::material);
-       add("material_inline", &Loader::material_inline);
-       add("mesh",     &Loader::mesh);
-       add("shader_texture", &Loader::shader_texture);
-       add("technique", &Loader::technique);
-       add("texture",  &Loader::texture);
+       init();
 }
 
-void Object::Loader::finish()
+void Object::Loader::init()
 {
-       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])
-               {
-                       obj.textures[i]=obj.technique->get_texture(i);
-                       if(!obj.textures[i])
-                               throw Exception("Object does not specify all textures required by Technique");
-               }
-       }
+       allow_pointer_reload = false;
+
+       add("lod_mesh", &Loader::lod_mesh);
+       add("mesh",     static_cast<void (Loader::*)()>(&Loader::mesh));
+       add("mesh",     static_cast<void (Loader::*)(const std::string &)>(&Loader::mesh));
+       add("technique", &Loader::technique);
+       add("technique", &Object::technique);
 }
 
 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] = get_collection().get<Mesh>(n);
 }
 
-void Object::Loader::material_inline()
+void Object::Loader::mesh()
 {
-       RefPtr<Material> mat=new Material;
-       load_sub(*mat);
-       coll->add(format("_%p", mat.get()), mat.get());
-       obj.material=mat.release();
-}
+       if(obj.meshes[0])
+               throw InvalidState("A mesh is already loaded");
 
-void Object::Loader::mesh(const string &n)
-{
-       obj.meshes[0]=coll->get<Mesh>(n);
+       RefPtr<Mesh> msh = new Mesh;
+       load_sub(*msh);
+       obj.meshes[0] = msh.release();
+       obj.own_mesh = true;
 }
 
-void Object::Loader::shader_texture(const string &n)
+void Object::Loader::mesh(const std::string &n)
 {
-       if(!obj.technique)
-               throw InvalidState("Can't specify shader textures without a Technique");
+       if(obj.meshes[0])
+               throw InvalidState("A mesh is already loaded");
 
-       string::size_type eqsign=n.find('=');
-       if(eqsign==string::npos)
-               throw InvalidParameterValue("Must specify texture slot name");
-
-       obj.textures[obj.technique->get_texture_index(n.substr(0, eqsign))]=coll->get<Texture>(n.substr(eqsign+1));
-}
-
-void Object::Loader::technique(const string &n)
-{
-       obj.technique=coll->get<Technique>(n);
-       obj.textures.resize(obj.technique->get_n_textures());
-       obj.material=obj.technique->get_material();
+       obj.meshes[0] = get_collection().get<Mesh>(n);
 }
 
-void Object::Loader::texture(const string &n)
+void Object::Loader::technique()
 {
-       if(obj.main_texture)
-               throw Exception("Only one main texture may be specified");
-
-       Texture *tex=coll->get<Texture>(n);
-       if(obj.technique)
-               obj.textures[obj.technique->get_texture_index("texture")]=tex;
-       obj.main_texture=tex;
+       RefPtr<Technique> tech = new Technique;
+       if(coll)
+               load_sub(*tech, get_collection());
+       else
+               load_sub(*tech);
+       obj.technique = tech.release();
+       obj.own_technique = true;
 }
 
 } // namespace GL