X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=ccc7b97ecdd0086db8f6b6029fc9546e94b82771;hp=b63434742b7ef8a7305a2bbcaed7e3e85a9ba98b;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hpb=23d4100160bfa33359ce297b6b36244abcaa5f82 diff --git a/source/render/object.cpp b/source/render/object.cpp index b6343474..ccc7b97e 100644 --- a/source/render/object.cpp +++ b/source/render/object.cpp @@ -188,7 +188,7 @@ void Object::resource_removed(Resource &res) } -Object::Loader::Loader(Object &o, Collection *c): +Object::Loader::Loader(Object &o, Collection &c): LodLoader(o, 0, c) { add("bounding_sphere_hint", &Loader::bounding_sphere_hint); @@ -207,13 +207,13 @@ void Object::Loader::bounding_sphere_hint(float x, float y, float z, float r) void Object::Loader::level_of_detail(unsigned i) { - LodLoader ldr(obj, i, coll); + LodLoader ldr(obj, i, get_collection()); load_sub_with(ldr); } -Object::LodLoader::LodLoader(Object &o, unsigned i, Collection *c): - DataFile::CollectionObjectLoader(o, c), +Object::LodLoader::LodLoader(Object &o, unsigned i, Collection &c): + DataFile::CollectionObjectLoader(o, &c), index(i), lod(obj.get_lod(index, "Object::LodLoader::LodLoader")) {