livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NORSPEC-72 Set default value of glossiness to 0.2

meow-7.2.2
Dave Parks 2013-03-30 15:51:16 -05:00
parent 1f739cb7bc
commit adcf2d98e3
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llpanelface.cpp
View File

@ -1309,7 +1309,22 @@ void LLPanelFace::updateMaterial()
if (!mMaterial)
{
mMaterial = LLMaterialPtr(new LLMaterial());
//set defaults according to UI spec
mMaterial->setSpecularLightColor(LLColor4U::white);
mMaterial->setSpecularLightExponent((U8) (255*0.2f));
mMaterial->setEnvironmentIntensity(0);
mMaterial->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE);
mMaterial->setAlphaMaskCutoff(0);
}
else
{
mMaterial->setSpecularLightColor(getChild<LLColorSwatchCtrl>("shinycolorswatch")->get());
mMaterial->setSpecularLightExponent((U8)(255*getChild<LLUICtrl>("glossiness")->getValue().asReal()));
mMaterial->setEnvironmentIntensity((U8)(255*getChild<LLUICtrl>("environment")->getValue().asReal()));
mMaterial->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex());
mMaterial->setAlphaMaskCutoff((U8)(getChild<LLUICtrl>("maskcutoff")->getValue().asInteger()));
}
if (bumpiness == BUMPY_TEXTURE)
{
LL_DEBUGS("Materials") << "Setting bumpy texture, bumpiness = " << bumpiness << LL_ENDL;
@ -1346,11 +1361,7 @@ void LLPanelFace::updateMaterial()
mMaterial->setSpecularRepeat(1.0f,1.0f);
mMaterial->setSpecularRotation(0.0f);
}
mMaterial->setSpecularLightColor(getChild<LLColorSwatchCtrl>("shinycolorswatch")->get());
mMaterial->setSpecularLightExponent((U8)(255*getChild<LLUICtrl>("glossiness")->getValue().asReal()));
mMaterial->setEnvironmentIntensity((U8)(255*getChild<LLUICtrl>("environment")->getValue().asReal()));
mMaterial->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex());
mMaterial->setAlphaMaskCutoff((U8)(getChild<LLUICtrl>("maskcutoff")->getValue().asInteger()));
LL_DEBUGS("Materials") << "Updating material: " << mMaterial->asLLSD() << LL_ENDL;
LLSelectMgr::getInstance()->selectionSetMaterial( mMaterial );
}

2
indra/newview/skins/default/xui/en/panel_tools_texture.xml
View File

@ -394,7 +394,7 @@
max_value="1"
follows="left|top"
height="19"
initial_value="0"
initial_value="0.2"
layout="topleft"
top_delta="-4"
left_pad="10"