From 8794f1bb76dff616c8180a3c516544673da7d033 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 5 Dec 2003 13:58:27 +0000 Subject: [PATCH] Fixes for Windows build. --- src/osgSim/DOFTransform.cpp | 2 +- src/osgSim/MultiSwitch.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osgSim/DOFTransform.cpp b/src/osgSim/DOFTransform.cpp index c593686a3..90ec37216 100644 --- a/src/osgSim/DOFTransform.cpp +++ b/src/osgSim/DOFTransform.cpp @@ -28,7 +28,7 @@ void DOFTransform::traverse(osg::NodeVisitor& nv) { animate(); } - osg::Transform::traverse(nv); + Transform::traverse(nv); } bool DOFTransform::computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor*) const diff --git a/src/osgSim/MultiSwitch.cpp b/src/osgSim/MultiSwitch.cpp index 37da1453d..9ec03b0b1 100644 --- a/src/osgSim/MultiSwitch.cpp +++ b/src/osgSim/MultiSwitch.cpp @@ -48,7 +48,7 @@ void MultiSwitch::traverse(osg::NodeVisitor& nv) } } -bool MultiSwitch::addChild( Node *child) +bool MultiSwitch::addChild( osg::Node *child) { unsigned int childPosition = _children.size(); if (Group::addChild(child)) @@ -69,7 +69,7 @@ bool MultiSwitch::addChild( Node *child) return false; } -bool MultiSwitch::insertChild( unsigned int index, Node *child) +bool MultiSwitch::insertChild( unsigned int index, osg::Node *child) { if (Group::insertChild(index,child)) { @@ -94,7 +94,7 @@ bool MultiSwitch::insertChild( unsigned int index, Node *child) return false; } -bool MultiSwitch::removeChild( Node *child ) +bool MultiSwitch::removeChild( osg::Node *child ) { // find the child's position. unsigned int pos=getChildIndex(child); @@ -120,7 +120,7 @@ void MultiSwitch::setValue(unsigned int switchSet, unsigned int pos,bool value) values[pos]=value; } -void MultiSwitch::setChildValue(const Node* child,unsigned int switchSet, bool value) +void MultiSwitch::setChildValue(const osg::Node* child,unsigned int switchSet, bool value) { expandToEncompassSwitchSet(switchSet); @@ -142,7 +142,7 @@ bool MultiSwitch::getValue(unsigned int switchSet, unsigned int pos) const return values[pos]; } -bool MultiSwitch::getChildValue(const Node* child, unsigned int switchSet) const +bool MultiSwitch::getChildValue(const osg::Node* child, unsigned int switchSet) const { if (switchSet>=_values.size()) return false;