From 0347895c96a787679f3d1d54b201ca5df5b60448 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 9 Dec 2005 20:03:04 +0000 Subject: [PATCH] Fixed typo in comments and onscreen help. --- include/osgGA/DriveManipulator | 2 +- include/osgGA/FlightManipulator | 2 +- include/osgGA/NodeTrackerManipulator | 2 +- include/osgGA/TerrainManipulator | 2 +- include/osgGA/TrackballManipulator | 2 +- src/osgGA/NodeTrackerManipulator.cpp | 2 +- src/osgGA/TerrainManipulator.cpp | 2 +- src/osgGA/TrackballManipulator.cpp | 2 +- src/osgProducer/ViewerEventHandler.cpp | 4 +--- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/osgGA/DriveManipulator b/include/osgGA/DriveManipulator index 2f71206c1..22ddcd887 100644 --- a/include/osgGA/DriveManipulator +++ b/include/osgGA/DriveManipulator @@ -88,7 +88,7 @@ class OSGGA_EXPORT DriveManipulator : public MatrixManipulator Return true is camera has moved and a redraw is required.*/ bool calcMovement(); - // Internal event stack comprising last three mouse events. + // Internal event stack comprising last two mouse events. osg::ref_ptr _ga_t1; osg::ref_ptr _ga_t0; diff --git a/include/osgGA/FlightManipulator b/include/osgGA/FlightManipulator index 836e63297..8686c6f92 100644 --- a/include/osgGA/FlightManipulator +++ b/include/osgGA/FlightManipulator @@ -95,7 +95,7 @@ class OSGGA_EXPORT FlightManipulator : public MatrixManipulator bool calcMovement(); - // Internal event stack comprising last three mouse events. + // Internal event stack comprising last two mouse events. osg::ref_ptr _ga_t1; osg::ref_ptr _ga_t0; diff --git a/include/osgGA/NodeTrackerManipulator b/include/osgGA/NodeTrackerManipulator index f789e47b4..9049095c8 100644 --- a/include/osgGA/NodeTrackerManipulator +++ b/include/osgGA/NodeTrackerManipulator @@ -164,7 +164,7 @@ class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator void clampOrientation(); - // Internal event stack comprising last three mouse events. + // Internal event stack comprising last two mouse events. osg::ref_ptr _ga_t1; osg::ref_ptr _ga_t0; diff --git a/include/osgGA/TerrainManipulator b/include/osgGA/TerrainManipulator index 4c126fa0c..b103f645f 100644 --- a/include/osgGA/TerrainManipulator +++ b/include/osgGA/TerrainManipulator @@ -108,7 +108,7 @@ class OSGGA_EXPORT TerrainManipulator : public MatrixManipulator void clampOrientation(); - // Internal event stack comprising last three mouse events. + // Internal event stack comprising last two mouse events. osg::ref_ptr _ga_t1; osg::ref_ptr _ga_t0; diff --git a/include/osgGA/TrackballManipulator b/include/osgGA/TrackballManipulator index baedeefb3..deb518dfe 100644 --- a/include/osgGA/TrackballManipulator +++ b/include/osgGA/TrackballManipulator @@ -124,7 +124,7 @@ class OSGGA_EXPORT TrackballManipulator : public MatrixManipulator If speed is below a threshold then return false, otherwise return true.*/ bool isMouseMoving(); - // Internal event stack comprising last three mouse events. + // Internal event stack comprising last two mouse events. osg::ref_ptr _ga_t1; osg::ref_ptr _ga_t0; diff --git a/src/osgGA/NodeTrackerManipulator.cpp b/src/osgGA/NodeTrackerManipulator.cpp index d7c3e5a7b..15a14dcd9 100644 --- a/src/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgGA/NodeTrackerManipulator.cpp @@ -154,7 +154,7 @@ void NodeTrackerManipulator::getUsage(osg::ApplicationUsage& usage) const { usage.addKeyboardMouseBinding("NodeTracker: Space","Reset the viewing position to home"); usage.addKeyboardMouseBinding("NodeTracker: +","When in stereo, increase the fusion distance"); - usage.addKeyboardMouseBinding("NodeTracker: -","When in stereo, reduse the fusion distance"); + usage.addKeyboardMouseBinding("NodeTracker: -","When in stereo, reduce the fusion distance"); } bool NodeTrackerManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us) diff --git a/src/osgGA/TerrainManipulator.cpp b/src/osgGA/TerrainManipulator.cpp index e0f49c795..227d3e6d8 100644 --- a/src/osgGA/TerrainManipulator.cpp +++ b/src/osgGA/TerrainManipulator.cpp @@ -91,7 +91,7 @@ void TerrainManipulator::getUsage(osg::ApplicationUsage& usage) const { usage.addKeyboardMouseBinding("Terrain: Space","Reset the viewing position to home"); usage.addKeyboardMouseBinding("Terrain: +","When in stereo, increase the fusion distance"); - usage.addKeyboardMouseBinding("Terrain: -","When in stereo, reduse the fusion distance"); + usage.addKeyboardMouseBinding("Terrain: -","When in stereo, reduce the fusion distance"); } bool TerrainManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us) diff --git a/src/osgGA/TrackballManipulator.cpp b/src/osgGA/TrackballManipulator.cpp index db8f4c84d..7910797bb 100644 --- a/src/osgGA/TrackballManipulator.cpp +++ b/src/osgGA/TrackballManipulator.cpp @@ -69,7 +69,7 @@ void TrackballManipulator::getUsage(osg::ApplicationUsage& usage) const { usage.addKeyboardMouseBinding("Trackball: Space","Reset the viewing position to home"); usage.addKeyboardMouseBinding("Trackball: +","When in stereo, increase the fusion distance"); - usage.addKeyboardMouseBinding("Trackball: -","When in stereo, reduse the fusion distance"); + usage.addKeyboardMouseBinding("Trackball: -","When in stereo, reduce the fusion distance"); } bool TrackballManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us) diff --git a/src/osgProducer/ViewerEventHandler.cpp b/src/osgProducer/ViewerEventHandler.cpp index 29a0f104e..10cec73e2 100644 --- a/src/osgProducer/ViewerEventHandler.cpp +++ b/src/osgProducer/ViewerEventHandler.cpp @@ -1194,7 +1194,5 @@ void ViewerEventHandler::getUsage(osg::ApplicationUsage& usage) const usage.addKeyboardMouseBinding("s","Toggle instrumention"); usage.addKeyboardMouseBinding("v","Toggle block and vsync"); usage.addKeyboardMouseBinding("z","Start recording camera path."); - usage.addKeyboardMouseBinding("Z","If recording camera path stop recording camera path, save to \"saved_animation.path\"\nThen start viewing from being on animation path"); -// usage.addKeyboardMouseBinding("+","When in stereo, increase the fusion distance"); -// usage.addKeyboardMouseBinding("-","When in stereo, reduse the fusion distance"); + usage.addKeyboardMouseBinding("Z","If recording camera path stop recording camera path, save to \"saved_animation.path\"\nThen restart camera from beginning on animation path"); }