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

Fixes shadows warnings

Browse Source
This commit is contained in:
Robert Osfield
2016-05-20 13:38:34 +01:00
parent e900ecc4c7
commit ae3ba28fee
6 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgParticle/ConnectedParticleSystem.cpp
View File

@@ -147,8 +147,7 @@ void ConnectedParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) co
const Particle* nextParticle = (particle->getNextParticle() != Particle::INVALID_INDEX) ? &_particles[particle->getNextParticle()] : 0;
if (nextParticle)
{
const osg::Vec3& nextPos = nextParticle->getPosition();
osg::Vec3 startDelta = nextPos-pos;
osg::Vec3 startDelta = nextParticle->getPosition()-pos;
startDelta.normalize();
float distance2 = 0.0;
@@ -158,8 +157,7 @@ void ConnectedParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) co
++i)
{
nextParticle = &_particles[nextParticle->getNextParticle()];
const osg::Vec3& nextPos = nextParticle->getPosition();
osg::Vec3 delta = nextPos-pos;
osg::Vec3 delta = nextParticle->getPosition()-pos;
distance2 = (delta^startDelta).length2();
}
}
@@ -187,8 +185,8 @@ void ConnectedParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) co
if (nextParticle)
{
const osg::Vec3& nextPos = nextParticle->getPosition();
osg::Vec3 startDelta = nextPos-pos;
osg::Vec3 startDelta = nextParticle->getPosition()-pos;
delta = startDelta;
startDelta.normalize();
float distance2 = 0.0;
@@ -198,12 +196,10 @@ void ConnectedParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) co
++i)
{
nextParticle = &_particles[nextParticle->getNextParticle()];
const osg::Vec3& nextPos = nextParticle->getPosition();
delta = nextPos-pos;
delta = nextParticle->getPosition()-pos;
distance2 = (delta^startDelta).length2();
}
delta = nextPos-pos;
}
osg::Vec3 normal( delta ^ (pos-eyeLocal));