#include <msp/fs/utils.h>
+#include <msp/gl/extensions/sgis_generate_mipmap.h>
#include "animation.h"
#include "armature.h"
#include "font.h"
#include "resourcemanager.h"
#include "resources.h"
#include "technique.h"
+#include "texture1d.h"
#include "texture2d.h"
+#include "texture2darray.h"
#include "texturecube.h"
using namespace std;
namespace GL {
Resources::Resources():
- default_tex_filter(LINEAR_MIPMAP_LINEAR),
+ default_tex_filter(SGIS_generate_mipmap ? LINEAR_MIPMAP_LINEAR : LINEAR),
srgb_conversion(false),
resource_manager(0)
{
add_type<Font>().keyword("font");
add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
add_type<Material>().suffix(".mat").keyword("material");
- add_type<Mesh>().keyword("mesh");
+ add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
add_type<Object>().keyword("object");
add_type<Pose>().keyword("pose");
add_type<Program>().keyword("shader");
add_type<Technique>().suffix(".tech").keyword("technique");
+ add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d");
add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d);
+ add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d");
add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube");
+ add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array");
}
void Resources::set_default_texture_filter(TextureFilter tf)
resource_manager = m;
}
+Mesh *Resources::create_mesh(const string &name)
+{
+ if(!resource_manager)
+ return 0;
+
+ if(RefPtr<IO::Seekable> io = open_from_sources(name))
+ {
+ RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+ resource_manager->set_resource_location(*mesh, *this, name);
+ return mesh.release();
+ }
+
+ return 0;
+}
+
Texture2D *Resources::create_texture2d(const string &name)
{
string ext = FS::extpart(name);
tex->set_mag_filter(default_tex_filter);
tex->set_min_filter(default_tex_filter);
- // TODO Somehow pass the srgb flag if a resource manager is in use
if(resource_manager)
resource_manager->set_resource_location(*tex, *this, name);
else