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

Various warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2008-10-27 13:09:43 +00:00
parent e062524cb4
commit b28612bce2
21 changed files with 77 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osg/Texture.cpp
View File

@@ -368,14 +368,14 @@ Texture::Texture():
_borderColor(0.0, 0.0, 0.0, 0.0),
_borderWidth(0),
_internalFormatMode(USE_IMAGE_DATA_FORMAT),
_internalFormatType(NORMALIZED),
_internalFormat(0),
_sourceFormat(0),
_sourceType(0),
_use_shadow_comparison(false),
_shadow_compare_func(LEQUAL),
_shadow_texture_mode(LUMINANCE),
_shadow_ambient(0),
_internalFormatType(NORMALIZED)
_shadow_ambient(0)
{
}
@@ -394,14 +394,14 @@ Texture::Texture(const Texture& text,const CopyOp& copyop):
_borderColor(text._borderColor),
_borderWidth(text._borderWidth),
_internalFormatMode(text._internalFormatMode),
_internalFormatType(text._internalFormatType),
_internalFormat(text._internalFormat),
_sourceFormat(text._sourceFormat),
_sourceType(text._sourceType),
_use_shadow_comparison(text._use_shadow_comparison),
_shadow_compare_func(text._shadow_compare_func),
_shadow_texture_mode(text._shadow_texture_mode),
_shadow_ambient(text._shadow_ambient),
_internalFormatType(text._internalFormatType)
_shadow_ambient(text._shadow_ambient)
{
}
@@ -1469,6 +1469,8 @@ void Texture::mipmapAfterTexImage(State& state, GenerateMipmapMode beforeResult)
case GENERATE_MIPMAP_TEX_PARAMETER:
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_FALSE);
break;
case GENERATE_MIPMAP_NONE:
break;
}
}