namespace Msp {
namespace GL {
-class Texturing;
+class Sampler;
class Material
{
{
private:
template<typename T>
- struct AddType
+ struct CreateMaterial
{
- void operator()(const std::string &kw, GenericLoader &ldr) const { ldr.add(kw, &GenericLoader::typed_material<T>); }
+ void operator()(const std::string &, GenericLoader &) const;
};
DataFile::Collection *coll;
- RefPtr<Material> material;
+ Material *material;
+ Loader *mat_loader;
static ActionMap shared_actions;
public:
GenericLoader(DataFile::Collection * = 0);
+ ~GenericLoader();
- Material *get_material() { return material.release(); }
+ Material *get_material() { Material *m = material; material = 0; return m; }
private:
virtual void init_actions();
- template<typename T>
- void typed_material();
+ void type(const DataFile::Symbol &);
friend class Material;
};
private:
- typedef TypeRegistry<GenericLoader::AddType, GenericLoader &> MaterialRegistry;
+ typedef TypeRegistry<GenericLoader::CreateMaterial, GenericLoader &> MaterialRegistry;
protected:
const Sampler *sampler;
public:
virtual ~Material() { }
- virtual const Program *create_compatible_shader(DataFile::Collection &) const;
+ virtual const Program *create_compatible_shader(const std::map<std::string, int> & = std::map<std::string, int>()) const;
protected:
virtual void fill_program_info(std::string &, std::map<std::string, int> &) const = 0;
/** Returns the uniforms for the material. */
const ProgramData &get_shader_data() const { return shdata; }
-protected:
- DEPRECATED void attach_texture_to(const Texture *, Texturing &, ProgramData &, const std::string &) const;
-public:
- DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const = 0;
-
virtual const Tag *get_texture_tags() const = 0;
virtual const Texture *get_texture(Tag) const = 0;
- const Sampler *get_sampler() const { return sampler; }
+ virtual const Sampler *get_sampler(Tag) const { return sampler; }
+
+ void set_debug_name(const std::string &);
template<typename T>
static void register_type(const std::string &);
template<typename T>
-void Material::GenericLoader::typed_material()
+void Material::GenericLoader::CreateMaterial<T>::operator()(const std::string &, GenericLoader &ldr) const
{
- if(material)
- throw std::logic_error("Material was already loaded");
- RefPtr<T> mat = new T;
- if(coll)
- load_sub(*mat, *coll);
+ if(ldr.material)
+ throw std::logic_error("Material type was already specified");
+
+ T *mat = new T;
+ ldr.material = mat;
+ if(ldr.coll)
+ ldr.mat_loader = new typename T::Loader(*mat, *ldr.coll);
else
- load_sub(*mat);
- material = mat;
+ ldr.mat_loader = new typename T::Loader(*mat);
+ ldr.add_auxiliary_loader(*ldr.mat_loader);
}
} // namespace GL