FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Sukender, "I replaced std::min() with osg::minimum() in RandomRateCounter, to avoid including the STL header (Or else it doesn't compile under MSVC 10)."

Browse Source
This commit is contained in:
Robert Osfield
2010-11-04 11:39:47 +00:00
parent bb723e14fa
commit 8f1284d8bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgParticle/RandomRateCounter
View File

@@ -54,7 +54,7 @@ namespace osgParticle
inline int RandomRateCounter::numParticlesToCreate(double dt) const
{
// compute the number of new particles, clamping it to 1 second of particles at the maximum rate
float numNewParticles = std::min(static_cast<float>(dt * getRateRange().get_random()), getRateRange().maximum);
float numNewParticles = osg::minimum(static_cast<float>(dt * getRateRange().get_random()), getRateRange().maximum);
// add the number of new particles to value carried over from the previous call
_np += numNewParticles;