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

Fixes for Win32 build.

Browse Source
This commit is contained in:
Robert Osfield 2002-10-04 16:40:45 +00:00
parent 4a3cc5c182
commit 84332f5b77
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osg/Switch.cpp
View File

@ -62,8 +62,7 @@ bool Switch::removeChild( Node *child )
_values.erase(_values.begin()+pos);
return Group::removeChild(child);
return Group::removeChild(child);
}
void Switch::setValue(unsigned int pos,bool value)

2
src/osgPlugins/flt/flt2osg.cpp
View File

@ -911,7 +911,7 @@ osg::Group* ConvertFromFLT::visitSwitch(osg::Group& osgParent, SwitchRecord* rec
if (nChild<osgSwitch->getNumChildren())
{
osgSwitch->setValue(nChild,(pSSwitch->aMask[nMaskWord] & (uint32(1) << nMaskBit)));
osgSwitch->setValue(nChild,(pSSwitch->aMask[nMaskWord] & (uint32(1) << nMaskBit))!=0);
}
}

4
src/osgPlugins/osg/Switch.cpp
View File

@ -64,7 +64,7 @@ bool Switch_readLocalData(Object& obj, Input& fr)
int value;
if (fr[0].getInt(value))
{
sw.setValue(pos,value);
sw.setValue(value);
++pos;
}
++fr;
@ -96,7 +96,7 @@ bool Switch_writeLocalData(const Object& obj, Output& fw)
itr!=values.end();
++itr)
{
fw.indent()<<*itr<<endl;
fw.indent()<<*itr<<std::endl;
}
fw.moveOut();
fw.indent()<<"}"<< std::endl;