Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/material.h b/source/material.h
index 0e0033b46e0f3544d477f76185b4f8956701c5ce..6614aeeae12cac4c51b0e9b91c320106b256eea1 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -1,14 +1,14 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_MATERIAL_H_
 #define MSP_GL_MATERIAL_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "color.h"
 
 namespace Msp {
@@ -21,14 +21,10 @@ objects, application of material is done with several calls to glMaterial.
 class Material
 {
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::ObjectLoader<Material>
        {
-       private:
-               Material &mat;
-
        public:
                Loader(Material &);
-               Material &get_object() const { return mat; }
        
        private:
                void ambient(float, float, float, float);
@@ -51,7 +47,16 @@ public:
        void set_specular(const Color &s);
        void set_emission(const Color &e);
        void set_shininess(float s);
-       void apply() const;
+       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; }
+       void bind() const;
+
+       static void unbind();
+private:
+       static const Material *current;
 };
 
 } // namespace GL