X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fbasicmaterial.h;h=bf4a1c1c5d16bccbec28edbf0f63fd018041f338;hb=3ac3a51c623271da815c8ee60c484445871753bf;hp=95259f476b233198856c49a42391049f54f6b0b5;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/materials/basicmaterial.h b/source/materials/basicmaterial.h index 95259f47..bf4a1c1c 100644 --- a/source/materials/basicmaterial.h +++ b/source/materials/basicmaterial.h @@ -29,16 +29,20 @@ private: Property normal; Property emission; Property reflectivity; - bool receive_shadows; + + static const Tag texture_tags[]; public: BasicMaterial(); protected: - virtual std::string create_program_source() const; + virtual void fill_program_info(std::string &, std::map &) const; public: - virtual void attach_textures_to(Texturing &, ProgramData &) const; + DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const; + + virtual const Tag *get_texture_tags() const { return texture_tags; } + virtual const Texture *get_texture(Tag) const; void set_diffuse(const Color &); void set_diffuse_map(const Texture *); @@ -51,7 +55,6 @@ public: void set_shininess_map(const Texture *); void set_reflectivity(float); void set_reflectivity_map(const Texture *); - void set_receive_shadows(bool); }; } // namespace GL