diff --git a/examples/custom_shader.rs b/examples/custom_shader.rs index 0e47b106a6..8c97c83a5e 100644 --- a/examples/custom_shader.rs +++ b/examples/custom_shader.rs @@ -89,8 +89,7 @@ fn setup(world: &mut World) { // red cube .add_archetype(MeshEntity { mesh: cube_handle, - translation: Translation::new(0.0, 0.0, 1.0), - ..MeshEntity::default() + ..Default::default() }) // camera .add_archetype(CameraEntity { diff --git a/src/render/render_graph/renderable.rs b/src/render/render_graph/renderable.rs index c3e9b06e73..474591dfb1 100644 --- a/src/render/render_graph/renderable.rs +++ b/src/render/render_graph/renderable.rs @@ -1,6 +1,6 @@ use crate::{ asset::{AssetStorage, Handle}, - render::{render_graph::RenderGraph, Shader, ShaderSource}, + render::{render_graph::{RenderGraph, resource_name}, Shader, ShaderSource}, }; use legion::prelude::*; use std::collections::{HashMap, HashSet}; @@ -117,7 +117,7 @@ pub fn update_shader_assignments(world: &mut World, render_graph: &mut RenderGra let macroed_pipeline_handle = pipeline_descriptor_storage.add(macroed_pipeline); // TODO: get correct pass name - render_graph.add_pipeline("main", macroed_pipeline_handle.clone()); + render_graph.add_pipeline(resource_name::pass::MAIN, macroed_pipeline_handle.clone()); macroed_pipeline_handle } else { pipeline_handle.clone()