X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.cpp;h=67fb4d91d1988cf0cac5e3461d4ac67d05adccfb;hp=18a328e1b270775a77b2686a7471addcf3faa64a;hb=5bb193f930fb8738d099d630c4d625d82c1215b5;hpb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index 18a328e1..67fb4d91 100644
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
+#include <msp/strings/format.h>
 #include "ambientocclusion.h"
 #include "blend.h"
 #include "bloom.h"
@@ -9,7 +10,6 @@
 #include "resources.h"
 #include "scene.h"
 #include "sequencetemplate.h"
-#include "tests.h"
 
 using namespace std;
 
@@ -20,13 +20,16 @@ SequenceTemplate::SequenceTemplate():
 	hdr(false),
 	alpha(false),
 	required_multisample(0),
-	max_multisample(0)
+	max_multisample(0),
+	clear_enabled(false),
+	clear_depth(1.0f),
+	clear_stencil(0)
 { }
 
 SequenceTemplate::~SequenceTemplate()
 {
-	for(PostProcessorArray::iterator i=postprocessors.begin(); i!=postprocessors.end(); ++i)
-		delete i->postprocessor_template;
+	for(const PostProcessor &p: postprocessors)
+		delete p.postprocessor_template;
 }
 
 
@@ -65,6 +68,7 @@ SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
 {
 	add("hdr", &SequenceTemplate::hdr);
 	add("alpha", &SequenceTemplate::alpha);
+	add("clear", &Loader::clear);
 	add("multisample", &Loader::multisample);
 	add("multisample", &Loader::multisample_range);
 	add("postprocessor", &Loader::postprocessor);
@@ -80,6 +84,13 @@ void SequenceTemplate::Loader::postprocessor_loaded()
 	obj.postprocessors.push_back(get_postprocessor_template());
 }
 
+void SequenceTemplate::Loader::clear()
+{
+	ClearLoader ldr(obj);
+	load_sub_with(ldr);
+	obj.clear_enabled = true;
+}
+
 void SequenceTemplate::Loader::multisample(unsigned samples)
 {
 	obj.required_multisample = samples;
@@ -125,6 +136,30 @@ void SequenceTemplate::Loader::step_with_slot(const string &tag, const string &r
 }
 
 
+SequenceTemplate::ClearLoader::ClearLoader(SequenceTemplate &t):
+	ObjectLoader<SequenceTemplate>(t)
+{
+	add("color", &ClearLoader::color);
+	add("depth", &ClearLoader::depth);
+	add("stencil", &ClearLoader::stencil);
+}
+
+void SequenceTemplate::ClearLoader::color(float r, float g, float b, float a)
+{
+	obj.clear_colors.push_back(Color(r, g, b, a));
+}
+
+void SequenceTemplate::ClearLoader::depth(float d)
+{
+	obj.clear_depth = d;
+}
+
+void SequenceTemplate::ClearLoader::stencil(int s)
+{
+	obj.clear_stencil = s;
+}
+
+
 SequenceTemplate::Step::Loader::Loader(Step &p):
 	DataFile::CollectionObjectLoader<Step>(p, 0)
 {