forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to u32 indices by default (#572)

Browse Source
This commit is contained in:
Gray Olson 2020-09-25 14:29:30 -07:00 committed by GitHub
parent c2299c7563
commit afc656701d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/bevy_gltf/src/loader.rs
View File

@ -5,10 +5,7 @@ use bevy_render::{
use anyhow::Result; use anyhow::Result;
use bevy_asset::AssetLoader; use bevy_asset::AssetLoader;
use gltf::{ use gltf::{buffer::Source, mesh::Mode};
buffer::Source,
mesh::{util::ReadIndices, Mode},
};
use std::{fs, io, path::Path}; use std::{fs, io, path::Path};
use thiserror::Error; use thiserror::Error;
@ -101,12 +98,8 @@ fn load_node(buffer_data: &[Vec<u8>], node: &gltf::Node, depth: i32) -> Result<M
} }
if let Some(indices) = reader.read_indices() { if let Some(indices) = reader.read_indices() {
mesh.indices = match indices { mesh.indices = Some(Indices::U32(indices.into_u32().collect()));
ReadIndices::U8(iter) => Some(Indices::U16(iter.map(|i| i as u16).collect())), }
ReadIndices::U16(iter) => Some(Indices::U16(iter.collect())),
ReadIndices::U32(iter) => Some(Indices::U32(iter.collect())),
}
};
return Ok(mesh); return Ok(mesh);
} }

6
crates/bevy_render/src/mesh/mesh.rs
View File

@ -237,7 +237,7 @@ pub mod shape {
uvs.push(*uv); uvs.push(*uv);
} }
let indices = Indices::U16(vec![ let indices = Indices::U32(vec![
0, 1, 2, 2, 3, 0, // top 0, 1, 2, 2, 3, 0, // top
4, 5, 6, 6, 7, 4, // bottom 4, 5, 6, 6, 7, 4, // bottom
8, 9, 10, 10, 11, 8, // right 8, 9, 10, 10, 11, 8, // right
@ -333,7 +333,7 @@ pub mod shape {
] ]
}; };
let indices = Indices::U16(vec![0, 2, 1, 0, 3, 2]); let indices = Indices::U32(vec![0, 2, 1, 0, 3, 2]);
let mut positions = Vec::new(); let mut positions = Vec::new();
let mut normals = Vec::new(); let mut normals = Vec::new();
@ -373,7 +373,7 @@ pub mod shape {
([-extent, 0.0, -extent], [0.0, 1.0, 0.0], [0.0, 1.0]), ([-extent, 0.0, -extent], [0.0, 1.0, 0.0], [0.0, 1.0]),
]; ];
let indices = Indices::U16(vec![0, 2, 1, 0, 3, 2]); let indices = Indices::U32(vec![0, 2, 1, 0, 3, 2]);
let mut positions = Vec::new(); let mut positions = Vec::new();
let mut normals = Vec::new(); let mut normals = Vec::new();

4
crates/bevy_render/src/pipeline/pipeline.rs
View File

@ -55,7 +55,7 @@ impl PipelineDescriptor {
shader_stages, shader_stages,
rasterization_state: None, rasterization_state: None,
primitive_topology: PrimitiveTopology::TriangleList, primitive_topology: PrimitiveTopology::TriangleList,
index_format: IndexFormat::Uint16, index_format: IndexFormat::Uint32,
sample_count: 1, sample_count: 1,
sample_mask: !0, sample_mask: !0,
alpha_to_coverage_enabled: false, alpha_to_coverage_enabled: false,
@ -67,7 +67,7 @@ impl PipelineDescriptor {
name: None, name: None,
primitive_topology: PrimitiveTopology::TriangleList, primitive_topology: PrimitiveTopology::TriangleList,
layout: None, layout: None,
index_format: IndexFormat::Uint16, index_format: IndexFormat::Uint32,
sample_count: 1, sample_count: 1,
sample_mask: !0, sample_mask: !0,
alpha_to_coverage_enabled: false, alpha_to_coverage_enabled: false,

2
crates/bevy_render/src/pipeline/pipeline_compiler.rs
View File

@ -27,7 +27,7 @@ impl Default for PipelineSpecialization {
shader_specialization: Default::default(), shader_specialization: Default::default(),
primitive_topology: Default::default(), primitive_topology: Default::default(),
dynamic_bindings: Default::default(), dynamic_bindings: Default::default(),
index_format: IndexFormat::Uint16, index_format: IndexFormat::Uint32,
} }
} }
} }

2
crates/bevy_render/src/pipeline/render_pipelines.rs
View File

@ -88,7 +88,7 @@ pub fn draw_render_pipelines_system(
let (index_range, index_format) = match mesh.indices.as_ref() { let (index_range, index_format) = match mesh.indices.as_ref() {
Some(Indices::U32(indices)) => (Some(0..indices.len() as u32), IndexFormat::Uint32), Some(Indices::U32(indices)) => (Some(0..indices.len() as u32), IndexFormat::Uint32),
Some(Indices::U16(indices)) => (Some(0..indices.len() as u32), IndexFormat::Uint16), Some(Indices::U16(indices)) => (Some(0..indices.len() as u32), IndexFormat::Uint16),
None => (None, IndexFormat::Uint16), None => (None, IndexFormat::Uint32),
}; };
let render_pipelines = &mut *render_pipelines; let render_pipelines = &mut *render_pipelines;

2
crates/bevy_render/src/pipeline/state_descriptors.rs
View File

@ -190,6 +190,6 @@ pub enum IndexFormat {
impl Default for IndexFormat { impl Default for IndexFormat {
fn default() -> Self { fn default() -> Self {
IndexFormat::Uint16 IndexFormat::Uint32
} }
} }