X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=bd899961030095439688bf3bdc866691cfccb088;hb=f98e4dc9f86e4d8603359b2b45ae02a2acd65605;hp=1e94d7ccf96b741c2c0b4c1d3efec60ff86a773f;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 1e94d7cc..bd899961 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -19,6 +19,12 @@ Object::Object():
 	meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+	set_mesh(m);
+	set_technique(t);
+}
+
 Object::~Object()
 {
 }
@@ -26,7 +32,7 @@ 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,7 +77,7 @@ 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());
 
@@ -85,12 +91,12 @@ 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());
 
 	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);
 }
@@ -117,8 +123,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 +144,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 +156,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 +176,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