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

diff --git a/source/object.cpp b/source/object.cpp
index f710a7a9..f23f6658 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,13 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #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"
@@ -27,6 +19,12 @@ Object::Object():
 	meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+	set_mesh(m);
+	set_technique(t);
+}
+
 Object::~Object()
 {
 }
@@ -34,7 +32,7 @@ Object::~Object()
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
 	if(i>meshes.size())
-		throw InvalidParameterValue("LODs must be continuous");
+		throw invalid_argument("Object::set_mesh");
 
 	if(i==meshes.size())
 		meshes.push_back(m);
@@ -43,6 +41,14 @@ void Object::set_mesh(unsigned i, const Mesh *m)
 	meshes[i].keep();
 }
 
+const Mesh *Object::get_mesh(unsigned i) const
+{
+	if(i>=meshes.size())
+		return 0;
+
+	return meshes[i].get();
+}
+
 void Object::set_technique(const Technique *t)
 {
 	technique = t;
@@ -117,29 +123,28 @@ 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);
+	add("mesh",     &Loader::mesh_lod);
+	add("technique", &Loader::technique_inline);
+	add("technique", &Loader::technique);
 
-	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));
 	// 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");
+		throw invalid_argument("Object::Loader::mesh_inline_lod");
 
 	RefPtr<Mesh> msh = new Mesh;
 	load_sub(*msh);
@@ -151,15 +156,15 @@ void Object::Loader::mesh(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(unsigned l, const string &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()
+void Object::Loader::technique_inline()
 {
 	RefPtr<Technique> tech = new Technique;
 	if(coll)
@@ -171,7 +176,7 @@ void Object::Loader::technique()
 
 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