Rework ProgramData to do less unnecessary work

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

diff --git a/source/material.h b/source/material.h
index f244636859ccc6bb7ab417e5ebe7b498f6925ff5..a149f6d4131fe0ee928f361aabd6065605948921 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -4,6 +4,7 @@
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "color.h"
+#include "programdata.h"
 
 namespace Msp {
 namespace GL {
@@ -15,16 +16,24 @@ objects, application of material is done with several calls to glMaterial.
 class Material: public BindableWithDefault<Material>
 {
 public:
-       class Loader: public DataFile::ObjectLoader<Material>
+       class Loader: public DataFile::CollectionObjectLoader<Material>
        {
+       private:
+               bool srgb;
+
        public:
                Loader(Material &);
-
+               Loader(Material &, Collection &);
        private:
+               void init();
+
+               Color make_color(float, float, float, float);
                void ambient(float, float, float, float);
                void diffuse(float, float, float, float);
                void specular(float, float, float, float);
                void emission(float, float, float, float);
+               void shininess(float);
+               void reflectivity(float);
        };
 
 private:
@@ -42,6 +51,8 @@ private:
        Color specular;
        Color emission;
        float shininess;
+       float reflectivity;
+       ProgramData shdata;
 
 public:
        Material();
@@ -55,11 +66,14 @@ public:
        void set_specular(const Color &s);
        void set_emission(const Color &e);
        void set_shininess(float s);
+       void set_reflectivity(float);
        const Color &get_ambient() const { return ambient; }
        const Color &get_diffuse() const { return diffuse; }
        const Color &get_specular() const { return specular; }
        const Color &get_emission() const { return emission; }
        float get_shininess() const { return shininess; }
+       float get_reflectivity() const { return reflectivity; }
+       const ProgramData &get_shader_data() const { return shdata; }
        void bind() const;
 };