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

From Roland Smeenk, "I took a quick look at the warnings and they contain nothing serious.

Browse Source 
Attached you will find updates of the files to hopefully solve the warnings (in VS2005 only one warning occured). In addition I fixed a tiny bug that caused a crash with one of my test files."
This commit is contained in:
Robert Osfield
2010-03-04 12:57:24 +00:00
parent 4282b284e5
commit 225d99c5f1
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/osgPlugins/dae/daeRMaterials.cpp
View File

@@ -839,6 +839,8 @@ osg::Texture::WrapMode getWrapMode(domFx_sampler_wrap_common domWrap)
case FX_SAMPLER_WRAP_COMMON_NONE:
case FX_SAMPLER_WRAP_COMMON_BORDER:
return osg::Texture::CLAMP_TO_BORDER;
default:
;// fall through
}
return osg::Texture::CLAMP;
@@ -852,24 +854,27 @@ osg::Texture::FilterMode getFilterMode(domFx_sampler_filter_common domFilter, bo
return osg::Texture::NEAREST;
case FX_SAMPLER_FILTER_COMMON_LINEAR:
return osg::Texture::LINEAR;
}
if (allowMipMap)
{
switch (domFilter)
{
case FX_SAMPLER_FILTER_COMMON_NEAREST_MIPMAP_NEAREST:
case FX_SAMPLER_FILTER_COMMON_NEAREST_MIPMAP_NEAREST:
if (allowMipMap)
return osg::Texture::NEAREST_MIPMAP_NEAREST;
case FX_SAMPLER_FILTER_COMMON_LINEAR_MIPMAP_NEAREST:
break;
case FX_SAMPLER_FILTER_COMMON_LINEAR_MIPMAP_NEAREST:
if (allowMipMap)
return osg::Texture::LINEAR_MIPMAP_NEAREST;
case FX_SAMPLER_FILTER_COMMON_NEAREST_MIPMAP_LINEAR:
break;
case FX_SAMPLER_FILTER_COMMON_NEAREST_MIPMAP_LINEAR:
if (allowMipMap)
return osg::Texture::NEAREST_MIPMAP_LINEAR;
case FX_SAMPLER_FILTER_COMMON_NONE:
case FX_SAMPLER_FILTER_COMMON_LINEAR_MIPMAP_LINEAR:
break;
case FX_SAMPLER_FILTER_COMMON_LINEAR_MIPMAP_LINEAR:
if (allowMipMap)
return osg::Texture::LINEAR_MIPMAP_LINEAR;
}
break;
case FX_SAMPLER_FILTER_COMMON_NONE:
return osg::Texture::NEAREST;
default:
; // Fall through
}
return osg::Texture::LINEAR;
}