X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.h;h=4c195a000bc925983abdf885aace11d68e8dda4d;hb=4791fe8e6451aa6ce62e530fe12904f5cfc112eb;hp=12ccd91d949cb138bac42171cd604e3a6a0c4c02;hpb=c63285753b51215c030b226d66f9662287713f01;p=libs%2Fgl.git

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 12ccd91d..4c195a00 100644
--- 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();
 	};
@@ -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; }