Presentation edition

AJMC2002 · Nov 15, 2023 · 7c4ffd2 · 7c4ffd2
1 parent b5db127
commit 7c4ffd2
Show file tree

Hide file tree

Showing 3 changed files with 167 additions and 301 deletions.
diff --git a/src/graphics/mesh.rs b/src/graphics/mesh.rs
@@ -1,8 +1,4 @@
-use std::{
-    mem::{self, size_of},
-    os::raw::c_void,
-    ptr,
-};
+use std::{mem::size_of, ptr};
 
 use gl::types::{GLfloat, GLsizei};
 use obj::Obj;
@@ -11,7 +7,7 @@ use crate::maths::{Matrix, Vector};
 
 use super::{
     camera::Camera,
-    wrapper::{shader_program, ShaderProgram, Texture2D, VertexAttrib, BO, EBO, VAO, VBO},
+    wrapper::{ShaderProgram, Texture2D, VertexAttrib, BO, EBO, VAO, VBO},
 };
 
 pub struct Cube<'a> {
@@ -42,21 +38,21 @@ impl<'a> Cube<'a> {
             -0.5, -0.5, -0.5, //7
         ];
 
-        match texture {
-            Some(texture) => {
-                let tex_coords = tex_coords.unwrap_or(vec![
-                    1.0, 1.0, //0
-                    0.0, 1.0, //1
-                    1.0, 0.0, //2
-                    0.0, 0.0, //3
-                    0.0, 1.0, //4
-                    1.0, 1.0, //5
-                    0.0, 0.0, //6
-                    1.0, 0.0, //7
-                ]);
-            }
-            None => (),
-        }
+        // match texture {
+        //     Some(texture) => {
+        //         let tex_coords = tex_coords.unwrap_or(vec![
+        //             1.0, 1.0, //0
+        //             0.0, 1.0, //1
+        //             1.0, 0.0, //2
+        //             0.0, 0.0, //3
+        //             0.0, 1.0, //4
+        //             1.0, 1.0, //5
+        //             0.0, 0.0, //6
+        //             1.0, 0.0, //7
+        //         ]);
+        //     }
+        //     None => (),
+        // }
 
         let vao = VAO::new();
         let vbo: VBO = BO::new(gl::STATIC_DRAW, vertex_data);

diff --git a/src/graphics/wrapper/texture.rs b/src/graphics/wrapper/texture.rs
@@ -1,6 +1,7 @@
 use gl::types::*;
 use image::GenericImageView;
 
+#[derive(Debug)]
 pub struct Texture2D {
     id: GLuint,
 }