X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.h;h=608af19d9fc8a6af523d03cdcaf1201e79ac3abb;hb=85c82f93f4874bcf0b04332c9abb62cd2a5b181b;hp=cc81b53120d3d9c408964902d8727d5bc0edd012;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git diff --git a/source/technique.h b/source/technique.h index cc81b531..608af19d 100644 --- a/source/technique.h +++ b/source/technique.h @@ -8,7 +8,7 @@ Distributed under the LGPL #ifndef TECHNIQUE_H_ #define TECHNIQUE_H_ -#include "objectpass.h" +#include "renderpass.h" namespace Msp { namespace GL { @@ -25,9 +25,11 @@ public: class Loader: public Msp::DataFile::CollectionObjectLoader { public: + Loader(Technique &); Loader(Technique &, Collection &); private: + void init(); void inherit(const std::string &); void pass(const std::string &); }; @@ -39,7 +41,7 @@ private: InheritLoader(Technique &, Collection &); private: - void texture(const std::string &, const std::string &); + void texture(unsigned, const std::string &); }; typedef std::map PassMap; @@ -47,6 +49,7 @@ private: PassMap passes; public: + RenderPass &add_pass(const GL::Tag &); bool has_pass(const GL::Tag &) const; const RenderPass &get_pass(const GL::Tag &) const; const PassMap &get_passes() const { return passes; }