Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index d43e0d0efdd421b43b209c0e8f4f280d2529c895..2ca040e6feb68e3eb65239a4c05e4eadfd997053 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -99,7 +99,7 @@ void Mesh::update_index_buffer()
 
 
 Mesh::Loader::Loader(Mesh &m):
-       mesh(m)
+       DataFile::ObjectLoader<Mesh>(m)
 {
        add("vertices", &Loader::vertices);
        add("batch",    &Loader::batch);
@@ -107,14 +107,14 @@ Mesh::Loader::Loader(Mesh &m):
 
 void Mesh::Loader::vertices(VertexFormat f)
 {
-       mesh.vertices.reset(f);
-       load_sub(mesh.vertices);
+       obj.vertices.reset(f);
+       load_sub(obj.vertices);
 }
 
 void Mesh::Loader::batch(PrimitiveType p)
 {
-       mesh.batches.push_back(Batch(p));
-       load_sub(mesh.batches.back());
+       obj.batches.push_back(Batch(p));
+       load_sub(obj.batches.back());
 }
 
 } // namespace GL