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

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2015-10-12 10:07:04 +11:00
commit da73e7d9cf
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/user_config.hpp
View File

@ -626,12 +626,12 @@ namespace UserConfigParams
PARAM_DEFAULT( BoolUserConfigParam(true, "weather_gfx", PARAM_DEFAULT( BoolUserConfigParam(true, "weather_gfx",
&m_graphics_quality, "Weather effects") ); &m_graphics_quality, "Weather effects") );
PARAM_PREFIX IntUserConfigParam m_show_steering_animations PARAM_PREFIX IntUserConfigParam m_show_steering_animations
PARAM_DEFAULT( IntUserConfigParam(ANIMS_ALL, PARAM_DEFAULT( IntUserConfigParam(ANIMS_PLAYERS_ONLY,
"steering_animations", &m_graphics_quality, "steering_animations", &m_graphics_quality,
"Whether to display kart animations (0=disabled for all; " "Whether to display kart animations (0=disabled for all; "
"1=enabled for humans, disabled for AIs; 2=enabled for all") ); "1=enabled for humans, disabled for AIs; 2=enabled for all") );
PARAM_PREFIX IntUserConfigParam m_anisotropic PARAM_PREFIX IntUserConfigParam m_anisotropic
PARAM_DEFAULT( IntUserConfigParam(8, "anisotropic", PARAM_DEFAULT( IntUserConfigParam(4, "anisotropic",
&m_graphics_quality, &m_graphics_quality,
"Quality of anisotropic filtering (usual values include 2-4-8-16; 0 to disable)") ); "Quality of anisotropic filtering (usual values include 2-4-8-16; 0 to disable)") );
PARAM_PREFIX BoolUserConfigParam m_trilinear PARAM_PREFIX BoolUserConfigParam m_trilinear
@ -666,7 +666,7 @@ namespace UserConfigParams
"shadows_resoltion", &m_graphics_quality, "shadows_resoltion", &m_graphics_quality,
"Shadow resolution (0 = disabled") ); "Shadow resolution (0 = disabled") );
PARAM_PREFIX BoolUserConfigParam m_degraded_IBL PARAM_PREFIX BoolUserConfigParam m_degraded_IBL
PARAM_DEFAULT(BoolUserConfigParam(false, PARAM_DEFAULT(BoolUserConfigParam(true,
"Degraded_IBL", &m_graphics_quality, "Degraded_IBL", &m_graphics_quality,
"Disable specular IBL")); "Disable specular IBL"));

3
src/tracks/track_object.cpp
View File

@ -218,7 +218,8 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
core::matrix4 absTransform = node->getAbsoluteTransformation(); core::matrix4 absTransform = node->getAbsoluteTransformation();
node->setParent(irr_driver->getSceneManager()->getRootSceneNode()); node->setParent(irr_driver->getSceneManager()->getRootSceneNode());
node->setPosition(absTransform.getTranslation()); node->setPosition(absTransform.getTranslation());
node->setRotation(absTransform.getRotationDegrees()); // Doesn't seem necessary to set rotation here, TODO: not sure why
//node->setRotation(absTransform.getRotationDegrees());
node->setScale(absTransform.getScale()); node->setScale(absTransform.getScale());
is_movable = true; is_movable = true;
} }