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

Mesh: added static and dynamic mesh for less runtime memory usage #1782

Closed
wants to merge 9 commits into from
Closed

Mesh: added static and dynamic mesh for less runtime memory usage #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6511cac
initial commit
Mar 28, 2021
100a832
clippy + name changes
Mar 28, 2021
f840a09
improved warning message
Mar 28, 2021
84105c2
improved naming + use warn! macro
Mar 29, 2021
535ce48
Update mesh.rs
Mar 29, 2021
85266d0
Update mesh.rs
Mar 29, 2021
7d95fb1
mesh API v2
Mar 30, 2021
50bfbb5
Update mesh.rs
Mar 30, 2021
62da0d7
Update mesh.rs
Mar 30, 2021
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
14 changes: 8 additions & 6 deletions crates/bevy_gltf/src/loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use std::{
use thiserror::Error;

use crate::{Gltf, GltfNode};
use bevy_render::mesh::MeshData;

/// An error that occurs when loading a GLTF file
#[derive(Error, Debug)]
Expand Down Expand Up @@ -112,40 +113,41 @@ async fn load_gltf<'a, 'b>(
let reader = primitive.reader(|buffer| Some(&buffer_data[buffer.index()]));
let primitive_topology = get_primitive_topology(primitive.mode())?;

let mut mesh = Mesh::new(primitive_topology);
let mut mesh_data = MeshData::default();

if let Some(vertex_attribute) = reader
.read_positions()
.map(|v| VertexAttributeValues::Float3(v.collect()))
{
mesh.set_attribute(Mesh::ATTRIBUTE_POSITION, vertex_attribute);
mesh_data.set_attribute(MeshData::ATTRIBUTE_POSITION, vertex_attribute);
}

if let Some(vertex_attribute) = reader
.read_normals()
.map(|v| VertexAttributeValues::Float3(v.collect()))
{
mesh.set_attribute(Mesh::ATTRIBUTE_NORMAL, vertex_attribute);
mesh_data.set_attribute(MeshData::ATTRIBUTE_NORMAL, vertex_attribute);
}

if let Some(vertex_attribute) = reader
.read_tangents()
.map(|v| VertexAttributeValues::Float4(v.collect()))
{
mesh.set_attribute(Mesh::ATTRIBUTE_TANGENT, vertex_attribute);
mesh_data.set_attribute(MeshData::ATTRIBUTE_TANGENT, vertex_attribute);
}

if let Some(vertex_attribute) = reader
.read_tex_coords(0)
.map(|v| VertexAttributeValues::Float2(v.into_f32().collect()))
{
mesh.set_attribute(Mesh::ATTRIBUTE_UV_0, vertex_attribute);
mesh_data.set_attribute(MeshData::ATTRIBUTE_UV_0, vertex_attribute);
}

if let Some(indices) = reader.read_indices() {
mesh.set_indices(Some(Indices::U32(indices.into_u32().collect())));
mesh_data.set_indices(Some(Indices::U32(indices.into_u32().collect())));
};

let mesh = Mesh::new_static(primitive_topology, mesh_data);
let mesh = load_context.set_labeled_asset(&primitive_label, LoadedAsset::new(mesh));
primitives.push(super::GltfPrimitive {
mesh,
Expand Down
Loading