ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-12-26 01:46:57 +00:00
parent 9bb6dc84dd
commit 5c7d45576e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/material.cpp
View File

@@ -655,10 +655,11 @@ void Material::setMaterialProperties(video::SMaterial *m)
video::EAS_VERTEX_COLOR);
modes++;
}
if (m_normal_map && UserConfigParams::m_pixel_shaders)
if (m_normal_map)
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
if (UserConfigParams::m_pixel_shaders &&
video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0) &&
video_driver->queryFeature(video::EVDF_RENDER_TO_TARGET))
{
@@ -699,6 +700,11 @@ void Material::setMaterialProperties(video::SMaterial *m)
modes++;
}
else
{
// remove normal map texture so that it's not blended with the rest
m->setTexture(1, NULL);
}
}
if (m_parallax_map)
{

1
src/states_screens/dialogs/custom_video_settings.cpp
View File

@@ -67,7 +67,6 @@ void CustomVideoSettingsialog::beforeAddingWidgets()
filtering->addLabel( L"Bilinear" ); // 0
filtering->addLabel( L"Trilinear" ); // 1
filtering->addLabel( L"Anisotropic" ); // 2
printf("filtering : %i\n", value);
filtering->setValue( value );
getWidget<CheckBoxWidget>("antialiasing")->setState( UserConfigParams::m_fullscreen_antialiasing );