Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
7665aa31
Commit
7665aa31
authored
Nov 14, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed indentation warning
parent
4759e4d9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
19 deletions
+20
-19
libs_required/ACG/Scenegraph/TextureNode.cc
libs_required/ACG/Scenegraph/TextureNode.cc
+20
-19
No files found.
libs_required/ACG/Scenegraph/TextureNode.cc
View file @
7665aa31
...
...
@@ -502,26 +502,27 @@ void TextureNode::enter(GLState& _state , const DrawModes::DrawMode& _drawmode)
open_volume_mesh_texture_draw_modes_
))
{
if
(
_state
.
compatibilityProfile
())
ACG
::
GLState
::
enable
(
GL_TEXTURE_2D
);
ACG
::
GLState
::
enable
(
GL_TEXTURE_2D
);
mipmapping_globally_active_
=
_state
.
mipmapping_allowed
();
// Check if mipmapping status has changed
if
(
_state
.
mipmapping_allowed
()
!=
last_mipmapping_status_
)
{
// Update mipmaps
updateMipmaps
(
mipmapping_globally_active_
&&
mipmapping_
);
// Keep track of changes
last_mipmapping_status_
=
_state
.
mipmapping_allowed
();
}
if
(
!
textures_
.
empty
()
)
{
textures_
[
activeTexture_
].
tex
->
bind
();
}
if
(
_state
.
compatibilityProfile
())
glTexEnvi
(
GL_TEXTURE_ENV
,
GL_TEXTURE_ENV_MODE
,
tex_mode_
);
mipmapping_globally_active_
=
_state
.
mipmapping_allowed
();
// Check if mipmapping status has changed
if
(
_state
.
mipmapping_allowed
()
!=
last_mipmapping_status_
)
{
// Update mipmaps
updateMipmaps
(
mipmapping_globally_active_
&&
mipmapping_
);
// Keep track of changes
last_mipmapping_status_
=
_state
.
mipmapping_allowed
();
}
if
(
!
textures_
.
empty
()
)
{
textures_
[
activeTexture_
].
tex
->
bind
();
}
if
(
_state
.
compatibilityProfile
())
glTexEnvi
(
GL_TEXTURE_ENV
,
GL_TEXTURE_ENV_MODE
,
tex_mode_
);
// if (_drawmode & DrawModes::SOLID_FACES_COLORED_2DTEXTURED_FACE_SMOOTH_SHADED)
// glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
...
...
Write
Preview
Markdown
is supported
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