X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=b63434742b7ef8a7305a2bbcaed7e3e85a9ba98b;hp=34eebec782472880484179df7cf2175303086bab;hb=c0b7d6ee4a7478f5aecb1504429ec1fc846d64ed;hpb=5008778dbb1840bf7c6d479800d2b932f8386fb2

diff --git a/source/render/object.cpp b/source/render/object.cpp
index 34eebec7..b6343474 100644
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -130,8 +130,8 @@ const Technique *Object::get_technique(unsigned i) const
 
 void Object::render(Renderer &renderer, Tag tag) const
 {
-	const RenderPass *pass = get_pass(tag, 0);
-	if(!pass)
+	const RenderMethod *method = get_method(tag, 0);
+	if(!method)
 		return;
 
 	const Mesh *mesh = lods.front().mesh;
@@ -139,7 +139,7 @@ void Object::render(Renderer &renderer, Tag tag) const
 		throw logic_error("no mesh");
 
 	Renderer::Push push(renderer);
-	pass->apply(renderer);
+	method->apply(renderer);
 
 	setup_render(renderer, tag);
 	mesh->draw(renderer);
@@ -149,8 +149,8 @@ void Object::render(Renderer &renderer, Tag tag) const
 void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) const
 {
 	unsigned lod = min<unsigned>(inst.get_level_of_detail(renderer), lods.size()-1);
-	const RenderPass *pass = get_pass(tag, lod);
-	if(!pass)
+	const RenderMethod *method = get_method(tag, lod);
+	if(!method)
 		return;
 
 	const Mesh *mesh = lods[lod].mesh;
@@ -158,7 +158,7 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) con
 		throw logic_error("no mesh");
 
 	Renderer::Push push(renderer);
-	pass->apply(renderer);
+	method->apply(renderer);
 
 	setup_render(renderer, tag);
 	inst.setup_render(renderer, tag);
@@ -167,12 +167,12 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, Tag tag) con
 	finish_render(renderer, tag);
 }
 
-const RenderPass *Object::get_pass(Tag tag, unsigned lod) const
+const RenderMethod *Object::get_method(Tag tag, unsigned lod) const
 {
 	const Technique *tech = lods[lod].technique;
 	if(!tech)
 		throw logic_error("no technique");
-	return tech->find_pass(tag);
+	return tech->find_method(tag);
 }
 
 void Object::resource_loaded(Resource &res)