#include "programcompiler.h"
#include "resourcemanager.h"
#include "resources.h"
+#include "sampler.h"
#include "technique.h"
#include "texture1d.h"
#include "texture2d.h"
add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
add_type<Pose>().keyword("pose");
add_type<Program>().keyword("shader").suffix(".glsl").creator(&Resources::create_program);
+ add_type<Sampler>().suffix(".samp").keyword("sampler");
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);
if(resource_manager)
resource_manager->set_resource_location(*tex, *this, name);
else
- tex->image(image, srgb_conversion);
+ tex->image(image);
return tex.release();
}