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

Fix pipeline name

Browse Source
This commit is contained in:
Carter Anderson 2020-02-17 19:15:28 -08:00
parent 57f798c0bd
commit a76b40bbb4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/custom_shader.rs
View File

@ -89,8 +89,7 @@ fn setup(world: &mut World) {
// red cube // red cube
.add_archetype(MeshEntity { .add_archetype(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
translation: Translation::new(0.0, 0.0, 1.0), ..Default::default()
..MeshEntity::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_archetype(CameraEntity {

4
src/render/render_graph/renderable.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
asset::{AssetStorage, Handle}, asset::{AssetStorage, Handle},
render::{render_graph::RenderGraph, Shader, ShaderSource}, render::{render_graph::{RenderGraph, resource_name}, Shader, ShaderSource},
}; };
use legion::prelude::*; use legion::prelude::*;
use std::collections::{HashMap, HashSet}; 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); let macroed_pipeline_handle = pipeline_descriptor_storage.add(macroed_pipeline);
// TODO: get correct pass name // 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 macroed_pipeline_handle
} else { } else {
pipeline_handle.clone() pipeline_handle.clone()