#include <msp/datafile/collection.h>
#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
#include "camera.h"
#include "objectinstance.h"
#include "occludedscene.h"
}
-Scene::Loader::Loader(Scene &s, Collection &c):
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
DataFile::CollectionObjectLoader<Scene>(s, &c),
- content(0)
-{
- init();
-}
-
-Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
- DataFile::CollectionObjectLoader<Scene>(s, &c),
- content(&m)
-{
- init();
-}
-
-void Scene::Loader::init()
+ content(m),
+ inst_counter(0)
{
add("object", &Loader::object);
add("object", &Loader::object_tagged);