From 25064490972768b379e241e682faabee4a61b066 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Sat, 11 Jan 2020 11:51:46 -0800 Subject: [PATCH] use creat_quad in create_plane --- src/render/mesh.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/render/mesh.rs b/src/render/mesh.rs index 4c27ded879..c4d69b281b 100644 --- a/src/render/mesh.rs +++ b/src/render/mesh.rs @@ -73,7 +73,7 @@ pub fn create_quad( Vertex::from(([south_east.x(), south_east.y(), 0.0], [0.0, 0.0, 1.0])), ]; - let index_data: &[u16] = &[0, 1, 2, 0, 2, 3]; + let index_data: &[u16] = &[0, 2, 1, 0, 3, 2]; return (vertex_data.to_vec(), index_data.to_vec()); } @@ -124,15 +124,11 @@ pub fn create_cube() -> (Vec, Vec) { } pub fn create_plane(size: f32) -> (Vec, Vec) { - let vertex_data = [ - Vertex::from(([size, -size, 0.0], [0.0, 0.0, 1.0])), - Vertex::from(([size, size, 0.0], [0.0, 0.0, 1.0])), - Vertex::from(([-size, -size, 0.0], [0.0, 0.0, 1.0])), - Vertex::from(([-size, size, 0.0], [0.0, 0.0, 1.0])), - ]; - - // TODO: make sure this order is correct - let index_data: &[u16] = &[0, 1, 2, 2, 1, 3]; - - (vertex_data.to_vec(), index_data.to_vec()) + let size_over_2 = size / 2.0; + create_quad( + vec2(-size_over_2, size_over_2), + vec2(size_over_2, size_over_2), + vec2(-size_over_2, -size_over_2), + vec2(size_over_2, -size_over_2) + ) }