diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml index 3f0efb1c21..d31fe7ef22 100644 --- a/crates/bevy_dev_tools/Cargo.toml +++ b/crates/bevy_dev_tools/Cargo.toml @@ -18,12 +18,14 @@ bevy_asset = { path = "../bevy_asset", version = "0.17.0-dev" } bevy_color = { path = "../bevy_color", version = "0.17.0-dev" } bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.17.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.17.0-dev" } bevy_picking = { path = "../bevy_picking", version = "0.17.0-dev" } bevy_render = { path = "../bevy_render", version = "0.17.0-dev" } bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev" } bevy_time = { path = "../bevy_time", version = "0.17.0-dev" } bevy_text = { path = "../bevy_text", version = "0.17.0-dev" } bevy_ui = { path = "../bevy_ui", version = "0.17.0-dev" } +bevy_ui_render = { path = "../bevy_ui_render", version = "0.17.0-dev" } bevy_window = { path = "../bevy_window", version = "0.17.0-dev" } bevy_state = { path = "../bevy_state", version = "0.17.0-dev" } diff --git a/crates/bevy_dev_tools/src/fps_overlay.rs b/crates/bevy_dev_tools/src/fps_overlay.rs index 478b94846d..435a0d2faf 100644 --- a/crates/bevy_dev_tools/src/fps_overlay.rs +++ b/crates/bevy_dev_tools/src/fps_overlay.rs @@ -19,8 +19,9 @@ use bevy_text::{Font, TextColor, TextFont, TextSpan}; use bevy_time::Time; use bevy_ui::{ widget::{Text, TextUiWriter}, - FlexDirection, GlobalZIndex, MaterialNode, Node, PositionType, Val, + FlexDirection, GlobalZIndex, Node, PositionType, Val, }; +use bevy_ui_render::prelude::MaterialNode; use core::time::Duration; use crate::frame_time_graph::{ diff --git a/crates/bevy_dev_tools/src/frame_time_graph/mod.rs b/crates/bevy_dev_tools/src/frame_time_graph/mod.rs index 37fe69d581..32f6c20006 100644 --- a/crates/bevy_dev_tools/src/frame_time_graph/mod.rs +++ b/crates/bevy_dev_tools/src/frame_time_graph/mod.rs @@ -1,7 +1,7 @@ //! Module containing logic for the frame time graph use bevy_app::{Plugin, Update}; -use bevy_asset::{load_internal_asset, weak_handle, Asset, Assets, Handle}; +use bevy_asset::{load_internal_asset, uuid_handle, Asset, Assets, Handle}; use bevy_diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin}; use bevy_ecs::system::{Res, ResMut}; use bevy_math::ops::log2; @@ -10,12 +10,12 @@ use bevy_render::{ render_resource::{AsBindGroup, Shader, ShaderRef, ShaderType}, storage::ShaderStorageBuffer, }; -use bevy_ui::{UiMaterial, UiMaterialPlugin}; +use bevy_ui_render::prelude::{UiMaterial, UiMaterialPlugin}; use crate::fps_overlay::FpsOverlayConfig; const FRAME_TIME_GRAPH_SHADER_HANDLE: Handle = - weak_handle!("4e38163a-5782-47a5-af52-d9161472ab59"); + uuid_handle!("4e38163a-5782-47a5-af52-d9161472ab59"); /// Plugin that sets up everything to render the frame time graph material pub struct FrameTimeGraphPlugin;