mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-12 12:55:46 +00:00
Code Issues Projects Releases Wiki Activity

commented out the experimental and therefore buggy merge code.

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1245 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2009-07-11 13:39:00 +00:00
parent 0a04de344c
commit f4c8a4ee10
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libprojectM/PresetMerge.cpp
View File

@ -11,8 +11,23 @@ void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipe
out.screenDecay = lerp( b.screenDecay, a.screenDecay, ratio);
out.drawables.clear();
for (std::vector<RenderItem*>::const_iterator pos = a.drawables.begin();
pos != a.drawables.end(); ++pos)
{
(*pos)->masterAlpha = invratio;
out.drawables.push_back(*pos);
}
for (std::vector<RenderItem*>::const_iterator pos = b.drawables.begin();
pos != b.drawables.end();++pos)
{
(*pos)->masterAlpha = ratio;
out.drawables.push_back(*pos);
}
/*
for (RenderItemMatchList::iterator pos = results.matches.begin(); pos != results.matches.end(); ++pos) {
RenderItem * itemA = pos->first;
@ -29,6 +44,7 @@ void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipe
out.drawables.push_back(itemC);
}
for (std::vector<RenderItem*>::const_iterator pos = results.unmatchedLeft.begin();
pos != results.unmatchedLeft.end(); ++pos)
@ -43,6 +59,7 @@ void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipe
(*pos)->masterAlpha = ratio;
out.drawables.push_back(*pos);
}
*/
if (a.staticPerPixel && b.staticPerPixel)
{