X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.cpp;h=3ad973139010ae60b6e5cc5d602a9a0e1aca8aef;hp=bfab28042a9d596e6c0194ba94602b919b9220d5;hb=3ac3a51c623271da815c8ee60c484445871753bf;hpb=dff7004fa078d55911664c0f513b5dc6c9449420

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index bfab2804..3ad97313 100644
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -5,7 +5,9 @@
 #include "bloom.h"
 #include "colorcurve.h"
 #include "lighting.h"
+#include "object.h"
 #include "resources.h"
+#include "scene.h"
 #include "sequencetemplate.h"
 #include "tests.h"
 
@@ -15,7 +17,6 @@ namespace Msp {
 namespace GL {
 
 SequenceTemplate::SequenceTemplate():
-	resources(0),
 	hdr(false),
 	alpha(false),
 	required_multisample(0),
@@ -28,13 +29,6 @@ SequenceTemplate::~SequenceTemplate()
 		delete i->postprocessor_template;
 }
 
-Resources &SequenceTemplate::get_resources() const
-{
-	if(!resources)	
-		throw logic_error("no resources");
-	return *resources;
-}
-
 
 SequenceTemplate::PostProcessorRegistry &SequenceTemplate::get_postprocessor_registry()
 {
@@ -75,11 +69,10 @@ SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
 	add("multisample", &Loader::multisample_range);
 	add("postprocessor", &Loader::postprocessor);
 	add("step", &Loader::step);
+	add("step", &Loader::step_with_slot);
 
 	// Deprecated
-	add("pass", &Loader::step);
-
-	obj.resources = &c;
+	add("pass", &Loader::step_with_slot);
 }
 
 void SequenceTemplate::Loader::postprocessor_loaded()
@@ -109,13 +102,22 @@ void SequenceTemplate::Loader::postprocessor(const string &slot)
 	obj.postprocessors.push_back(pp);
 }
 
-void SequenceTemplate::Loader::step(const string &tag, const string &rend)
+void SequenceTemplate::Loader::step(const string &tag)
+{
+	step_with_slot(tag, string());
+}
+
+void SequenceTemplate::Loader::step_with_slot(const string &tag, const string &rend)
 {
 	Step stp;
 	stp.tag = tag;
-	stp.renderable_name = rend;
+	stp.slot_name = rend;
 	if(coll)
-		load_sub(stp, *coll);
+	{
+		Step::Loader ldr(stp, *coll);
+		ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
+		load_sub_with(ldr);
+	}
 	else
 		load_sub(stp);
 
@@ -143,6 +145,13 @@ void SequenceTemplate::Step::Loader::init()
 	add("depth_test", &Loader::depth_test_predefined);
 	add("lighting", &Loader::lighting);
 	add("lighting", &Loader::lighting_inline);
+	add("object", &Loader::object);
+	add("scene", &Loader::scene);
+}
+
+void SequenceTemplate::Step::Loader::set_inline_base_name(const string &n)
+{
+	inline_base_name = n;
 }
 
 void SequenceTemplate::Step::Loader::blend_predefined(const string &name)
@@ -187,19 +196,24 @@ void SequenceTemplate::Step::Loader::lighting_inline()
 {
 	RefPtr<Lighting> lightn = new Lighting;
 	load_sub(*lightn);
-	obj.lighting = lightn;
+	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::scene(const string &name)
+void SequenceTemplate::Step::Loader::object(const string &name)
 {
-	obj.default_renderable = get_collection().get<Scene>(name);
-}*/
+	obj.default_renderable = &get_collection().get<GL::Object>(name);
+}
+
+void SequenceTemplate::Step::Loader::scene(const string &name)
+{
+	obj.default_renderable = &get_collection().get<Scene>(name);
+}
 
 } // namespace GL
 } // namespace Msp