X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterial.h;h=9af86a700b6f5502c12b9b240f307263311a800a;hp=6614aeeae12cac4c51b0e9b91c320106b256eea1;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909 diff --git a/source/material.h b/source/material.h index 6614aeea..9af86a70 100644 --- a/source/material.h +++ b/source/material.h @@ -1,14 +1,8 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007-2008 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #ifndef MSP_GL_MATERIAL_H_ #define MSP_GL_MATERIAL_H_ #include +#include "bindable.h" #include "color.h" namespace Msp { @@ -18,7 +12,7 @@ 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::ObjectLoader @@ -55,8 +49,6 @@ public: void bind() const; static void unbind(); -private: - static const Material *current; }; } // namespace GL