X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Ftechnique.h;h=bfd979aae573c26f5a29330ff2a5a1c86981d1d0;hb=bf6890e18cd497bc2abfdb7c4c42378059422c9e;hp=47a307c9af318b111ef2266b93fc9442ece058e1;hpb=fcde8390ad577fe434dcd4b29e0f410d29f867c9;p=libs%2Fgl.git diff --git a/source/materials/technique.h b/source/materials/technique.h index 47a307c9..bfd979aa 100644 --- a/source/materials/technique.h +++ b/source/materials/technique.h @@ -19,15 +19,20 @@ public: class Loader: public Msp::DataFile::CollectionObjectLoader { private: + std::string inline_base_name; + static ActionMap shared_actions; public: Loader(Technique &); Loader(Technique &, Collection &); - private: virtual void init_actions(); + public: + void set_inline_base_name(const std::string &); + + private: void inherit(const std::string &); void pass(const std::string &); }; @@ -59,7 +64,7 @@ public: bool replace_texture(const std::string &, const Texture &); bool replace_material(const std::string &, const Material &); bool replace_uniforms(const ProgramData &); - bool has_shaders() const; + DEPRECATED bool has_shaders() const; void set_debug_name(const std::string &); };