From 825882be193ce528fa4a0ad04d2acee0a59ae567 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 7 Jun 2015 11:13:08 +0000 Subject: [PATCH] Fixed setReferenceTime() bug where a * eather than the correct / was being used. Bug and fix suggested Benjamin Richter. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14897 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgViewer/CompositeViewer.cpp | 2 +- src/osgViewer/Viewer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index 7017a1af2..0cae8d69e 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -362,7 +362,7 @@ void CompositeViewer::setReferenceTime(double time) { osg::Timer_t tick = osg::Timer::instance()->tick(); double currentTime = osg::Timer::instance()->delta_s(_startTick, tick); - double delta_ticks = (time-currentTime)*(osg::Timer::instance()->getSecondsPerTick()); + double delta_ticks = (time-currentTime)/(osg::Timer::instance()->getSecondsPerTick()); if (delta_ticks>=0) tick += osg::Timer_t(delta_ticks); else tick -= osg::Timer_t(-delta_ticks); diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index b6a12ec9b..44620bb39 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -435,7 +435,7 @@ void Viewer::setReferenceTime(double time) { osg::Timer_t tick = osg::Timer::instance()->tick(); double currentTime = osg::Timer::instance()->delta_s(_startTick, tick); - double delta_ticks = (time-currentTime)*(osg::Timer::instance()->getSecondsPerTick()); + double delta_ticks = (time-currentTime)/(osg::Timer::instance()->getSecondsPerTick()); if (delta_ticks>=0) tick += osg::Timer_t(delta_ticks); else tick -= osg::Timer_t(-delta_ticks);