Allow renderables to be specified in SequenceTemplate passes

[libs/gl.git] / source / builders / sequencetemplate.h

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 12ccd91d949cb138bac42171cd604e3a6a0c4c02..596def5064950d9741ff64d8626a11756c3c1c9d 100644 (file)
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -14,6 +14,7 @@ namespace GL {
 
 class DepthTest;
 class Lighting;
+class Renderable;
 
 class SequenceTemplate
 {
@@ -55,7 +56,8 @@ public:
                void multisample(unsigned);
                void multisample_range(unsigned, unsigned);
                void postprocessor(const std::string &);
-               void step(const std::string &, const std::string &);
+               void step(const std::string &);
+               void step_with_slot(const std::string &, const std::string &);
        };
 
        struct Step
@@ -74,8 +76,8 @@ public:
                        void depth_test_predefined(const std::string &);
                        void lighting(const std::string &);
                        void lighting_inline();
-                       // TODO requires support for scenes in Resources
-                       //void scene(const std::string &);
+                       void object(const std::string &);
+                       void scene(const std::string &);
                };
 
                std::string tag;
@@ -83,7 +85,7 @@ public:
                RefPtr<const DepthTest> depth_test;
                RefPtr<const Blend> blend;
                std::string slot_name;
-               //Renderable *default_renderable;
+               Renderable *default_renderable;
 
                ~Step();
        };