X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobject.cpp;h=86857a9842f10d7523cc1361527df29a07f0941f;hp=f710a7a9c8c5ced2f2e6647c54a16848a90a7fe7;hb=df1f68d366e145716225f1a4dd223b0129280fb2;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb

diff --git a/source/object.cpp b/source/object.cpp
index f710a7a9..86857a98 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -119,24 +119,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");
@@ -154,12 +155,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)