Check the relevant extensions when using pixel formats

[libs/gl.git] / source / object.cpp

diff --git a/source/object.cpp b/source/object.cpp
index 1e94d7ccf96b741c2c0b4c1d3efec60ff86a773f..06062fc099da69e169f0f23431c5445ce931216b 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -19,6 +19,12 @@ Object::Object():
        meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+       set_mesh(m);
+       set_technique(t);
+}
+
 Object::~Object()
 {
 }
@@ -90,7 +96,7 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
        renderer.set_texturing(pass->get_texturing());
 
        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);
 }
@@ -117,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);
@@ -152,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()
@@ -172,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