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

Fixes for Win32.

Browse Source
This commit is contained in:
Robert Osfield
2002-12-11 10:07:14 +00:00
parent 392be2d010
commit 0e6d702906
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ bool Switch_readLocalData(Object& obj, Input& fr)
{
int value;
fr[1].getInt(value);
sw.setNewChildDefaultValue(value);
sw.setNewChildDefaultValue(value!=0);
iteratorAdvanced = true;
fr += 2;
}
@@ -88,7 +88,7 @@ bool Switch_readLocalData(Object& obj, Input& fr)
int value;
if (fr[0].getInt(value))
{
sw.setValue(pos,value);
sw.setValue(pos,value!=0);
++pos;
}
++fr;

9
src/osgSim/LightPointDrawable.cpp
View File

@@ -49,15 +49,16 @@ LightPointDrawable::LightPointDrawable(const LightPointDrawable& lpd,const osg::
void LightPointDrawable::reset()
{
for(SizedLightPointList::iterator itr=_sizedOpaqueLightPointList.begin();
SizedLightPointList::iterator itr;
for(itr=_sizedOpaqueLightPointList.begin();
itr!=_sizedOpaqueLightPointList.end();
++itr)
{
if (!itr->empty())
itr->erase(itr->begin(),itr->end());
}
for(SizedLightPointList::iterator itr=_sizedAdditiveLightPointList.begin();
for(itr=_sizedAdditiveLightPointList.begin();
itr!=_sizedAdditiveLightPointList.end();
++itr)
{
@@ -65,7 +66,7 @@ void LightPointDrawable::reset()
itr->erase(itr->begin(),itr->end());
}
for(SizedLightPointList::iterator itr=_sizedBlendedLightPointList.begin();
for(itr=_sizedBlendedLightPointList.begin();
itr!=_sizedBlendedLightPointList.end();
++itr)
{