Use libmspmath to provide vector and matrix operations

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

diff --git a/source/object.cpp b/source/object.cpp
index 1e94d7ccf96b741c2c0b4c1d3efec60ff86a773f..769996834bd89692f1be7496e6c2d1a411b0d3b6 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -19,14 +19,20 @@ Object::Object():
        meshes(1)
 { }
 
-Object::~Object()
+Object::Object(const Mesh *m, const Technique *t)
 {
+       set_mesh(m);
+       set_technique(t);
 }
 
+// Avoid synthesizing ~RefPtr in files including object.h
+Object::~Object()
+{ }
+
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
        if(i>meshes.size())
-               throw invalid_argument("Object::set_mesh");
+               throw out_of_range("Object::set_mesh");
 
        if(i==meshes.size())
                meshes.push_back(m);
@@ -71,11 +77,13 @@ void Object::render(Renderer &renderer, const Tag &tag) const
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+       renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
        renderer.set_material(pass->get_material());
        renderer.set_texturing(pass->get_texturing());
 
+       setup_render(renderer, tag);
        meshes.front()->draw(renderer);
+       finish_render(renderer, tag);
 }
 
 void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
@@ -85,14 +93,16 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+       renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
        renderer.set_material(pass->get_material());
        renderer.set_texturing(pass->get_texturing());
 
+       setup_render(renderer, tag);
        inst.setup_render(renderer, tag);
-       unsigned lod = min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
+       unsigned lod = min<unsigned>(inst.get_level_of_detail(renderer), meshes.size()-1);
        meshes[lod]->draw(renderer);
        inst.finish_render(renderer, tag);
+       finish_render(renderer, tag);
 }
 
 const RenderPass *Object::get_pass(const Tag &tag) const
@@ -117,8 +127,6 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 void Object::Loader::init()
 {
-       allow_pointer_reload = false;
-
        add("mesh",     &Loader::mesh_inline);
        add("mesh",     &Loader::mesh_inline_lod);
        add("mesh",     &Loader::mesh);
@@ -140,7 +148,7 @@ void Object::Loader::mesh_inline()
 void Object::Loader::mesh_inline_lod(unsigned l)
 {
        if(l>obj.meshes.size())
-               throw invalid_argument("Object::Loader::mesh_inline_lod");
+               throw out_of_range("Object::Loader::mesh_inline_lod");
 
        RefPtr<Mesh> msh = new Mesh;
        load_sub(*msh);
@@ -152,12 +160,12 @@ void Object::Loader::mesh_inline_lod(unsigned l)
 
 void Object::Loader::mesh(const std::string &n)
 {
-       obj.set_mesh(get_collection().get<Mesh>(n));
+       obj.set_mesh(&get_collection().get<Mesh>(n));
 }
 
 void Object::Loader::mesh_lod(unsigned l, const string &n)
 {
-       obj.set_mesh(l, get_collection().get<Mesh>(n));
+       obj.set_mesh(l, &get_collection().get<Mesh>(n));
 }
 
 void Object::Loader::technique_inline()
@@ -172,7 +180,7 @@ void Object::Loader::technique_inline()
 
 void Object::Loader::technique(const std::string &n)
 {
-       obj.set_technique(get_collection().get<Technique>(n));
+       obj.set_technique(&get_collection().get<Technique>(n));
 }
 
 } // namespace GL