Access builtin resources through a global instance

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

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 5c5b04b5fc5f315a664ad91cdd319475f7be101f..4c195a000bc925983abdf885aace11d68e8dda4d 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,16 +76,16 @@ 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;
                RefPtr<Lighting> lighting;
                RefPtr<const DepthTest> depth_test;
                RefPtr<const Blend> blend;
-               std::string renderable_name;
-               //Renderable *default_renderable;
+               std::string slot_name;
+               Renderable *default_renderable;
 
                ~Step();
        };
@@ -101,7 +103,6 @@ public:
 private:
        typedef TypeRegistry<PostProcLoader::AddPostProc, PostProcLoader &> PostProcessorRegistry;
 
-       Resources *resources;
        bool hdr;
        bool alpha;
        unsigned required_multisample;
@@ -113,7 +114,6 @@ public:
        SequenceTemplate();
        ~SequenceTemplate();
 
-       Resources &get_resources() const;
        bool get_hdr() const { return hdr; }
        bool get_alpha() const { return alpha; }
        unsigned get_required_multisample() const { return required_multisample; }