X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=fa1612e142d1dca596fe58a59e03491d74b0fc70;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=b0c9cd0d3510c2e2d76612bea410f8b13670423a;hpb=530ace590ddb8024fbffc944d006aae7876a25f9;p=libs%2Fgl.git diff --git a/source/material.h b/source/material.h index b0c9cd0d..fa1612e1 100644 --- a/source/material.h +++ b/source/material.h @@ -1,14 +1,15 @@ /* $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 +#include +#include "bindable.h" #include "color.h" namespace Msp { @@ -18,17 +19,13 @@ namespace GL { Stores OpenGL material properties. Since OpenGL does not support material objects, application of material is done with several calls to glMaterial. */ -class Material +class Material: public Bindable { public: - class Loader: public DataFile::Loader + class Loader: public DataFile::ObjectLoader { - private: - Material &mat; - public: Loader(Material &); - Material &get_object() const { return mat; } private: void ambient(float, float, float, float); @@ -56,7 +53,9 @@ public: const Color &get_specular() const { return specular; } const Color &get_emission() const { return emission; } float get_shininess() const { return shininess; } - void apply() const; + void bind() const; + + static void unbind(); }; } // namespace GL