speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Re #714 Fixed unused var warning

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4766 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: d35ce480030f6f24edd3609790ebd297cdeca768
Former-commit-id: 0f7815a82733cda2e01ef20fe269cad4d3029740
This commit is contained in:
pouillot 2012-06-23 12:32:43 +00:00
parent fc8c81e5cb
commit fc360489a0
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libs/tgfclient/glfeatures.cpp
View file

@ -168,14 +168,15 @@ void GfglFeatures::detectStandardSupport()
// 9) Stereo Vision (need a proper check) // 9) Stereo Vision (need a proper check)
_mapSupportedBool[StereoVision] = false; _mapSupportedBool[StereoVision] = false;
//10) Bump Mapping // 10) Bump Mapping
bool bValueBump = gfglIsOpenGLExtensionSupported("GL_ARB_multitexture") && bValue =
gfglIsOpenGLExtensionSupported("GL_ARB_texture_cube_map") && gfglIsOpenGLExtensionSupported("GL_ARB_multitexture")
gfglIsOpenGLExtensionSupported("GL_ARB_texture_env_combine") && && gfglIsOpenGLExtensionSupported("GL_ARB_texture_cube_map")
gfglIsOpenGLExtensionSupported("GL_ARB_texture_env_dot3") && && gfglIsOpenGLExtensionSupported("GL_ARB_texture_env_combine")
gfglIsOpenGLExtensionSupported("GL_ARB_imaging"); && gfglIsOpenGLExtensionSupported("GL_ARB_texture_env_dot3")
&& gfglIsOpenGLExtensionSupported("GL_ARB_imaging");
_mapSupportedBool[BumpMapping] = bValueBump;
_mapSupportedBool[BumpMapping] = bValue;
} }
// Best supported features detection for the given specs of the frame buffer. // Best supported features detection for the given specs of the frame buffer.
@ -194,7 +195,6 @@ bool GfglFeatures::detectBestSupport(int& nWidth, int& nHeight, int& nDepth,
int nAlphaChannel = bAlpha ? 1 : 0; int nAlphaChannel = bAlpha ? 1 : 0;
int nCurrDepth = nDepth; int nCurrDepth = nDepth;
int nFullScreen = bFullScreen ? 1 : 0; int nFullScreen = bFullScreen ? 1 : 0;
int nBump = bBumpMapping ? 1 : 0;
int nStereoVision = bStereoVision ? 1 : 0; int nStereoVision = bStereoVision ? 1 : 0;
while (!pWinSurface && nFullScreen >= 0) while (!pWinSurface && nFullScreen >= 0)
@ -721,7 +721,7 @@ void GfglFeatures::dumpSupport() const
GfLogInfo("\n"); GfLogInfo("\n");
GfLogInfo(" Stereo Vision : %s\n", GfLogInfo(" Stereo Vision : %s\n",
isSupported(StereoVision) ? "Yes" : "No"); isSupported(StereoVision) ? "Yes" : "No");
GfLogInfo(" Bump Mapping : %s\n", GfLogInfo(" Bump Mapping : %s\n",
isSupported(BumpMapping) ? "Yes" : "No"); isSupported(BumpMapping) ? "Yes" : "No");
} }
@ -917,7 +917,7 @@ void GfglFeatures::dumpSelection() const
GfLogInfo(" (%d samples)", getSelected(MultiSamplingSamples)); GfLogInfo(" (%d samples)", getSelected(MultiSamplingSamples));
GfLogInfo("\n"); GfLogInfo("\n");
GfLogInfo(" Stereo vision : %s\n", isSelected(StereoVision) ? "On" : "Off"); GfLogInfo(" Stereo vision : %s\n", isSelected(StereoVision) ? "On" : "Off");
GfLogInfo(" Bump Mapping : %s\n", isSelected(BumpMapping) ? "On" : "Off"); GfLogInfo(" Bump Mapping : %s\n", isSelected(BumpMapping) ? "On" : "Off");
} }
// Bool features management. // Bool features management.