Drop Id tags and copyright notices from files

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

diff --git a/source/object.cpp b/source/object.cpp
index c4787d9fda34d68b4a3cee61b40a6fabf5f79052..d573fdd4975695eddfd3d164eca0128d97936937 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/datafile/collection.h>
 #include <msp/strings/formatter.h>
 #include "except.h"
@@ -14,9 +7,9 @@ Distributed under the LGPL
 #include "objectinstance.h"
 #include "program.h"
 #include "programdata.h"
+#include "renderer.h"
 #include "technique.h"
-#include "texture.h"
-#include "texunit.h"
+#include "texturing.h"
 
 using namespace std;
 
@@ -43,6 +36,14 @@ void Object::set_mesh(unsigned i, const Mesh *m)
        meshes[i].keep();
 }
 
+const Mesh *Object::get_mesh(unsigned i) const
+{
+       if(i>=meshes.size())
+               return 0;
+
+       return meshes[i].get();
+}
+
 void Object::set_technique(const Technique *t)
 {
        technique = t;
@@ -55,18 +56,44 @@ void Object::render(const Tag &tag) const
        if(!pass)
                return;
 
-       Bind bind(pass);
+       Bind bind_shader(pass->get_shader_program());
+       if(pass->get_shader_data())
+               pass->get_shader_data()->apply();
+       Bind bind_material(pass->get_material());
+       Bind bind_texturing(pass->get_texturing());
+
        meshes.front()->draw();
 }
 
-void Object::render(const ObjectInstance &inst, const Tag &tag) const
+void Object::render(Renderer &renderer, const Tag &tag) const
 {
        const RenderPass *pass = get_pass(tag);
        if(!pass)
                return;
 
-       Bind bind(pass);
-       render_instance(inst, tag);
+       Renderer::Push push(renderer);
+       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+       renderer.set_material(pass->get_material());
+       renderer.set_texturing(pass->get_texturing());
+
+       meshes.front()->draw(renderer);
+}
+
+void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
+{
+       const RenderPass *pass = get_pass(tag);
+       if(!pass)
+               return;
+
+       Renderer::Push push(renderer);
+       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+       renderer.set_material(pass->get_material());
+       renderer.set_texturing(pass->get_texturing());
+
+       inst.setup_render(renderer, tag);
+       unsigned lod = min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
+       meshes[lod]->draw(renderer);
+       inst.finish_render(renderer, tag);
 }
 
 const RenderPass *Object::get_pass(const Tag &tag) const
@@ -76,14 +103,6 @@ const RenderPass *Object::get_pass(const Tag &tag) const
        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);
-       meshes[lod]->draw();
-       inst.finish_render(tag);
-}
-
 
 Object::Loader::Loader(Object &o):
        DataFile::CollectionObjectLoader<Object>(o, 0)
@@ -101,24 +120,25 @@ void Object::Loader::init()
 {
        allow_pointer_reload = false;
 
-       add("mesh",     static_cast<void (Loader::*)()>(&Loader::mesh));
-       add("mesh",     static_cast<void (Loader::*)(unsigned)>(&Loader::mesh));
-       add("mesh",     static_cast<void (Loader::*)(const std::string &)>(&Loader::mesh));
-       add("mesh",     static_cast<void (Loader::*)(unsigned, const std::string &)>(&Loader::mesh));
+       add("mesh",     &Loader::mesh_inline);
+       add("mesh",     &Loader::mesh_inline_lod);
+       add("mesh",     &Loader::mesh);
+       add("mesh",     &Loader::mesh_lod);
+       add("technique", &Loader::technique_inline);
+       add("technique", &Loader::technique);
+
        // Deprecated alias, will be removed
-       add("lod_mesh", static_cast<void (Loader::*)(unsigned, const std::string &)>(&Loader::mesh));
-       add("technique", static_cast<void (Loader::*)()>(&Loader::technique));
-       add("technique", static_cast<void (Loader::*)(const std::string &)>(&Loader::technique));
+       add("lod_mesh", &Loader::mesh_lod);
 }
 
-void Object::Loader::mesh()
+void Object::Loader::mesh_inline()
 {
        RefPtr<Mesh> msh = new Mesh;
        load_sub(*msh);
        obj.meshes.front() = msh;
 }
 
-void Object::Loader::mesh(unsigned l)
+void Object::Loader::mesh_inline_lod(unsigned l)
 {
        if(l>obj.meshes.size())
                throw InvalidParameterValue("LODs must be continuous");
@@ -136,12 +156,12 @@ void Object::Loader::mesh(const std::string &n)
        obj.set_mesh(get_collection().get<Mesh>(n));
 }
 
-void Object::Loader::mesh(unsigned l, const string &n)
+void Object::Loader::mesh_lod(unsigned l, const string &n)
 {
        obj.set_mesh(l, get_collection().get<Mesh>(n));
 }
 
-void Object::Loader::technique()
+void Object::Loader::technique_inline()
 {
        RefPtr<Technique> tech = new Technique;
        if(coll)