kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

support of highlighting and selection if shading is disabled

Browse Source
This commit is contained in:
wmayer
2017-03-06 09:29:26 +01:00
parent 6612e7c753
commit b1347ec12b
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Part/Gui/SoBrepFaceSet.cpp
View File

@@ -789,12 +789,11 @@ void SoBrepFaceSet::renderHighlight(SoGLRenderAction *action)
SoLazyElement::setEmissive(state, &this->highlightColor);
SoOverrideElement::setEmissiveColorOverride(state, this, true);
#if 0 // disables shading effect
// sendNormals will be false
SoLazyElement::setDiffuse(state, this,1, &this->highlightColor,&this->colorpacker);
SoOverrideElement::setDiffuseColorOverride(state, this, true);
SoLazyElement::setLightModel(state, SoLazyElement::BASE_COLOR);
#endif
// if shading is disabled then set also the diffuse color
if (SoLazyElement::getLightModel(state) == SoLazyElement::BASE_COLOR) {
SoLazyElement::setDiffuse(state, this,1, &this->highlightColor,&this->colorpacker);
SoOverrideElement::setDiffuseColorOverride(state, this, true);
}
Binding mbind = this->findMaterialBinding(state);
Binding nbind = this->findNormalBinding(state);
@@ -870,11 +869,11 @@ void SoBrepFaceSet::renderSelection(SoGLRenderAction *action)
SoLazyElement::setEmissive(state, &this->selectionColor);
SoOverrideElement::setEmissiveColorOverride(state, this, true);
#if 0 // disables shading effect
SoLazyElement::setDiffuse(state, this,1, &this->selectionColor,&this->colorpacker);
SoOverrideElement::setDiffuseColorOverride(state, this, true);
SoLazyElement::setLightModel(state, SoLazyElement::BASE_COLOR);
#endif
// if shading is disabled then set also the diffuse color
if (SoLazyElement::getLightModel(state) == SoLazyElement::BASE_COLOR) {
SoLazyElement::setDiffuse(state, this,1, &this->selectionColor,&this->colorpacker);
SoOverrideElement::setDiffuseColorOverride(state, this, true);
}
Binding mbind = this->findMaterialBinding(state);
Binding nbind = this->findNormalBinding(state);