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

replaced "if (apm || !apm->valid())"

Browse Source
This commit is contained in:
Laurens Voerman 2019-05-21 13:28:41 +02:00
parent a9590ab80b
commit 6a8f4ad818
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/osgviewer/osgviewer.cpp
View File

@ -112,7 +112,7 @@ int main(int argc, char** argv)
while (arguments.read("-p",pathfile)) while (arguments.read("-p",pathfile))
{ {
osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile); osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
if (apm || !apm->valid()) if (apm && !apm->getAnimationPath()->empty())
{ {
apm->setTimeScale(animationSpeed); apm->setTimeScale(animationSpeed);

2
applications/present3D/present3D.cpp
View File

@ -484,7 +484,7 @@ int main( int argc, char **argv )
while (arguments.read("-p",pathfile)) while (arguments.read("-p",pathfile))
{ {
osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile); osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
if (apm || !apm->valid()) if (apm && !apm->getAnimationPath()->empty())
{ {
unsigned int num = keyswitchManipulator->getNumMatrixManipulators(); unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm ); keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );

2
examples/osgCMakeExample/main.cpp
View File

@ -113,7 +113,7 @@ int main(int argc, char** argv)
while (arguments.read("-p",pathfile)) while (arguments.read("-p",pathfile))
{ {
osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile); osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
if (apm || !apm->valid()) if (apm && !apm->getAnimationPath()->empty())
{ {
apm->setTimeScale(animationSpeed); apm->setTimeScale(animationSpeed);

2
examples/osgCMakeExampleModern/main.cpp
View File

@ -113,7 +113,7 @@ int main(int argc, char** argv)
while (arguments.read("-p",pathfile)) while (arguments.read("-p",pathfile))
{ {
osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile); osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
if (apm || !apm->valid()) if (apm && !apm->getAnimationPath()->empty())
{ {
apm->setTimeScale(animationSpeed); apm->setTimeScale(animationSpeed);