From c63285753b51215c030b226d66f9662287713f01 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 14 Apr 2021 18:25:03 +0300 Subject: [PATCH] Rename SequenceTemplate::Pass::renderable_name to slot_name --- source/builders/sequencebuilder.cpp | 4 ++-- source/builders/sequencetemplate.cpp | 2 +- source/builders/sequencetemplate.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp index 0f2a1b54..3abfca81 100644 --- a/source/builders/sequencebuilder.cpp +++ b/source/builders/sequencebuilder.cpp @@ -16,7 +16,7 @@ SequenceBuilder::SequenceBuilder(const SequenceTemplate &t): { const vector &steps = tmpl.get_steps(); for(vector::const_iterator i=steps.begin(); i!=steps.end(); ++i) - renderables[i->renderable_name] = 0; + renderables[i->slot_name] = 0; const vector &postprocs = tmpl.get_postprocessors(); for(SequenceTemplate::PostProcessorArray::const_iterator i=postprocs.begin(); i!=postprocs.end(); ++i) if(!i->slot_name.empty()) @@ -46,7 +46,7 @@ void SequenceBuilder::build(Sequence &sequence) const const vector &steps = tmpl.get_steps(); for(vector::const_iterator i=steps.begin(); i!=steps.end(); ++i) { - Renderable *renderable = get_item(renderables, i->renderable_name); + Renderable *renderable = get_item(renderables, i->slot_name); if(!renderable) continue; diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp index bfab2804..46ffec70 100644 --- a/source/builders/sequencetemplate.cpp +++ b/source/builders/sequencetemplate.cpp @@ -113,7 +113,7 @@ void SequenceTemplate::Loader::step(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); else diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h index 5c5b04b5..12ccd91d 100644 --- a/source/builders/sequencetemplate.h +++ b/source/builders/sequencetemplate.h @@ -82,7 +82,7 @@ public: RefPtr lighting; RefPtr depth_test; RefPtr blend; - std::string renderable_name; + std::string slot_name; //Renderable *default_renderable; ~Step(); -- 2.45.2