Initialize slot even when unused to silence optimizer warnings

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

diff --git a/source/material.h b/source/material.h
index a787a6d3b7078ee60f706debaf2d62b903c4989f..5a71aa34bae2be1470016f1c9ef7a3848447503a 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 {
@@ -19,12 +20,13 @@ public:
        {
        public:
                Loader(Material &);
-       
+
        private:
                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);
        };
 
 private:
@@ -42,6 +44,7 @@ private:
        Color specular;
        Color emission;
        float shininess;
+       ProgramData shdata;
 
 public:
        Material();
@@ -60,6 +63,7 @@ public:
        const Color &get_specular() const { return specular; }
        const Color &get_emission() const { return emission; }
        float get_shininess() const { return shininess; }
+       const ProgramData &get_shader_data() const { return shdata; }
        void bind() const;
 };