From 58e759619c06544f302ce6a84d5e467d2bf69761 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 24 Apr 2006 21:48:23 +0000 Subject: [PATCH] Moved LessFunctor into header. --- include/osgParticle/PrecipitationEffect | 11 ++++++++++- src/osgParticle/PrecipitationEffect.cpp | 7 ------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/osgParticle/PrecipitationEffect b/include/osgParticle/PrecipitationEffect index cbd27f419..ea890234c 100644 --- a/include/osgParticle/PrecipitationEffect +++ b/include/osgParticle/PrecipitationEffect @@ -43,7 +43,7 @@ namespace osgParticle /** Set all the parameters to create an rain effect of specified intensity.*/ void rain(float intensity); - /** Set all the parameters to create an rain effect of specified intensity.*/ + /** Set all the parameters to create an snow effect of specified intensity.*/ void snow(float intensity); @@ -154,6 +154,15 @@ namespace osgParticle typedef std::map< Cell, DepthMatrixStartTime > CellMatrixMap; + struct LessFunctor + { + inline bool operator () (const CellMatrixMap::value_type* lhs,const CellMatrixMap::value_type* rhs) const + { + return (*lhs).second<(*rhs).second; + } + }; + + CellMatrixMap& getCurrentCellMatrixMap() { return _currentCellMatrixMap; } CellMatrixMap& getPreviousCellMatrixMap() { return _previousCellMatrixMap; } diff --git a/src/osgParticle/PrecipitationEffect.cpp b/src/osgParticle/PrecipitationEffect.cpp index adffaa4c1..9e9c4846b 100644 --- a/src/osgParticle/PrecipitationEffect.cpp +++ b/src/osgParticle/PrecipitationEffect.cpp @@ -849,13 +849,6 @@ PrecipitationEffect::PrecipitationDrawable::PrecipitationDrawable(const Precipit } -struct LessFunctor -{ - bool operator () (const PrecipitationEffect::PrecipitationDrawable::CellMatrixMap::value_type* lhs,const PrecipitationEffect::PrecipitationDrawable::CellMatrixMap::value_type* rhs) const - { - return (*lhs).second<(*rhs).second; - } -}; void PrecipitationEffect::PrecipitationDrawable::drawImplementation(osg::State& state) const {