Unify the loader wrappers for Material and Scene

[libs/gl.git] / source / materials / material.cpp

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 328d89a462ccd4db069499ab45ed5fe2d98d7c35..b7dd767eaff72dd309f5cb6adc4f4d211cfed4e5 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -1,11 +1,9 @@
 #include <msp/core/hash.h>
 #include <msp/strings/format.h>
 #include "basicmaterial.h"
-#include "gl.h"
 #include "pbrmaterial.h"
 #include "program.h"
 #include "resources.h"
-#include "uniform.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -92,14 +90,20 @@ void Material::Loader::sampler(const string &name)
 
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-       coll(c),
+Material::GenericLoader::GenericLoader():
+       coll(0),
        material(0),
        mat_loader(0)
 {
        set_actions(shared_actions);
 }
 
+Material::GenericLoader::GenericLoader(DataFile::Collection &c):
+       GenericLoader()
+{
+       coll = &c;
+}
+
 Material::GenericLoader::~GenericLoader()
 {
        delete material;