X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Ftechnique.h;h=419c676570a653b41549b65b8467d1fa84a1ad58;hb=5bb193f930fb8738d099d630c4d625d82c1215b5;hp=a7999c0cf67652a140a219c24258e2a3e210ee39;hpb=3ac3a51c623271da815c8ee60c484445871753bf;p=libs%2Fgl.git diff --git a/source/materials/technique.h b/source/materials/technique.h index a7999c0c..419c6765 100644 --- a/source/materials/technique.h +++ b/source/materials/technique.h @@ -1,6 +1,7 @@ #ifndef MSP_GL_TECHNIQUE_H_ #define MSP_GL_TECHNIQUE_H_ +#include #include "renderpass.h" #include "tag.h" @@ -49,22 +50,18 @@ private: void uniforms(); }; -public: - typedef std::map PassMap; - -private: - PassMap passes; + std::map passes; public: RenderPass &add_pass(Tag); bool has_pass(Tag) const; const RenderPass &get_pass(Tag) const; const RenderPass *find_pass(Tag) const; - const PassMap &get_passes() const { return passes; } + const std::map &get_passes() const { return passes; } 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 &); };