X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.h;h=972a6b0b18939e6deda71e243d3dd89a31594eb9;hp=bf1e8be185e086efc6b3597139f827630e672536;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hpb=f19366d32cc29287a2730cfba90893e407754081

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index bf1e8be1..972a6b0b 100644
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -70,13 +70,8 @@ public:
 			std::string inline_base_name;
 
 		public:
-			Loader(Step &s): Loader(s, 0) { }
-			Loader(Step &s, Collection &c): Loader(s, &c) { }
-		private:
-			Loader(Step &, Collection *);
-			void init();
+			Loader(Step &, Collection &);
 
-		public:
 			void set_inline_base_name(const std::string &);
 
 		private:
@@ -92,14 +87,12 @@ 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
@@ -124,19 +117,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; }