X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.cpp;h=e48750e5f5df9299b25590658e1a6b2d3eae3603;hp=f158c630083b8e82110028c031c4edfe63bb2396;hb=18fda5b5a13215c500cb402f7d2b081e439a1f0e;hpb=6cbabebe65575a55e120acd6294da305765d5bbb

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index f158c630..e48750e5 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,32 +10,16 @@
 #include "resources.h"
 #include "scene.h"
 #include "sequencetemplate.h"
-#include "tests.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-SequenceTemplate::SequenceTemplate():
-	resources(0),
-	hdr(false),
-	alpha(false),
-	required_multisample(0),
-	max_multisample(0)
-{ }
-
 SequenceTemplate::~SequenceTemplate()
 {
-	for(PostProcessorArray::iterator i=postprocessors.begin(); i!=postprocessors.end(); ++i)
-		delete i->postprocessor_template;
-}
-
-Resources &SequenceTemplate::get_resources() const
-{
-	if(!resources)	
-		throw logic_error("no resources");
-	return *resources;
+	for(const PostProcessor &p: postprocessors)
+		delete p.postprocessor_template;
 }
 
 
@@ -53,10 +38,6 @@ SequenceTemplate::PostProcessorRegistry &SequenceTemplate::get_postprocessor_reg
 }
 
 
-SequenceTemplate::Step::~Step()
-{ }
-
-
 SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt):
 	postprocessor_template(ppt)
 { }
@@ -73,6 +54,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);
@@ -81,8 +63,6 @@ SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
 
 	// Deprecated
 	add("pass", &Loader::step_with_slot);
-
-	obj.resources = &c;
 }
 
 void SequenceTemplate::Loader::postprocessor_loaded()
@@ -90,6 +70,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;
@@ -122,88 +109,76 @@ void SequenceTemplate::Loader::step_with_slot(const string &tag, const string &r
 	Step stp;
 	stp.tag = tag;
 	stp.slot_name = rend;
-	if(coll)
-		load_sub(stp, *coll);
-	else
-		load_sub(stp);
+	Step::Loader ldr(stp, *coll);
+	ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
+	load_sub_with(ldr);
 
 	obj.steps.push_back(stp);
 }
 
 
-SequenceTemplate::Step::Loader::Loader(Step &p):
-	DataFile::CollectionObjectLoader<Step>(p, 0)
+SequenceTemplate::ClearLoader::ClearLoader(SequenceTemplate &t):
+	ObjectLoader<SequenceTemplate>(t)
 {
-	init();
+	add("color", &ClearLoader::color);
+	add("depth", &ClearLoader::depth);
+	add("stencil", &ClearLoader::stencil);
 }
 
-SequenceTemplate::Step::Loader::Loader(Step &p, Collection &c):
-	DataFile::CollectionObjectLoader<Step>(p, &c)
+void SequenceTemplate::ClearLoader::color(float r, float g, float b, float a)
 {
-	init();
+	obj.clear_colors.push_back(Color(r, g, b, a));
 }
 
-void SequenceTemplate::Step::Loader::init()
+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, Collection &c):
+	DataFile::CollectionObjectLoader<Step>(p, &c)
 {
-	add("blend", &Loader::blend);
-	add("blend", &Loader::blend_predefined);
 	add("depth_test", &Loader::depth_test);
-	add("depth_test", &Loader::depth_test_predefined);
+	add("depth_test", &Loader::depth_compare);
 	add("lighting", &Loader::lighting);
 	add("lighting", &Loader::lighting_inline);
 	add("object", &Loader::object);
 	add("scene", &Loader::scene);
+	add("stencil_test", &Loader::stencil_test);
 }
 
-void SequenceTemplate::Step::Loader::blend_predefined(const string &name)
+void SequenceTemplate::Step::Loader::set_inline_base_name(const string &n)
 {
-	const Blend *bln = 0;
-	if(name=="alpha")
-		bln = &Blend::alpha();
-	else if(name=="additive")
-		bln = &Blend::additive();
-	else if(name=="additive_alpha")
-		bln = &Blend::additive_alpha();
-	else
-		throw key_error(name);
-
-	obj.blend = bln;
-	obj.blend.keep();
-}
-
-void SequenceTemplate::Step::Loader::blend(BlendFactor src, BlendFactor dest)
-{
-	obj.blend = new Blend(src, dest);
+	inline_base_name = n;
 }
 
-void SequenceTemplate::Step::Loader::depth_test_predefined(const string &name)
+void SequenceTemplate::Step::Loader::depth_test()
 {
-	const DepthTest *dtest = 0;
-	if(name=="lequal")
-		dtest = &DepthTest::lequal();
-	else
-		throw key_error(name);
-
-	obj.depth_test = dtest;
-	obj.depth_test.keep();
+	load_sub(obj.depth_test);
 }
 
-void SequenceTemplate::Step::Loader::depth_test(Predicate pred)
+void SequenceTemplate::Step::Loader::depth_compare(Predicate c)
 {
-	obj.depth_test = new DepthTest(pred);
+	obj.depth_test = DepthTest(c);
 }
 
 void SequenceTemplate::Step::Loader::lighting_inline()
 {
 	RefPtr<Lighting> lightn = new Lighting;
-	load_sub(*lightn);
-	obj.lighting = lightn;
+	load_sub(*lightn, get_collection());
+	get_collection().add(inline_base_name+".lightn", lightn.get());
+	obj.lighting = lightn.release();
 }
 
 void SequenceTemplate::Step::Loader::lighting(const string &name)
 {
 	obj.lighting = &get_collection().get<Lighting>(name);
-	obj.lighting.keep();
 }
 
 void SequenceTemplate::Step::Loader::object(const string &name)
@@ -216,5 +191,10 @@ void SequenceTemplate::Step::Loader::scene(const string &name)
 	obj.default_renderable = &get_collection().get<Scene>(name);
 }
 
+void SequenceTemplate::Step::Loader::stencil_test()
+{
+	load_sub(obj.stencil_test);
+}
+
 } // namespace GL
 } // namespace Msp