X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=6bc872a198553eb38aa65ae67052b32ace758597;hb=72790b3aba8ddc1a6d020646fb7312959729777b;hp=d573fdd4975695eddfd3d164eca0128d97936937;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index d573fdd4..6bc872a1 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,6 +1,5 @@
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
-#include "except.h"
+#include <msp/strings/format.h>
 #include "material.h"
 #include "mesh.h"
 #include "object.h"
@@ -20,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 InvalidParameterValue("LODs must be continuous");
+		throw out_of_range("Object::set_mesh");
 
 	if(i==meshes.size())
 		meshes.push_back(m);
@@ -72,11 +77,11 @@ 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_material(pass->get_material());
-	renderer.set_texturing(pass->get_texturing());
+	pass->apply(renderer);
 
+	setup_render(renderer, tag);
 	meshes.front()->draw(renderer);
+	finish_render(renderer, tag);
 }
 
 void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
@@ -86,14 +91,14 @@ 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_material(pass->get_material());
-	renderer.set_texturing(pass->get_texturing());
+	pass->apply(renderer);
 
+	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
@@ -118,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);
@@ -141,7 +144,7 @@ void Object::Loader::mesh_inline()
 void Object::Loader::mesh_inline_lod(unsigned l)
 {
 	if(l>obj.meshes.size())
-		throw InvalidParameterValue("LODs must be continuous");
+		throw out_of_range("Object::Loader::mesh_inline_lod");
 
 	RefPtr<Mesh> msh = new Mesh;
 	load_sub(*msh);
@@ -153,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()
@@ -173,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