Add rectangular cuboid shape

Co-authored-by: Jason Lessard <jason.lessard@usherbrooke.ca>
bevyengine · Nov 18, 2020 · 4ab3925 · 4ab3925
1 parent 4fecb89
commit 4ab3925
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 53 deletions.
diff --git a/crates/bevy_render/src/mesh/mesh.rs b/crates/bevy_render/src/mesh/mesh.rs
@@ -227,58 +227,75 @@ pub mod shape {
     use bevy_math::*;
     use hexasphere::Hexasphere;
 
-    /// A cube.
-    #[derive(Debug)]
-    pub struct Cube {
-        /// Half the side length of the cube.
-        pub size: f32,
+    pub struct Cuboid {
+        pub min_x: f32,
+        pub max_x: f32,
+
+        pub min_y: f32,
+        pub max_y: f32,
+
+        pub min_z: f32,
+        pub max_z: f32,
+    }
+
+    impl Cuboid {
+        pub fn new(x_length: f32, y_length: f32, z_length: f32) -> Cuboid {
+            Cuboid {
+                max_x: x_length / 2.0,
+                min_x: -x_length / 2.0,
+                max_y: y_length / 2.0,
+                min_y: -y_length / 2.0,
+                max_z: z_length / 2.0,
+                min_z: -z_length / 2.0,
+            }
+        }
     }
 
-    impl Default for Cube {
+    impl Default for Cuboid {
         fn default() -> Self {
-            Cube { size: 1.0 }
+            Cuboid::new(2.0, 1.0, 1.0)
         }
     }
 
-    impl From<Cube> for Mesh {
-        fn from(cube: Cube) -> Self {
-            let size = cube.size;
+    impl From<Cuboid> for Mesh {
+        fn from(sp: Cuboid) -> Self {
             let vertices = &[
-                // top (0., 0., size)
-                ([-size, -size, size], [0., 0., size], [0., 0.]),
-                ([size, -size, size], [0., 0., size], [size, 0.]),
-                ([size, size, size], [0., 0., size], [size, size]),
-                ([-size, size, size], [0., 0., size], [0., size]),
-                // bottom (0., 0., -size)
-                ([-size, size, -size], [0., 0., -size], [size, 0.]),
-                ([size, size, -size], [0., 0., -size], [0., 0.]),
-                ([size, -size, -size], [0., 0., -size], [0., size]),
-                ([-size, -size, -size], [0., 0., -size], [size, size]),
-                // right (size, 0., 0.)
-                ([size, -size, -size], [size, 0., 0.], [0., 0.]),
-                ([size, size, -size], [size, 0., 0.], [size, 0.]),
-                ([size, size, size], [size, 0., 0.], [size, size]),
-                ([size, -size, size], [size, 0., 0.], [0., size]),
-                // left (-size, 0., 0.)
-                ([-size, -size, size], [-size, 0., 0.], [size, 0.]),
-                ([-size, size, size], [-size, 0., 0.], [0., 0.]),
-                ([-size, size, -size], [-size, 0., 0.], [0., size]),
-                ([-size, -size, -size], [-size, 0., 0.], [size, size]),
-                // front (0., size, 0.)
-                ([size, size, -size], [0., size, 0.], [size, 0.]),
-                ([-size, size, -size], [0., size, 0.], [0., 0.]),
-                ([-size, size, size], [0., size, 0.], [0., size]),
-                ([size, size, size], [0., size, 0.], [size, size]),
-                // back (0., -size, 0.)
-                ([size, -size, size], [0., -size, 0.], [0., 0.]),
-                ([-size, -size, size], [0., -size, 0.], [size, 0.]),
-                ([-size, -size, -size], [0., -size, 0.], [size, size]),
-                ([size, -size, -size], [0., -size, 0.], [0., size]),
+                // Top
+                ([sp.min_x, sp.min_y, sp.max_z], [0., 0., 1.0], [0., 0.]),
+                ([sp.max_x, sp.min_y, sp.max_z], [0., 0., 1.0], [1.0, 0.]),
+                ([sp.max_x, sp.max_y, sp.max_z], [0., 0., 1.0], [1.0, 1.0]),
+                ([sp.min_x, sp.max_y, sp.max_z], [0., 0., 1.0], [0., 1.0]),
+                // Bottom
+                ([sp.min_x, sp.max_y, sp.min_z], [0., 0., -1.0], [1.0, 0.]),
+                ([sp.max_x, sp.max_y, sp.min_z], [0., 0., -1.0], [0., 0.]),
+                ([sp.max_x, sp.min_y, sp.min_z], [0., 0., -1.0], [0., 1.0]),
+                ([sp.min_x, sp.min_y, sp.min_z], [0., 0., -1.0], [1.0, 1.0]),
+                // Right
+                ([sp.max_x, sp.min_y, sp.min_z], [1.0, 0., 0.], [0., 0.]),
+                ([sp.max_x, sp.max_y, sp.min_z], [1.0, 0., 0.], [1.0, 0.]),
+                ([sp.max_x, sp.max_y, sp.max_z], [1.0, 0., 0.], [1.0, 1.0]),
+                ([sp.max_x, sp.min_y, sp.max_z], [1.0, 0., 0.], [0., 1.0]),
+                // Left
+                ([sp.min_x, sp.min_y, sp.max_z], [-1.0, 0., 0.], [1.0, 0.]),
+                ([sp.min_x, sp.max_y, sp.max_z], [-1.0, 0., 0.], [0., 0.]),
+                ([sp.min_x, sp.max_y, sp.min_z], [-1.0, 0., 0.], [0., 1.0]),
+                ([sp.min_x, sp.min_y, sp.min_z], [-1.0, 0., 0.], [1.0, 1.0]),
+                // Front
+                ([sp.max_x, sp.max_y, sp.min_z], [0., 1.0, 0.], [1.0, 0.]),
+                ([sp.min_x, sp.max_y, sp.min_z], [0., 1.0, 0.], [0., 0.]),
+                ([sp.min_x, sp.max_y, sp.max_z], [0., 1.0, 0.], [0., 1.0]),
+                ([sp.max_x, sp.max_y, sp.max_z], [0., 1.0, 0.], [1.0, 1.0]),
+                // Back
+                ([sp.max_x, sp.min_y, sp.max_z], [0., -1.0, 0.], [0., 0.]),
+                ([sp.min_x, sp.min_y, sp.max_z], [0., -1.0, 0.], [1.0, 0.]),
+                ([sp.min_x, sp.min_y, sp.min_z], [0., -1.0, 0.], [1.0, 1.0]),
+                ([sp.max_x, sp.min_y, sp.min_z], [0., -1.0, 0.], [0., 1.0]),
             ];
 
-            let mut positions = Vec::new();
-            let mut normals = Vec::new();
-            let mut uvs = Vec::new();
+            let mut positions = Vec::with_capacity(24);
+            let mut normals = Vec::with_capacity(24);
+            let mut uvs = Vec::with_capacity(24);
+
             for (position, normal, uv) in vertices.iter() {
                 positions.push(*position);
                 normals.push(*normal);

diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs
@@ -24,7 +24,7 @@ fn setup(
         })
         // cube
         .spawn(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+            mesh: meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0))),
             material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
             transform: Transform::from_translation(Vec3::new(0.0, 1.0, 0.0)),
             ..Default::default()

diff --git a/examples/3d/msaa.rs b/examples/3d/msaa.rs
@@ -21,7 +21,7 @@ fn setup(
     commands
         // cube
         .spawn(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+            mesh: meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0))),
             material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
             ..Default::default()
         })

diff --git a/examples/3d/parenting.rs b/examples/3d/parenting.rs
@@ -27,7 +27,7 @@ fn setup(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 1.0 }));
+    let cube_handle = meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0)));
     let cube_material_handle = materials.add(StandardMaterial {
         albedo: Color::rgb(0.8, 0.7, 0.6),
         ..Default::default()

diff --git a/examples/3d/spawner.rs b/examples/3d/spawner.rs
@@ -50,7 +50,7 @@ fn setup(
         });
 
     let mut rng = StdRng::from_entropy();
-    let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 1.0 }));
+    let cube_handle = meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0)));
     for _ in 0..10000 {
         commands.spawn(PbrBundle {
             mesh: cube_handle.clone(),

diff --git a/examples/3d/z_sort_debug.rs b/examples/3d/z_sort_debug.rs
@@ -46,7 +46,7 @@ fn setup(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 1.0 }));
+    let cube_handle = meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0)));
     commands
         // parent cube
         .spawn(PbrBundle {

diff --git a/examples/android/android.rs b/examples/android/android.rs
@@ -26,7 +26,7 @@ fn setup(
         })
         // cube
         .spawn(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+            mesh: meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0))),
             material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
             transform: Transform::from_translation(Vec3::new(0.0, 1.0, 0.0)),
             ..Default::default()

