1 files changed, 13 insertions, 84 deletions

diff --git a/engine/src/opengl/texture.rs b/engine/src/opengl/texture.rs
index 52c8554..80a5f37 100644
--- a/engine/src/opengl/texture.rs
+++ b/engine/src/opengl/texture.rs
@@ -1,5 +1,4 @@
 use crate::data_types::dimens::Dimens;
-use crate::texture::Properties;
 
 #[derive(Debug)]
 pub struct Texture
@@ -20,10 +19,10 @@ impl Texture
         Self { texture }
     }
 
-    pub fn bind(&self)
+    pub fn bind_to_texture_unit(&self, texture_unit: u32)
     {
         unsafe {
-            gl::BindTexture(gl::TEXTURE_2D, self.texture);
+            gl::BindTextureUnit(texture_unit, self.texture);
         }
     }
 
@@ -41,16 +40,9 @@ impl Texture
         }
     }
 
-    pub fn apply_properties(&mut self, properties: &Properties)
-    {
-        self.set_wrap(properties.wrap);
-        self.set_magnifying_filter(properties.magnifying_filter);
-        self.set_minifying_filter(properties.minifying_filter);
-    }
-
     pub fn set_wrap(&mut self, wrapping: Wrapping)
     {
-        let wrapping_gl = wrapping.to_gl();
+        let wrapping_gl = wrapping as gl::types::GLenum;
 
         #[allow(clippy::cast_possible_wrap)]
         unsafe {
@@ -61,7 +53,7 @@ impl Texture
 
     pub fn set_magnifying_filter(&mut self, filtering: Filtering)
     {
-        let filtering_gl = filtering.to_gl();
+        let filtering_gl = filtering as gl::types::GLenum;
 
         #[allow(clippy::cast_possible_wrap)]
         unsafe {
@@ -75,7 +67,7 @@ impl Texture
 
     pub fn set_minifying_filter(&mut self, filtering: Filtering)
     {
-        let filtering_gl = filtering.to_gl();
+        let filtering_gl = filtering as gl::types::GLenum;
 
         #[allow(clippy::cast_possible_wrap)]
         unsafe {
@@ -132,43 +124,21 @@ impl Drop for Texture
 
 /// Texture wrapping.
 #[derive(Debug, Clone, Copy)]
+#[repr(u32)]
 pub enum Wrapping
 {
-    Repeat,
-    MirroredRepeat,
-    ClampToEdge,
-    ClampToBorder,
-}
-
-impl Wrapping
-{
-    fn to_gl(self) -> gl::types::GLenum
-    {
-        match self {
-            Self::Repeat => gl::REPEAT,
-            Self::MirroredRepeat => gl::MIRRORED_REPEAT,
-            Self::ClampToEdge => gl::CLAMP_TO_EDGE,
-            Self::ClampToBorder => gl::CLAMP_TO_BORDER,
-        }
-    }
+    Repeat = gl::REPEAT,
+    MirroredRepeat = gl::MIRRORED_REPEAT,
+    ClampToEdge = gl::CLAMP_TO_EDGE,
+    ClampToBorder = gl::CLAMP_TO_BORDER,
 }
 
 #[derive(Debug, Clone, Copy)]
+#[repr(u32)]
 pub enum Filtering
 {
-    Nearest,
-    Linear,
-}
-
-impl Filtering
-{
-    fn to_gl(self) -> gl::types::GLenum
-    {
-        match self {
-            Self::Linear => gl::LINEAR,
-            Self::Nearest => gl::NEAREST,
-        }
-    }
+    Nearest = gl::NEAREST,
+    Linear = gl::LINEAR,
 }
 
 /// Texture pixel data format.
@@ -197,44 +167,3 @@ impl PixelDataFormat
         }
     }
 }
-
-pub fn set_active_texture_unit(texture_unit: TextureUnit)
-{
-    unsafe {
-        gl::ActiveTexture(texture_unit.into_gl());
-    }
-}
-
-macro_rules! texture_unit_enum {
-    (cnt=$cnt: literal) => {
-        seq_macro::seq!(N in 0..$cnt {
-            #[derive(Debug, Clone, Copy)]
-            pub enum TextureUnit {
-                #(
-                    No~N,
-                )*
-            }
-
-            impl TextureUnit {
-                fn into_gl(self) -> gl::types::GLenum {
-                    match self {
-                        #(
-                            Self::No~N => gl::TEXTURE~N,
-                        )*
-                    }
-                }
-
-                pub fn from_num(num: usize) -> Option<Self> {
-                    match num {
-                        #(
-                            N => Some(Self::No~N),
-                        )*
-                        _ => None
-                    }
-                }
-            }
-        });
-    };
-}
-
-texture_unit_enum!(cnt = 31);