X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=a5ee59e5ee1ecb9b181e53ffda03bf5562d0d8dd;hb=3ac3a51c623271da815c8ee60c484445871753bf;hp=8f387a43bfacfbdc4b2b5629d1a5a718f653a5cd;hpb=cb7db94f7837e6a3be037d07575dc248177d9426;p=libs%2Fgl.git diff --git a/source/materials/material.h b/source/materials/material.h index 8f387a43..a5ee59e5 100644 --- a/source/materials/material.h +++ b/source/materials/material.h @@ -97,7 +97,7 @@ protected: public: virtual ~Material() { } - virtual const Program *create_compatible_shader(DataFile::Collection &, const std::map & = std::map()) const; + virtual const Program *create_compatible_shader(const std::map & = std::map()) const; protected: virtual void fill_program_info(std::string &, std::map &) const = 0; @@ -114,6 +114,8 @@ public: virtual const Texture *get_texture(Tag) const = 0; const Sampler *get_sampler() const { return sampler; } + void set_debug_name(const std::string &); + template static void register_type(const std::string &); private: