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

added shape distance to master metric

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1221 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2009-03-01 18:46:38 +00:00
parent 0d94a07306
commit 0f44b60d07
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libprojectM/Renderer/RenderItemDistanceMetric.hpp
View File

@ -44,9 +44,10 @@ inline virtual double operator()(const RenderItem * r1, const RenderItem * r2)
return NOT_COMPARABLE_VALUE;
}
// Returns true if and only if r1 and r2 are of type R1 and R2 respectively.
// Returns true if and only if r1 and r2 are the same type as or derived from R1, R2 respectively
inline bool supported(const RenderItem * r1, const RenderItem * r2) const {
return typeid(r1) == typeid(const R1 *) && typeid(r2) == typeid(const R2 *);
return dynamic_cast<const R1*>(r1) && dynamic_cast<const R2*>(r2);
//return typeid(r1) == typeid(const R1 *) && typeid(r2) == typeid(const R2 *);
}
inline TypeIdPair typeIdPair() const {
@ -109,24 +110,29 @@ protected:
RenderItemDistanceMetric * metric;
TypeIdPair pair(typeid(lhs), typeid(rhs));
// If specialized metric exists, use it to get higher granularity
// of correctness
if (_distanceMetricMap.count(pair)) {
metric = _distanceMetricMap[pair];
} else if (_distanceMetricMap.count(pair = TypeIdPair(typeid(rhs), typeid(lhs)))) {
metric = _distanceMetricMap[pair];
} else {
metric = 0;
} else { // Failing that, use rtti && shape distance if its a shape type
/// @bug This is a non elegant approach to supporting shape distance
const double rttiError = _rttiDistance(lhs,rhs);
if (rttiError == 0 && _shapeXYDistance.supported(lhs,rhs))
return _shapeXYDistance(lhs, rhs);
else return rttiError;
}
// If specialized metric exists, use it to get higher granularity
// of correctness
if (metric)
return (*metric)(lhs, rhs);
else // Failing that, use rtti and return 0 if they match, max value otherwise
return _rttiDistance(lhs,rhs);
return (*metric)(lhs, rhs);
}
private:
mutable RTIRenderItemDistance _rttiDistance;
mutable ShapeXYDistance _shapeXYDistance;
mutable DistanceMetricMap _distanceMetricMap;
};

1
src/libprojectM/Renderer/RenderItemMatcher.hpp
View File

@ -63,6 +63,7 @@ private:
/// @idea interface this entirely allow overriding of its type.
mutable MasterRenderItemDistance _distanceFunction;
double computeMatching(const RenderItemList & lhs, const RenderItemList & rhs) const;