Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SquarePrism shape into mesh #377

Closed
wants to merge 7 commits into from
Closed

Add SquarePrism shape into mesh #377

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a4b70c
Add SquarePrism shape into mesh
Aug 27, 2020
416bde6
Format with cargo fmt
Aug 27, 2020
07736a4
Rename SquarePrism to RectangularPrism as it is not necessarily square
Aug 27, 2020
390b8ab
Change default the default prism shape from a cube to a rectangular p…
Aug 27, 2020
33829ba
Fix comments since the rename of SquarePrism into RectangularPrism
Aug 27, 2020
4f189df
Add a constructor with length, width and height to RectangularPrism
Aug 27, 2020
179cb81
Fix constructor division issue
Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 109 additions & 65 deletions crates/bevy_render/src/mesh/mesh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ pub mod shape {
use bevy_math::*;
use hexasphere::Hexasphere;

/// A cube.
/// A cube -> SquarePrism where all length of sides are the same.
pub struct Cube {
/// Half the side length of the cube.
pub size: f32,
Expand All @@ -190,67 +190,14 @@ pub mod shape {

impl From<Cube> for Mesh {
fn from(cube: Cube) -> Self {
let size = cube.size;
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]),
];

let mut positions = Vec::new();
let mut normals = Vec::new();
let mut uvs = Vec::new();
for (position, normal, uv) in vertices.iter() {
positions.push(*position);
normals.push(*normal);
uvs.push(*uv);
}

let indices = vec![
0, 1, 2, 2, 3, 0, // top
4, 5, 6, 6, 7, 4, // bottom
8, 9, 10, 10, 11, 8, // right
12, 13, 14, 14, 15, 12, // left
16, 17, 18, 18, 19, 16, // front
20, 21, 22, 22, 23, 20, // back
];

Mesh {
primitive_topology: PrimitiveTopology::TriangleList,
attributes: vec![
VertexAttribute::position(positions),
VertexAttribute::normal(normals),
VertexAttribute::uv(uvs),
],
indices: Some(indices),
}
Mesh::from(SquarePrism {
min_x: -cube.size,
max_x: cube.size,
min_y: -cube.size,
max_y: cube.size,
min_z: -cube.size,
max_z: cube.size
})
}
}

Expand Down Expand Up @@ -453,20 +400,117 @@ pub mod shape {
}
}
}

