Reorganize into workspace

1 files changed, 0 insertions, 132 deletions

diff --git a/src/mesh.rs b/src/mesh.rs
deleted file mode 100644
index 7209de1..0000000
--- a/src/mesh.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use glow::HasContext;
-
-use crate::context;
-
-pub const ATTRIB_VERTEX: u32 = 0;
-pub const ATTRIB_NORMAL: u32 = 1;
-pub const ATTRIB_TEXCOORD: u32 = 2;
-pub const ATTRIB_JOINT: u32 = 3;
-pub const ATTRIB_WEIGHT: u32 = 4;
-pub const ATTRIB_COLOR: u32 = 5;
-
-pub struct Mesh {
-    pub vao: glow::VertexArray,
-    pub mode: u32, // glow::TRIANGLES, etc.
-    pub index_count: usize,
-    pub index_type: u32, // glow::BYTE, glow::FLOAT, etc.
-    pub index_offset: i32,
-}
-
-impl Mesh {
-    pub fn build(
-        ctx: &context::Context,
-        vertices: &Vec<f32>,
-        indices: &Vec<u32>,
-        snormals: &Option<Vec<f32>>,
-        stexcoords: &Option<Vec<f32>>,
-    ) -> Self {
-        unsafe {
-            let vao = ctx.gl.create_vertex_array().expect("failed to initialize vao");
-            ctx.gl.bind_vertex_array(Some(vao));
-
-            let buf = ctx.gl.create_buffer().expect("failed to create buffer object");
-            ctx.gl.bind_buffer(glow::ARRAY_BUFFER, Some(buf));
-            ctx.gl.buffer_data_u8_slice(
-                glow::ARRAY_BUFFER,
-                std::slice::from_raw_parts(
-                    vertices.as_ptr() as _,
-                    vertices.len() * std::mem::size_of::<f32>(),
-                ),
-                glow::STATIC_DRAW,
-            );
-            ctx.gl.vertex_attrib_pointer_f32(ATTRIB_VERTEX, 3, glow::FLOAT, false, 0, 0);
-            ctx.gl.enable_vertex_attrib_array(ATTRIB_VERTEX);
-
-            let indices_vbo = ctx.gl.create_buffer().expect("failed to create buffer object");
-            ctx.gl.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, Some(indices_vbo));
-            ctx.gl.buffer_data_u8_slice(
-                glow::ELEMENT_ARRAY_BUFFER,
-                std::slice::from_raw_parts(
-                    indices.as_ptr() as _,
-                    indices.len() * std::mem::size_of::<f32>(),
-                ),
-                glow::STATIC_DRAW,
-            );
-
-            if let Some(normals) = snormals {
-                let normals_vbo = ctx.gl.create_buffer().expect("failed to create buffer object");
-                ctx.gl.bind_buffer(glow::ARRAY_BUFFER, Some(normals_vbo));
-                ctx.gl.buffer_data_u8_slice(
-                    glow::ARRAY_BUFFER,
-                    std::slice::from_raw_parts(
-                        normals.as_ptr() as _,
-                        normals.len() * std::mem::size_of::<f32>(),
-                    ),
-                    glow::STATIC_DRAW,
-                );
-                ctx.gl.vertex_attrib_pointer_f32(ATTRIB_NORMAL, 3, glow::FLOAT, false, 0, 0);
-                ctx.gl.enable_vertex_attrib_array(ATTRIB_NORMAL);
-            }
-
-            if let Some(texcoords) = stexcoords {
-                let texcoords_vbo = ctx.gl.create_buffer().expect("failed to create buffer object");
-                ctx.gl.bind_buffer(glow::ARRAY_BUFFER, Some(texcoords_vbo));
-                ctx.gl.buffer_data_u8_slice(
-                    glow::ARRAY_BUFFER,
-                    std::slice::from_raw_parts(
-                        texcoords.as_ptr() as _,
-                        texcoords.len() * std::mem::size_of::<f32>(),
-                    ),
-                    glow::STATIC_DRAW,
-                );
-                ctx.gl.vertex_attrib_pointer_f32(ATTRIB_TEXCOORD, 2, glow::FLOAT, false, 0, 0);
-                ctx.gl.enable_vertex_attrib_array(ATTRIB_TEXCOORD);
-            }
-
-            Self {
-                vao,
-                mode: glow::TRIANGLES,
-                index_count: indices.len(),
-                index_type: glow::UNSIGNED_INT,
-                index_offset: 0,
-            }
-        }
-    }
-
-    pub fn from_obj(ctx: &context::Context, mut bytes: &[u8]) -> Self {
-        let lopts = tobj::LoadOptions {
-            triangulate: true,
-            single_index: true,
-            ..Default::default()
-        };
-        let (meshes, _materials) = tobj::load_obj_buf(
-            &mut bytes,
-            &lopts,
-            |_| Err(tobj::LoadError::GenericFailure)
-        ).expect("failed to load mesh");
-        let mesh = meshes.into_iter().next()
-            .expect("failed to load mesh")
-            .mesh;
-        Self::build(
-            ctx,
-            &mesh.positions,
-            &mesh.indices,
-            &Some(mesh.normals),
-            &Some(mesh.texcoords),
-        )
-    }
-
-    pub fn render(&self, ctx: &context::Context) {
-        unsafe {
-            ctx.gl.bind_vertex_array(Some(self.vao));
-            ctx.gl.draw_elements(self.mode, self.index_count as _, self.index_type, self.index_offset);
-        }
-    }
-
-    pub fn render_instanced(&self, ctx: &context::Context, count: u64) {
-        unsafe {
-            ctx.gl.bind_vertex_array(Some(self.vao));
-            ctx.gl.draw_elements_instanced(self.mode, self.index_count as _, self.index_type, self.index_offset, count as _);
-        }
-    }
-}