diff options
Diffstat (limited to 'engine/src/renderer/opengl.rs')
-rw-r--r-- | engine/src/renderer/opengl.rs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs index ea66de0..cfd046f 100644 --- a/engine/src/renderer/opengl.rs +++ b/engine/src/renderer/opengl.rs @@ -47,11 +47,9 @@ use crate::opengl::shader::{ Shader as GlShader, }; use crate::opengl::texture::{ - set_active_texture_unit, Filtering as GlTextureFiltering, PixelDataFormat as GlTexturePixelDataFormat, Texture as GlTexture, - TextureUnit, Wrapping as GlTextureWrapping, }; use crate::opengl::vertex_array::{ @@ -82,9 +80,9 @@ use crate::window::Window; mod vertex; -const AMBIENT_MAP_TEXTURE_UNIT: TextureUnit = TextureUnit::No0; -const DIFFUSE_MAP_TEXTURE_UNIT: TextureUnit = TextureUnit::No1; -const SPECULAR_MAP_TEXTURE_UNIT: TextureUnit = TextureUnit::No2; +const AMBIENT_MAP_TEXTURE_UNIT: u32 = 0; +const DIFFUSE_MAP_TEXTURE_UNIT: u32 = 1; +const SPECULAR_MAP_TEXTURE_UNIT: u32 = 2; type RenderableEntity<'a> = ( &'a Model, @@ -260,9 +258,7 @@ fn render( ) }); - set_active_texture_unit(texture_unit); - - gl_texture.bind(); + gl_texture.bind_to_texture_unit(texture_unit); continue; }; @@ -288,9 +284,7 @@ fn render( } }; - set_active_texture_unit(texture_unit); - - gl_texture.bind(); + gl_texture.bind_to_texture_unit(texture_unit); } shader_program.activate(); |