Convert Lighting to use shared actions

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index eeb4f30ee8e4ca0796ded102bfaf44049f1063c5..fa0c26b41bfa815abe6902394e505cf474c3276c 100644 (file)
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -102,8 +102,15 @@ void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix
 }
 
 
 }
 
 

+DataFile::Loader::ActionMap Lighting::Loader::shared_actions;
+

 Lighting::Loader::Loader(Lighting &l):
        DataFile::ObjectLoader<Lighting>(l)
 Lighting::Loader::Loader(Lighting &l):
        DataFile::ObjectLoader<Lighting>(l)

+{
+       set_actions(shared_actions);
+}
+
+void Lighting::Loader::init_actions()

 {
        add("ambient", &Loader::ambient);
        add("fog_color", &Loader::fog_color);
 {
        add("ambient", &Loader::ambient);
        add("fog_color", &Loader::fog_color);

diff --git a/source/materials/lighting.h b/source/materials/lighting.h
index ca214fc829601c9c26fa05e73e9e6d37f08d46be..56c728a12c2bbad1ef597a9c457109c03713b174 100644 (file)
--- a/source/materials/lighting.h
+++ b/source/materials/lighting.h
@@ -21,10 +21,15 @@ class Lighting
 public:
        class Loader: public DataFile::ObjectLoader<Lighting>
        {
 public:
        class Loader: public DataFile::ObjectLoader<Lighting>
        {

+       private:
+               static ActionMap shared_actions;
+

        public:
                Loader(Lighting &);
 
        private:
        public:
                Loader(Lighting &);
 
        private:

+               virtual void init_actions();
+

                void ambient(float, float, float);
                void fog_color(float, float, float);
                void fog_density(float);
                void ambient(float, float, float);
                void fog_color(float, float, float);
                void fog_density(float);