default_font(0)
{
add_keyword<Graphic>("graphic");
+ add_keyword<GL::Texture2D>("texture");
add_creator(&Resources::create_font);
add_creator(&Resources::create_texture);
}
-void Resources::set_path(const Path &p)
+void Resources::set_path(const FS::Path &p)
{
path=p;
}
GL::Font *Resources::create_font(const string &name)
{
RefPtr<GL::Font> fnt=new GL::Font;
- DataFile::load<GL::Font, Resources &>(*fnt, (path/name).str(), *this);
+ DataFile::load(*fnt, (path/name).str(), *this);
if(!default_font)
default_font=fnt.get();
return fnt.release();
void Resources::Loader::font(const string &name)
{
RefPtr<GL::Font> fnt=new GL::Font;
- load_sub(*fnt);
+ load_sub(*fnt, res);
res.add(name, fnt.get());
if(!res.default_font)
res.default_font=fnt.get();