X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.h;h=b674945ee1a23136d34bd6931b074760fa7779a5;hb=9cfccf5c4e366e033cfd5eebf8955d2b13202b46;hp=e01b872daf56c2a0af7ec8a1e2d8bcfae7d017d4;hpb=dccad64b2ec82249d850b9745614042171499972;p=libs%2Fgl.git diff --git a/source/materials/renderpass.h b/source/materials/renderpass.h index e01b872d..b674945e 100644 --- a/source/materials/renderpass.h +++ b/source/materials/renderpass.h @@ -87,10 +87,10 @@ public: const Program *get_shader_program() const { return shprog.get(); } const ProgramData *get_shader_data() const { return shdata.get(); } const std::string &get_slotted_uniform_name(const std::string &) const; - void set_material(const Material *); + void set_material(const Material *, DataFile::Collection * = 0); const Material *get_material() const { return material.get(); } const std::string &get_material_slot_name() const { return material_slot; } - void set_texture(unsigned, const Texture *); + void set_texture(unsigned, const Texture *, const Sampler * = 0); const Texturing *get_texturing() const { return texturing; } int get_texture_index(const std::string &) const; void set_back_faces(bool);