From 1ac3f6d04ea1e811dc43e0e342db8045fe106b6a Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Sun, 7 May 2017 12:11:08 -0400 Subject: [PATCH] Delete some commented out code. --- shaded_cube.rs | 83 -------------------------------------------------- 1 file changed, 83 deletions(-) diff --git a/shaded_cube.rs b/shaded_cube.rs index fb4fb1d..ee31e5c 100644 --- a/shaded_cube.rs +++ b/shaded_cube.rs @@ -99,86 +99,3 @@ impl<'a> ShadedCube<'a> { frame.draw(&self.vertexes, &self.indices, &self.program, uniforms, ¶ms).unwrap(); } } - -/* -pub fn draw(display: &Display, - frame: &mut glium::Frame, - program: &Program, - uniforms: &U, - cube: &Cube) where U: glium::uniforms::Uniforms { - - implement_vertex!(Vertex, position, normal); - - #[derive(Copy, Clone)] - struct Normal { normal: [f32; 3] } - implement_vertex!(Normal, normal); - - // x---> - // 4 ──────┐ 5 - // ╱┆ ╱│ - // 0 ┌─────┐1 │ - // y │ 7+┄┄│┄┄+ 6 - // | │╱ │ ╱ / - // v └─────┘ z - // 3 2 - let cube = [ - // Front face - Vertex { position: [cube.xmin, cube.ymin, cube.zmin], normal: [ 0., 0., 1.] }, // 0 - Vertex { position: [cube.xmax, cube.ymin, cube.zmin], normal: [ 0., 0., 1.] }, // 1 - Vertex { position: [cube.xmax, cube.ymax, cube.zmin], normal: [ 0., 0., 1.] }, // 2 - Vertex { position: [cube.xmin, cube.ymax, cube.zmin], normal: [ 0., 0., 1.] }, // 3 - - // Back face - Vertex { position: [cube.xmin, cube.ymax, cube.zmax], normal: [ 0., 0., -1.] }, // 7 - Vertex { position: [cube.xmax, cube.ymax, cube.zmax], normal: [ 0., 0., -1.] }, // 6 - Vertex { position: [cube.xmax, cube.ymin, cube.zmax], normal: [ 0., 0., -1.] }, // 5 - Vertex { position: [cube.xmin, cube.ymin, cube.zmax], normal: [ 0., 0., -1.] }, // 4 - - // Right face - Vertex { position: [cube.xmax, cube.ymin, cube.zmin], normal: [ -1., 0., 0.] }, // 1 - Vertex { position: [cube.xmax, cube.ymin, cube.zmax], normal: [ -1., 0., 0.] }, // 5 - Vertex { position: [cube.xmax, cube.ymax, cube.zmax], normal: [ -1., 0., 0.] }, // 6 - Vertex { position: [cube.xmax, cube.ymax, cube.zmin], normal: [ -1., 0., 0.] }, // 2 - - // Left face - Vertex { position: [cube.xmin, cube.ymin, cube.zmin], normal: [ 1., 0., 0.] }, // 0 - Vertex { position: [cube.xmin, cube.ymax, cube.zmin], normal: [ 1., 0., 0.] }, // 3 - Vertex { position: [cube.xmin, cube.ymax, cube.zmax], normal: [ 1., 0., 0.] }, // 7 - Vertex { position: [cube.xmin, cube.ymin, cube.zmax], normal: [ 1., 0., 0.] }, // 4 - - // Top face - Vertex { position: [cube.xmin, cube.ymin, cube.zmin], normal: [ 0., 1., 0.] }, // 0 - Vertex { position: [cube.xmin, cube.ymin, cube.zmax], normal: [ 0., 1., 0.] }, // 4 - Vertex { position: [cube.xmax, cube.ymin, cube.zmax], normal: [ 0., 1., 0.] }, // 5 - Vertex { position: [cube.xmax, cube.ymin, cube.zmin], normal: [ 0., 1., 0.] }, // 1 - - // Bottom face - Vertex { position: [cube.xmax, cube.ymax, cube.zmin], normal: [ 0., -1., 0.] }, // 2 - Vertex { position: [cube.xmax, cube.ymax, cube.zmax], normal: [ 0., -1., 0.] }, // 6 - Vertex { position: [cube.xmin, cube.ymax, cube.zmax], normal: [ 0., -1., 0.] }, // 7 - Vertex { position: [cube.xmin, cube.ymax, cube.zmin], normal: [ 0., -1., 0.] }, // 3 - ]; - let vb = glium::VertexBuffer::new(display, &cube).unwrap(); - - let params = glium::DrawParameters { - depth: glium::Depth { - test: glium::draw_parameters::DepthTest::IfLess, - write: true, - ..Default::default() - }, - blend: glium::Blend::alpha_blending(), - ..Default::default() - }; - - let front_indices = IndexBuffer::new(display, PrimitiveType::TrianglesList, - &[ 0, 1, 2, 0, 2, 3, // Front - 4, 5, 6, 4, 6, 7, // Back - 8, 9, 10, 8, 10, 11, // Right - 12, 13, 14, 12, 14, 15, // Left - 16, 17, 18, 16, 18, 19, // Top - 20, 21, 22, 20, 22, 23u16, // Bottom - ]).unwrap(); - frame.draw(&vb, &front_indices, program, uniforms, ¶ms).unwrap(); -} - -*/ -- 2.25.1