From 07ba56c6cf3e155a3a91aee5fa39c5261ddbd142 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Mon, 27 Jan 2020 01:44:02 -0800 Subject: [PATCH] add plane to example --- examples/simple_new_graph.rs | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/examples/simple_new_graph.rs b/examples/simple_new_graph.rs index 661ee1afa5..aff984b4f9 100644 --- a/examples/simple_new_graph.rs +++ b/examples/simple_new_graph.rs @@ -35,14 +35,27 @@ fn setup(world: &mut World) { indices_2.insert("StandardMaterial".to_string(), 256); indices_2.insert("Object".to_string(), 256); + let mut indices_3 = std::collections::HashMap::new(); + indices_3.insert("StandardMaterial".to_string(), 512); + indices_3.insert("Object".to_string(), 512); + world.build() // plane - // .add_archetype(MeshEntity { - // mesh: plane_handle.clone(), - // material: Material::new(Albedo::Color(math::vec4(0.1, 0.2, 0.1, 1.0))), - // local_to_world: LocalToWorld::identity(), - // translation: Translation::new(0.0, 0.0, 0.0), - // }) + .add_archetype(NewMeshEntity { + mesh: plane_handle.clone(), + material: StandardMaterial { + albedo: math::vec4(0.1, 0.2, 0.1, 1.0), + }, + shader_uniforms: ShaderUniforms { + uniform_selectors: vec![ + uniform_selector::, + uniform_selector::, + ], + dynamic_uniform_indices: indices, + }, + local_to_world: LocalToWorld::identity(), + translation: Translation::new(0.0, 0.0, 0.0), + }) // cube .add_archetype(NewMeshEntity { mesh: cube_handle.clone(), @@ -54,7 +67,7 @@ fn setup(world: &mut World) { uniform_selector::, uniform_selector::, ], - dynamic_uniform_indices: indices, + dynamic_uniform_indices: indices_2, }, local_to_world: LocalToWorld::identity(), translation: Translation::new(0.0, 0.0, 1.0), @@ -69,7 +82,7 @@ fn setup(world: &mut World) { uniform_selector::, uniform_selector::, ], - dynamic_uniform_indices: indices_2, + dynamic_uniform_indices: indices_3, }, local_to_world: LocalToWorld::identity(), translation: Translation::new(-2.0, 0.0, 1.0),