X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Feffect.h;h=e77b4cf5c8b110f1ca42a6dc35c2434629534ea3;hp=ac458361700cf669052ea69039017451f2497e8f;hb=bdcae47bf2f4e49d2d9e4ba15e6f17171ce5fa0c;hpb=f853ca0a365ae8b43ba8b2f4d6f21cd1c2bd4bd5 diff --git a/source/effects/effect.h b/source/effects/effect.h index ac458361..e77b4cf5 100644 --- a/source/effects/effect.h +++ b/source/effects/effect.h @@ -44,7 +44,7 @@ public: }; protected: - Renderable &renderable; + Renderable &content; std::vector enabled_methods; protected: @@ -56,11 +56,11 @@ public: void disable_for_method(Tag); bool is_enabled_for_method(Tag) const; - virtual const Matrix *get_matrix() const { return renderable.get_matrix(); } - virtual const Geometry::BoundingSphere *get_bounding_sphere() const { return renderable.get_bounding_sphere(); } + virtual const Matrix *get_matrix() const { return content.get_matrix(); } + virtual const Geometry::BoundingSphere *get_bounding_sphere() const { return content.get_bounding_sphere(); } - virtual void setup_frame(Renderer &r) { renderable.setup_frame(r); } - virtual void finish_frame() { renderable.finish_frame(); } + virtual void setup_frame(Renderer &r) { content.setup_frame(r); } + virtual void finish_frame() { content.finish_frame(); } virtual void set_debug_name(const std::string &) = 0; };