Rename Material::LoaderBase to PropertyLoader

diff --git a/source/basicmaterial.cpp b/source/basicmaterial.cpp
index 9c7714dc1861d1974adc4d20fac8aa9b565d3a37..708c8a5b6ccb876cb9124be8cd2d1cc1fecea4b4 100644 (file)
--- a/source/basicmaterial.cpp
+++ b/source/basicmaterial.cpp
@@ -126,13 +126,13 @@ void BasicMaterial::set_receive_shadows(bool s)
 DataFile::Loader::ActionMap BasicMaterial::Loader::shared_actions;
 
 BasicMaterial::Loader::Loader(BasicMaterial &m):
-       DerivedObjectLoader<BasicMaterial, Material::LoaderBase<BasicMaterial> >(m)
+       DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >(m)
 {
        set_actions(shared_actions);
 }
 
 BasicMaterial::Loader::Loader(BasicMaterial &m, Collection &c):
-       DerivedObjectLoader<BasicMaterial, Material::LoaderBase<BasicMaterial> >(m, c)
+       DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >(m, c)
 {
        set_actions(shared_actions);
 }

diff --git a/source/basicmaterial.h b/source/basicmaterial.h
index 5d8d96ae5273d05e7a3106d409e5b4d40b7be450..73bb38e911d439ca38e70eed5278598ccd17a891 100644 (file)
--- a/source/basicmaterial.h
+++ b/source/basicmaterial.h
@@ -9,7 +9,7 @@ namespace GL {
 class BasicMaterial: public Material
 {
 public:
-       class Loader: public DataFile::DerivedObjectLoader<BasicMaterial, Material::LoaderBase<BasicMaterial> >
+       class Loader: public DataFile::DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >
        {
        private:
                static ActionMap shared_actions;

diff --git a/source/material.h b/source/material.h
index 5515f29eee539a211059fb15f6869332659c1224..3b9321fed482bba9748de130a7d03418b47d9050 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -26,11 +26,11 @@ protected:
        };
 
        template<typename C>
-       class LoaderBase: public DataFile::CollectionObjectLoader<Material>
+       class PropertyLoader: public DataFile::CollectionObjectLoader<Material>
        {
        protected:
-               LoaderBase(C &m): CollectionObjectLoader<Material>(m, 0) { }
-               LoaderBase(C &m, Collection &c): CollectionObjectLoader<Material>(m, &c) { }
+               PropertyLoader(C &m): CollectionObjectLoader<Material, Loader>(m, 0) { }
+               PropertyLoader(C &m, Collection &c): CollectionObjectLoader<Material, Loader>(m, c) { }
 
                void add_property(const std::string &, void (C::*)(float), void (C::*)(const Texture *));
                void add_property(const std::string &, void (C::*)(const Color &), void (C::*)(const Texture *), bool);
@@ -110,63 +110,63 @@ void Material::register_type(const std::string &kw)
 
 
 template<typename C>
-void Material::LoaderBase<C>::add_property(const std::string &kw, void (C::*set_value)(float), void (C::*set_texture)(const Texture *))
+void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*set_value)(float), void (C::*set_texture)(const Texture *))
 {
-       add(kw, &LoaderBase<C>::property_value_scalar, set_value);
-       add(kw+"_map", &LoaderBase<C>::property_texture, set_texture);
+       add(kw, &PropertyLoader<C>::property_value_scalar, set_value);
+       add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>
-void Material::LoaderBase<C>::add_property(const std::string &kw, void (C::*set_value)(const Color &), void (C::*set_texture)(const Texture *), bool allow_alpha)
+void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*set_value)(const Color &), void (C::*set_texture)(const Texture *), bool allow_alpha)
 {
-       add(kw, &LoaderBase<C>::property_value_rgb, set_value);
-       add(kw+"_srgb", &LoaderBase<C>::property_value_srgb, set_value);
+       add(kw, &PropertyLoader<C>::property_value_rgb, set_value);
+       add(kw+"_srgb", &PropertyLoader<C>::property_value_srgb, set_value);
        if(allow_alpha)
        {
-               add(kw, &LoaderBase<C>::property_value_rgba, set_value);
-               add(kw+"_srgb", &LoaderBase<C>::property_value_srgb_alpha, set_value);
+               add(kw, &PropertyLoader<C>::property_value_rgba, set_value);
+               add(kw+"_srgb", &PropertyLoader<C>::property_value_srgb_alpha, set_value);
        }
-       add(kw+"_map", &LoaderBase<C>::property_texture, set_texture);
+       add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>
-void Material::LoaderBase<C>::add_property(const std::string &kw, void (C::*set_texture)(const Texture *))
+void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*set_texture)(const Texture *))
 {
-       add(kw+"_map", &LoaderBase<C>::property_texture, set_texture);
+       add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>
-void Material::LoaderBase<C>::property_value_scalar(void (C::*set_value)(float), float value)
+void Material::PropertyLoader<C>::property_value_scalar(void (C::*set_value)(float), float value)
 {
        (static_cast<C &>(obj).*set_value)(value);
 }
 
 template<typename C>
-void Material::LoaderBase<C>::property_value_rgb(void (C::*set_value)(const Color &), float r, float g, float b)
+void Material::PropertyLoader<C>::property_value_rgb(void (C::*set_value)(const Color &), float r, float g, float b)
 {
        (static_cast<C &>(obj).*set_value)(Color(r, g, b));
 }
 
 template<typename C>
-void Material::LoaderBase<C>::property_value_rgba(void (C::*set_value)(const Color &), float r, float g, float b, float a)
+void Material::PropertyLoader<C>::property_value_rgba(void (C::*set_value)(const Color &), float r, float g, float b, float a)
 {
        (static_cast<C &>(obj).*set_value)(Color(r, g, b, a));
 }
 
 template<typename C>
-void Material::LoaderBase<C>::property_value_srgb(void (C::*set_value)(const Color &), float r, float g, float b)
+void Material::PropertyLoader<C>::property_value_srgb(void (C::*set_value)(const Color &), float r, float g, float b)
 {
        (static_cast<C &>(obj).*set_value)(Color(r, g, b).to_linear());
 }
 
 template<typename C>
-void Material::LoaderBase<C>::property_value_srgb_alpha(void (C::*set_value)(const Color &), float r, float g, float b, float a)
+void Material::PropertyLoader<C>::property_value_srgb_alpha(void (C::*set_value)(const Color &), float r, float g, float b, float a)
 {
        (static_cast<C &>(obj).*set_value)(Color(r, g, b, a).to_linear());
 }
 
 template<typename C>
-void Material::LoaderBase<C>::property_texture(void (C::*set_texture)(const Texture *), const std::string &name)
+void Material::PropertyLoader<C>::property_texture(void (C::*set_texture)(const Texture *), const std::string &name)
 {
        /* The static_cast around get_collection is needed because otherwise Android
        SDK's g++ 4.9 fails to parse get<Texture> as a template function call */

diff --git a/source/pbrmaterial.cpp b/source/pbrmaterial.cpp
index 8406d4e253e41492afcbd8a0bcda92a830c9e31c..7eaa56f1d1df99a78103ef9119bcd1f78bba1c27 100644 (file)
--- a/source/pbrmaterial.cpp
+++ b/source/pbrmaterial.cpp
@@ -111,13 +111,13 @@ void PbrMaterial::set_receive_shadows(bool s)
 DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions;
 
 PbrMaterial::Loader::Loader(PbrMaterial &m):
-       DerivedObjectLoader<PbrMaterial, Material::LoaderBase<PbrMaterial> >(m)
+       DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m)
 {
        set_actions(shared_actions);
 }
 
 PbrMaterial::Loader::Loader(PbrMaterial &m, Collection &c):
-       DerivedObjectLoader<PbrMaterial, Material::LoaderBase<PbrMaterial> >(m, c)
+       DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m, c)
 {
        set_actions(shared_actions);
 }

diff --git a/source/pbrmaterial.h b/source/pbrmaterial.h
index 0002888b080cccdb4eff14d0dbd31469689dfbbe..2a0eef3531951efbc2669644d27ff4671a552d33 100644 (file)
--- a/source/pbrmaterial.h
+++ b/source/pbrmaterial.h
@@ -9,7 +9,7 @@ namespace GL {
 class PbrMaterial: public Material
 {
 public:
-       class Loader: public DataFile::DerivedObjectLoader<PbrMaterial, Material::LoaderBase<PbrMaterial> >
+       class Loader: public DataFile::DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >
        {
        private:
                static ActionMap shared_actions;