X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.h;h=acc852d4fa0ef0113e4a79a6ab6f46ffbead7087;hb=215b633d194920cc697d68cfec201c680210b73c;hp=81a130ef40a04947ceeb1c4e22b143671878890c;hpb=006bdb4f8660098fc524dcca80b24c943c65b249;p=libs%2Fgl.git

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 81a130ef..acc852d4 100644
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -5,10 +5,9 @@
 #include <vector>
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
-#include "blend.h"
 #include "depthtest.h"
 #include "postprocessor.h"
-#include "predicate.h"
+#include "resources.h"
 #include "stenciltest.h"
 
 namespace Msp {
@@ -53,6 +52,7 @@ public:
 	public:
 		Loader(SequenceTemplate &, Collection &);
 
+	private:
 		virtual void postprocessor_loaded();
 		void clear();
 		void multisample(unsigned);
@@ -70,17 +70,11 @@ public:
 			std::string inline_base_name;
 
 		public:
-			Loader(Step &);
 			Loader(Step &, Collection &);
-		private:
-			void init();
 
-		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 &);
@@ -91,14 +85,11 @@ public:
 		};
 
 		std::string tag;
-		const Lighting *lighting;
+		const Lighting *lighting = 0;
 		DepthTest depth_test;
 		StencilTest stencil_test;
-		Blend blend;
 		std::string slot_name;
-		Renderable *default_renderable;
-
-		~Step();
+		Renderable *default_renderable = 0;
 	};
 
 	struct PostProcessor
@@ -123,19 +114,18 @@ private:
 
 	typedef TypeRegistry<PostProcLoader::AddPostProc, PostProcLoader &> PostProcessorRegistry;
 
-	bool hdr;
-	bool alpha;
-	unsigned required_multisample;
-	unsigned max_multisample;
+	bool hdr = false;
+	bool alpha = false;
+	unsigned required_multisample = 0;
+	unsigned max_multisample = 0;
 	std::vector<Step> steps;
 	std::vector<PostProcessor> postprocessors;
-	bool clear_enabled;
+	bool clear_enabled = false;
 	std::vector<Color> clear_colors;
-	float clear_depth;
-	int clear_stencil;
+	float clear_depth = 1.0f;
+	int clear_stencil = 0;
 
 public:
-	SequenceTemplate();
 	~SequenceTemplate();
 
 	bool get_hdr() const { return hdr; }