Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
9f14f881
Commit
9f14f881
authored
Nov 24, 2017
by
Jan Möbius
Browse files
Merge branch 'fixGLShininess' into 'master'
fixed setting shininess Closes
OpenFlipper-Free#138
See merge request
!46
parents
1275ee2d
8994e8fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
libs_required/ACG/GL/GLState.cc
View file @
9f14f881
...
...
@@ -758,13 +758,13 @@ void GLState::set_overlay_color(const Vec4f& _col)
void
GLState
::
set_shininess
(
float
_shininess
)
{
shininess_
=
_shininess
;
{
shininess_
=
_shininess
;
if
(
updateGL_
&&
compatibilityProfile_
)
{
makeCurrent
();
glMaterialf
(
GL_FRONT_AND_BACK
,
GL_SHININESS
,
_shininess
);
glMaterialf
(
GL_FRONT_AND_BACK
,
GL_SHININESS
,
std
::
min
(
128.
f
,
_shininess
)
)
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment