Check the flat qualifier from the correct member

[libs/gl.git] / source / materials / material.h

diff --git a/source/materials/material.h b/source/materials/material.h
index ea02df6b1e00dad8d0dc5275399a55104c5086d5..3210c96612fcfc2739d7fb99134f086c0c3761f9 100644 (file)
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GL_MATERIAL_H_
 #define MSP_GL_MATERIAL_H_
 
-#include <msp/core/typeregistry.h>
 #include <msp/datafile/collection.h>
+#include <msp/datafile/dynamicobjectloader.h>
 #include <msp/datafile/objectloader.h>
 #include "color.h"
 #include "programdata.h"
@@ -13,6 +13,9 @@ namespace GL {
 
 class Sampler;
 
+/**
+Base class for materials.  Subclasses provide different shading models.
+*/
 class Material
 {
 private:
@@ -24,6 +27,8 @@ private:
                virtual void init_actions();
 
        private:
+               void alpha_cutoff(float);
+               void alpha_cutoff_feather(float, float);
                void sampler(const std::string &);
        };
 
@@ -56,63 +61,56 @@ protected:
        };
 
 public:
-       class GenericLoader: public DataFile::Loader
+       class GenericLoader: public DataFile::DynamicObjectLoader<Material>
        {
-       private:
-               template<typename T>
-               struct CreateMaterial
-               {
-                       void operator()(const std::string &, GenericLoader &) const;
-               };
-
-               DataFile::Collection &coll;
-               Material *material;
-               Loader *mat_loader;
-
-               static ActionMap shared_actions;
+               friend class Material;
 
        public:
-               GenericLoader(DataFile::Collection &);
-               ~GenericLoader();
-
-               Material *get_object() { Material *m = material; material = 0; return m; }
-       private:
-               virtual void init_actions();
-
-               void type(const DataFile::Symbol &);
+               GenericLoader(Collection &c): DynamicObjectLoader<Material>(&c) { }
 
-               friend class Material;
+       protected:
+               virtual const TypeRegistry &get_type_registry() const { return get_material_registry(); }
        };
 
-private:
-       typedef TypeRegistry<GenericLoader::CreateMaterial, GenericLoader &> MaterialRegistry;
-
 protected:
-       const Sampler *sampler;
+       const Sampler *sampler = 0;
+       float alpha_cutoff = 0.0f;
+       float alpha_feather = 1.0f;
        ProgramData shdata;
 
-       Material(): sampler(0) { }
+       Material();
 public:
-       virtual ~Material() { }
+       virtual ~Material() = default;
 
+       /** Returns a shader appropriate for this material.  The same shader is
+       returned for materials with the same set of features.  Additional
+       specialization values can be passed in to customize the shader. */
        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;
 
 public:
-       /** Returns the uniforms for the material. */
+       /** Returns the uniform values for the material. */
        const ProgramData &get_shader_data() const { return shdata; }
 
+       /** Returns texture tags used by the material.  The returned array is
+       terminated by an empty tag. */
        virtual const Tag *get_texture_tags() const = 0;
+
        virtual const Texture *get_texture(Tag) const = 0;
        virtual const Sampler *get_sampler(Tag) const { return sampler; }
 
+       void set_alpha_cutoff(float);
+       void set_alpha_feather(float);
+       float get_alpha_cutoff() const { return alpha_cutoff; }
+       float get_alpha_feather() const { return alpha_feather; }
+
        void set_debug_name(const std::string &);
 
        template<typename T>
        static void register_type(const std::string &);
 private:
-       static MaterialRegistry &get_material_registry();
+       static GenericLoader::TypeRegistry &get_material_registry();
 };
 
 template<typename T>
@@ -188,19 +186,6 @@ void Material::PropertyLoader<C>::property_texture(void (C::*set_texture)(const
        (static_cast<C &>(obj).*set_texture)(&static_cast<Collection &>(get_collection()).get<Texture>(name));
 }
 
-
-template<typename T>
-void Material::GenericLoader::CreateMaterial<T>::operator()(const std::string &, GenericLoader &ldr) const
-{
-       if(ldr.material)
-               throw std::logic_error("Material type was already specified");
-
-       T *mat = new T;
-       ldr.material = mat;
-       ldr.mat_loader = new typename T::Loader(*mat, ldr.coll);
-       ldr.add_auxiliary_loader(*ldr.mat_loader);
-}
-
 } // namespace GL
 } // namespace Msp