From 76c802bf3e90260bcfce20dd81caeed6f2cad681 Mon Sep 17 00:00:00 2001 From: Robin KAY Date: Fri, 16 Feb 2024 21:58:17 +0000 Subject: [PATCH] Update Bevy master commit hash. --- Cargo.toml | 4 ++-- src/lib.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index af24399..af3eb24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["gamedev", "bevy", "outline"] categories = ["game-engines", "rendering"] [dependencies] -bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "4ebc560dfb0fee5d3728d1d8f7362f484b784e4c", default-features = false, features = [ +bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "f83de49b7a9e2c6c3ac4e94b44bcc02806aa8e90", default-features = false, features = [ "bevy_asset", "bevy_render", "bevy_pbr", @@ -27,7 +27,7 @@ thiserror = "1.0" wgpu-types = "0.19" [dev-dependencies] -bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "4ebc560dfb0fee5d3728d1d8f7362f484b784e4c", default-features = false, features = [ +bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "f83de49b7a9e2c6c3ac4e94b44bcc02806aa8e90", default-features = false, features = [ "animation", "bevy_gltf", "bevy_pbr", diff --git a/src/lib.rs b/src/lib.rs index 800a012..ab01dc8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,7 @@ //! [`AutoGenerateOutlineNormalsPlugin`]. use bevy::asset::load_internal_asset; -use bevy::core_pipeline::core_3d::graph::{Labels3d, SubGraph3d}; +use bevy::core_pipeline::core_3d::graph::{Node3d, Core3d}; use bevy::prelude::*; use bevy::render::batching::{batch_and_prepare_render_phase, write_batched_instance_buffer}; use bevy::render::extract_component::{ @@ -36,7 +36,7 @@ use bevy::render::render_resource::{SpecializedMeshPipelines, VertexFormat}; use bevy::render::view::{RenderLayers, VisibilitySystems}; use bevy::render::{Render, RenderApp, RenderSet}; use bevy::transform::TransformSystem; -use bevy::ui::graph::LabelsUi; +use bevy::ui::graph::NodeUi; use interpolation::Lerp; use crate::draw::{ @@ -324,13 +324,13 @@ impl Plugin for OutlinePlugin { let mut graph = world.resource_mut::(); - let draw_3d_graph = graph.get_sub_graph_mut(SubGraph3d).unwrap(); + let draw_3d_graph = graph.get_sub_graph_mut(Core3d).unwrap(); draw_3d_graph.add_node(LabelsOutline::OutlinePass, node); // Run after main 3D pass, but before UI psss - draw_3d_graph.add_node_edge(Labels3d::EndMainPass, LabelsOutline::OutlinePass); + draw_3d_graph.add_node_edge(Node3d::EndMainPass, LabelsOutline::OutlinePass); #[cfg(feature = "bevy_ui")] - draw_3d_graph.add_node_edge(LabelsOutline::OutlinePass, LabelsUi::UiPass); + draw_3d_graph.add_node_edge(LabelsOutline::OutlinePass, NodeUi::UiPass); } fn finish(&self, app: &mut App) {