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

Fixes for Windows build.

Browse Source
This commit is contained in:
Robert Osfield
2003-12-05 13:58:27 +00:00
parent 73c5896432
commit 8794f1bb76
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgSim/DOFTransform.cpp
View File

@@ -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

10
src/osgSim/MultiSwitch.cpp
View File

@@ -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;