#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"
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);
void Object::Loader::init()
{
- allow_pointer_reload = false;
-
add("mesh", &Loader::mesh_inline);
add("mesh", &Loader::mesh_inline_lod);
add("mesh", &Loader::mesh);
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);
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()
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