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

merge function partial implementation in projectm toplevel.

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1233 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2009-07-10 04:19:14 +00:00
parent 3c6ccccd46
commit ea33adbdc8
11 changed files with 118 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libprojectM/PresetMerge.cpp
View File

@ -1,21 +1,25 @@
#include "PresetMerge.hpp"
#include "RenderItemMatcher.hpp"
#include "RenderItemMergeFunction.hpp"
void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipeline & out, RenderItemMatcher & matcher, float ratio)
void PipelineMerger::MergePipelines(const Pipeline & a, const Pipeline & b, Pipeline & out, const RenderItemMatchList & matching, RenderItemMergeFunction & mergeFunction, float ratio)
{
double invratio = 1.0 - ratio;
out.textureWrap = (ratio < 0.5) ? a.textureWrap : b.textureWrap;
out.screenDecay =lerp( b.screenDecay, a.screenDecay, ratio);
out.screenDecay = lerp( b.screenDecay, a.screenDecay, ratio);
out.drawables.clear();
for (RenderItemMatchList::const_iterator pos = matching.begin(); pos != matching.end(); ++pos) {
RenderItemMatcher::MatchResults results = matcher(a.drawables, b.drawables);
for (int i = 0; i < a.drawables.size();i++)
for (int j = 0; j < b.drawables.size();j++)
std::cerr << "[" << i << "][" << j << "]" << matcher.weight(i,j) << std::endl;
const RenderItem * itemA = pos->first;
const RenderItem * itemB = pos->second;
//mergeFunction(itemA, itemB, out, ratio);
}
for (std::vector<RenderItem*>::const_iterator pos = a.drawables.begin();
pos != a.drawables.end(); ++pos)