#ifndef MSP_GL_SCENE_H_
#define MSP_GL_SCENE_H_
-#include <vector>
+#include <map>
#include <msp/core/typeregistry.h>
#include <msp/datafile/objectloader.h>
#include "matrix.h"
#include "renderable.h"
-#include "vector.h"
namespace Msp {
namespace GL {
unsigned inst_counter;
public:
- Loader(Scene &, Collection &);
- Loader(Scene &, Collection &, ContentMap &);
+ Loader(Scene &s, Collection &c): Loader(s, c, 0) { }
+ Loader(Scene &s, Collection &c, ContentMap &m) : Loader(s, c, &m) { }
private:
- void init();
+ Loader(Scene &, Collection &, ContentMap *);
void object(const std::string &);
void object_tagged(const std::string &, const std::string &);