X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.h;h=061fdfc39928f1b4ce8e2634ffe3e1d933ec1086;hp=5c5b04b5fc5f315a664ad91cdd319475f7be101f;hb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;hpb=dff7004fa078d55911664c0f513b5dc6c9449420

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 5c5b04b5..061fdfc3 100644
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -6,14 +6,16 @@
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
 #include "blend.h"
+#include "depthtest.h"
 #include "postprocessor.h"
 #include "predicate.h"
+#include "stenciltest.h"
 
 namespace Msp {
 namespace GL {
 
-class DepthTest;
 class Lighting;
+class Renderable;
 
 class SequenceTemplate
 {
@@ -55,35 +57,45 @@ 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
 	{
 		class Loader: public DataFile::CollectionObjectLoader<Step>
 		{
+		private:
+			std::string inline_base_name;
+
 		public:
 			Loader(Step &);
 			Loader(Step &, Collection &);
 		private:
 			void init();
 
-			void blend(BlendFactor, BlendFactor);
-			void blend_predefined(const std::string &);
-			void depth_test(Predicate);
-			void depth_test_predefined(const std::string &);
+		public:
+			void set_inline_base_name(const std::string &);
+
+		private:
+			void blend();
+			void blend_factors(BlendFactor, BlendFactor);
+			void depth_test();
+			void depth_compare(Predicate);
 			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 &);
+			void stencil_test();
 		};
 
 		std::string tag;
-		RefPtr<Lighting> lighting;
-		RefPtr<const DepthTest> depth_test;
-		RefPtr<const Blend> blend;
-		std::string renderable_name;
-		//Renderable *default_renderable;
+		const Lighting *lighting;
+		DepthTest depth_test;
+		StencilTest stencil_test;
+		Blend blend;
+		std::string slot_name;
+		Renderable *default_renderable;
 
 		~Step();
 	};
@@ -101,7 +113,6 @@ public:
 private:
 	typedef TypeRegistry<PostProcLoader::AddPostProc, PostProcLoader &> PostProcessorRegistry;
 
-	Resources *resources;
 	bool hdr;
 	bool alpha;
 	unsigned required_multisample;
@@ -113,7 +124,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; }