diff --git a/include/osgProducer/Viewer b/include/osgProducer/Viewer index e0f3b0470..45ebe982f 100644 --- a/include/osgProducer/Viewer +++ b/include/osgProducer/Viewer @@ -223,13 +223,13 @@ class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIAction const osgGA::EventVisitor* getEventVisitor() const { return _eventVisitor.get(); } - void computeActiveCoordindateSystemNodePath(); + void computeActiveCoordinateSystemNodePath(); - void setCoordindateSystemNodePath(const osg::RefNodePath& nodePath) { _coordinateSystemNodePath = nodePath; } + void setCoordinateSystemNodePath(const osg::RefNodePath& nodePath) { _coordinateSystemNodePath = nodePath; } - void setCoordindateSystemNodePath(const osg::NodePath& nodePath); + void setCoordinateSystemNodePath(const osg::NodePath& nodePath); - const osg::RefNodePath& getCoordindateSystemNodePath() const { return _coordinateSystemNodePath; } + const osg::RefNodePath& getCoordinateSystemNodePath() const { return _coordinateSystemNodePath; } /** Dispatch the cull and draw for each of the Camera's for this frame.*/ virtual void frame(); diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp index fe0f1d8cd..37d14963f 100644 --- a/src/osgProducer/Viewer.cpp +++ b/src/osgProducer/Viewer.cpp @@ -218,7 +218,7 @@ public: osg::notify(osg::INFO)<<"getCoordinateFrame("<getCoordindateSystemNodePath(); + osg::NodePath tmpPath = _viewer->getCoordinateSystemNodePath(); if (!tmpPath.empty()) { @@ -423,7 +423,7 @@ const std::string& Viewer::getWriteImageFileName() const } -void Viewer::setCoordindateSystemNodePath(const osg::NodePath& nodePath) +void Viewer::setCoordinateSystemNodePath(const osg::NodePath& nodePath) { _coordinateSystemNodePath.clear(); std::copy(nodePath.begin(), @@ -431,7 +431,7 @@ void Viewer::setCoordindateSystemNodePath(const osg::NodePath& nodePath) std::back_inserter(_coordinateSystemNodePath)); } -void Viewer::computeActiveCoordindateSystemNodePath() +void Viewer::computeActiveCoordinateSystemNodePath() { // now search for CoordinateSystemNode's for which we want to track. osg::Node* subgraph = getTopMostSceneData(); @@ -443,12 +443,12 @@ void Viewer::computeActiveCoordindateSystemNodePath() if (!ccsnv._pathToCoordinateSystemNode.empty()) { - setCoordindateSystemNodePath(ccsnv._pathToCoordinateSystemNode); + setCoordinateSystemNodePath(ccsnv._pathToCoordinateSystemNode); return; } } // otherwise no node path found so reset to empty. - setCoordindateSystemNodePath(osg::NodePath()); + setCoordinateSystemNodePath(osg::NodePath()); } void Viewer::updatedSceneData() @@ -456,7 +456,7 @@ void Viewer::updatedSceneData() OsgCameraGroup::updatedSceneData(); // refresh the coordinate system node path. - computeActiveCoordindateSystemNodePath(); + computeActiveCoordinateSystemNodePath(); // refresh the camera manipulators if (_keyswitchManipulator.valid()) _keyswitchManipulator->setNode(getTopMostSceneData()); diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp index 795fdccf1..82aa63d5e 100644 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ b/src/osgWrappers/osgProducer/Viewer.cpp @@ -84,10 +84,10 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) I_Method1(void, setEventVisitor, IN, osgGA::EventVisitor *, nv); I_Method0(osgGA::EventVisitor *, getEventVisitor); I_Method0(const osgGA::EventVisitor *, getEventVisitor); - I_Method0(void, computeActiveCoordindateSystemNodePath); - I_Method1(void, setCoordindateSystemNodePath, IN, const osg::RefNodePath &, nodePath); - I_Method1(void, setCoordindateSystemNodePath, IN, const osg::NodePath &, nodePath); - I_Method0(const osg::RefNodePath &, getCoordindateSystemNodePath); + I_Method0(void, computeActiveCoordinateSystemNodePath); + I_Method1(void, setCoordinateSystemNodePath, IN, const osg::RefNodePath &, nodePath); + I_Method1(void, setCoordinateSystemNodePath, IN, const osg::NodePath &, nodePath); + I_Method0(const osg::RefNodePath &, getCoordinateSystemNodePath); I_Method0(void, frame); I_Method0(void, requestRedraw); I_Method1(void, requestContinuousUpdate, IN, bool, x); @@ -124,7 +124,7 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); I_Method0(void, updatedSceneData); I_Property(osg::AnimationPath *, AnimationPath); - I_Property(const osg::RefNodePath &, CoordindateSystemNodePath); + I_Property(const osg::RefNodePath &, CoordinateSystemNodePath); I_Property(bool, Done); I_Property(double, DoneAtElapsedTime); I_Property(bool, DoneAtElapsedTimeEnabled);