/// A Square prism. Just like a cube, but you can specify the dimensions.
pub struct SquarePrism {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be renamed RectangularPrism? A square prism would imply all sides are the same

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point!

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 Default for SquarePrism {
fn default() -> Self {
SquarePrism {
min_x: 0.0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In interest of keeping the translation around local (0, 0), should this be just length, width, and height, and not allow below 0?

I'm actually slightly surprised the cube shape isn't centered around (0, 0), dividing the size by 2 for the negative and positive, I'm not sure if that's intentional or not... but obviously that's nothing you changed

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll change it, it's probably better if the default is centred on 0,0,0. I will also change the shape, it should be a rectangular prism by default, not a cube.

max_x: 1.0,
min_y: 0.0,
max_y: 1.0,
min_z: 0.0,
max_z: 1.0,
}
}
}

impl From<SquarePrism> for Mesh {
fn from(rec: SquarePrism) -> Self {
// Position, Normals, UVs
let vertices = &[
// Top
([rec.min_x, rec.min_y, rec.max_z], [0.0, 0.0, 1.0], [0.0, 0.0]),
([rec.max_x, rec.min_y, rec.max_z], [0.0, 0.0, 1.0], [1.0, 0.0]),
([rec.max_x, rec.max_y, rec.max_z], [0.0, 0.0, 1.0], [1.0, 1.0]),
([rec.min_x, rec.max_y, rec.max_z], [0.0, 0.0, 1.0], [0.0, 1.0]),

// Bottom
([rec.min_x, rec.max_y, rec.min_z], [0.0, 0.0, -1.0], [1.0, 0.0]),
([rec.max_x, rec.max_y, rec.min_z], [0.0, 0.0, -1.0], [0.0, 0.0]),
([rec.max_x, rec.min_y, rec.min_z], [0.0, 0.0, -1.0], [0.0, 1.0]),
([rec.min_x, rec.min_y, rec.min_z], [0.0, 0.0, -1.0], [1.0, 1.0]),

// Right
([rec.max_x, rec.min_y, rec.min_z], [1.0, 0.0, 0.0], [0.0, 0.0]),
([rec.max_x, rec.max_y, rec.min_z], [1.0, 0.0, 0.0], [1.0, 0.0]),
([rec.max_x, rec.max_y, rec.max_z], [1.0, 0.0, 0.0], [1.0, 1.0]),
([rec.max_x, rec.min_y, rec.max_z], [1.0, 0.0, 0.0], [0.0, 1.0]),

// Left
([rec.min_x, rec.min_y, rec.max_z], [-1.0, 0.0, 0.0], [1.0, 0.0]),
([rec.min_x, rec.max_y, rec.max_z], [-1.0, 0.0, 0.0], [0.0, 0.0]),
([rec.min_x, rec.max_y, rec.min_z], [-1.0, 0.0, 0.0], [0.0, 1.0]),
([rec.min_x, rec.min_y, rec.min_z], [-1.0, 0.0, 0.0], [1.0, 1.0]),

// Front
([rec.max_x, rec.max_y, rec.min_z], [0.0, 1.0, 0.0], [1.0, 0.0]),
([rec.min_x, rec.max_y, rec.min_z], [0.0, 1.0, 0.0], [0.0, 0.0]),
([rec.min_x, rec.max_y, rec.max_z], [0.0, 1.0, 0.0], [0.0, 1.0]),
([rec.max_x, rec.max_y, rec.max_z], [0.0, 1.0, 0.0], [1.0, 1.0]),

// Back
([rec.max_x, rec.min_y, rec.max_z], [0.0, -1.0, 0.0], [0.0, 0.0]),
([rec.min_x, rec.min_y, rec.max_z], [0.0, -1.0, 0.0], [1.0, 0.0]),
([rec.min_x, rec.min_y, rec.min_z], [0.0, -1.0, 0.0], [1.0, 1.0]),
([rec.max_x, rec.min_y, rec.min_z], [0.0, -1.0, 0.0], [0.0, 1.0]),
];

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);
uvs.push(*uv);
}

let indices = vec![
0, 1, 2, 2, 3, 0, // top
4, 5, 6, 6, 7, 4, // bottom
8, 9, 10, 10, 11, 8, // right
12, 13, 14, 14, 15, 12, // left
16, 17, 18, 18, 19, 16, // front
20, 21, 22, 22, 23, 20, // back
];

Mesh {
primitive_topology: PrimitiveTopology::TriangleList,
attributes: vec![
VertexAttribute::position(positions),
VertexAttribute::normal(normals),
VertexAttribute::uv(uvs),
],
indices: Some(indices),
}
}
}
}

fn remove_current_mesh_resources(
render_resource_context: &dyn RenderResourceContext,
handle: Handle<Mesh>,
) {
if let Some(RenderResourceId::Buffer(buffer)) =
render_resource_context.get_asset_resource(handle, VERTEX_BUFFER_ASSET_INDEX)
render_resource_context.get_asset_resource(handle, VERTEX_BUFFER_ASSET_INDEX)
{
render_resource_context.remove_buffer(buffer);
render_resource_context.remove_asset_resource(handle, VERTEX_BUFFER_ASSET_INDEX);
}
if let Some(RenderResourceId::Buffer(buffer)) =
render_resource_context.get_asset_resource(handle, INDEX_BUFFER_ASSET_INDEX)
render_resource_context.get_asset_resource(handle, INDEX_BUFFER_ASSET_INDEX)
{
render_resource_context.remove_buffer(buffer);
render_resource_context.remove_asset_resource(handle, INDEX_BUFFER_ASSET_INDEX);
Expand Down Expand Up @@ -562,7 +606,7 @@ pub fn mesh_resource_provider_system(
}

if let Some(RenderResourceId::Buffer(vertex_buffer)) =
render_resource_context.get_asset_resource(*handle, VERTEX_BUFFER_ASSET_INDEX)
render_resource_context.get_asset_resource(*handle, VERTEX_BUFFER_ASSET_INDEX)
{
render_pipelines.bindings.set_vertex_buffer(
"Vertex",
Expand Down