diff --git a/examples/ios/src/lib.rs b/examples/ios/src/lib.rs
@@ -31,7 +31,7 @@ fn setup(
         })
         // cube
         .spawn(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+            mesh: meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0))),
             material: materials.add(Color::rgb(0.5, 0.4, 0.3).into()),
             transform: Transform::from_translation(Vec3::new(0.0, 1.0, 0.0)),
             ..Default::default()

diff --git a/examples/shader/mesh_custom_attribute.rs b/examples/shader/mesh_custom_attribute.rs
@@ -83,7 +83,7 @@ fn setup(
     let material = materials.add(MyMaterialWithVertexColorSupport {});
 
     // create a generic cube
-    let mut cube_with_vertex_colors = Mesh::from(shape::Cube { size: 1.0 });
+    let mut cube_with_vertex_colors = Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0));
 
     // insert our custom color attribute with some nice colors!
     cube_with_vertex_colors.set_attribute(

diff --git a/examples/shader/shader_custom_material.rs b/examples/shader/shader_custom_material.rs
@@ -84,7 +84,7 @@ fn setup(
     commands
         // cube
         .spawn(MeshBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+            mesh: meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0))),
             render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
                 pipeline_handle,
             )]),

diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs
@@ -97,7 +97,7 @@ fn setup(
     });
 
     // Create a cube mesh which will use our materials
-    let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 1.0 }));
+    let cube_handle = meshes.add(Mesh::from(shape::Cuboid::new(1.0, 1.0, 1.0)));
 
     commands
         // cube