diff --git a/bevy_kayak_ui/src/render/unified/font/mod.rs b/bevy_kayak_ui/src/render/unified/font/mod.rs index 82a6e943d8d8be0c3d2ef0409cc60df6c2c9fd2a..b1783cd01b5db069a688c00c6f7e2cb43d95afdd 100644 --- a/bevy_kayak_ui/src/render/unified/font/mod.rs +++ b/bevy_kayak_ui/src/render/unified/font/mod.rs @@ -1,18 +1,13 @@ use bevy::{ - prelude::{ - AddAsset, AssetEvent, AssetServer, Assets, Commands, EventReader, Handle, Local, Plugin, - Res, ResMut, - }, + prelude::{Plugin, Res, ResMut}, render2::{ render_asset::RenderAssets, - render_resource::{FilterMode, TextureFormat, TextureUsages}, renderer::{RenderDevice, RenderQueue}, texture::Image, RenderApp, RenderStage, }, - utils::HashSet, }; -use kayak_font::{FontTextureCache, KayakFont, KayakFontPlugin}; +use kayak_font::{FontTextureCache, KayakFontPlugin}; mod extract; mod font_mapping; diff --git a/examples/counter.rs b/examples/counter.rs index 9f924cf90431730869a9bb1cbb636e7b3f85be01..4e5c163b199b5711d8466a687c966ed5d7e908af 100644 --- a/examples/counter.rs +++ b/examples/counter.rs @@ -7,7 +7,6 @@ use bevy::{ use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; use kayak_components::{Button, Text, Window}; use kayak_core::{ - context::KayakContext, styles::{Style, StyleProp, Units}, EventType, Index, OnEvent, }; diff --git a/examples/full_ui.rs b/examples/full_ui.rs index 46eba9fd22d293499b1546f14a9ab7027c4c3a3e..9eed459c4cd41a86d84a949fc6cc0acd2a0576ca 100644 --- a/examples/full_ui.rs +++ b/examples/full_ui.rs @@ -7,7 +7,6 @@ use bevy::{ use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, ImageManager, UICameraBundle}; use kayak_components::{NinePatch, Text}; use kayak_core::{ - context::KayakContext, layout_cache::Space, styles::{LayoutType, Style, StyleProp, Units}, widget, Children, EventType, Index, OnEvent, diff --git a/kayak_font/examples/bevy.rs b/kayak_font/examples/bevy.rs index 1521e46c3380ad132d082f1d92c3734196c1de71..25968860628eed43893d69a43184350cbedf8a9c 100644 --- a/kayak_font/examples/bevy.rs +++ b/kayak_font/examples/bevy.rs @@ -7,7 +7,6 @@ use kayak_font::{KayakFont, KayakFontPlugin}; fn startup(mut commands: Commands, asset_server: Res<AssetServer>) { let font_handle: Handle<KayakFont> = asset_server.load("roboto.kayak_font"); - dbg!(font_handle); } diff --git a/kayak_font/src/font.rs b/kayak_font/src/font.rs index 74e73d1e4148deec2aff3dcab76f9d8e1e63abd3..b50fedf55a56ec26649d734ece2a59838a0e93be 100644 --- a/kayak_font/src/font.rs +++ b/kayak_font/src/font.rs @@ -1,4 +1,4 @@ -use std::{collections::HashMap, path::PathBuf}; +use std::collections::HashMap; use bevy::{ asset::{AssetLoader, AssetPath, BoxedFuture, LoadContext, LoadedAsset}, diff --git a/kayak_font/src/lib.rs b/kayak_font/src/lib.rs index 23a4753158832f1ef4148a11e4938607e5e8852d..a9050ec1e493c2e3b5fcb0da5076c2a0a245dc68 100644 --- a/kayak_font/src/lib.rs +++ b/kayak_font/src/lib.rs @@ -12,7 +12,6 @@ use bevy::{ }, render2::{ render_resource::{FilterMode, TextureFormat, TextureUsages}, - renderer::{RenderDevice, RenderQueue}, texture::Image, RenderApp, RenderStage, }, diff --git a/kayak_font/src/renderer/font_texture_cache.rs b/kayak_font/src/renderer/font_texture_cache.rs index e170a25c29476f68ef7b7ec1b77e0fe46b2e272b..dfebc0dc6c4b5abd1f056283afd1f4e1bb9fb8a4 100644 --- a/kayak_font/src/renderer/font_texture_cache.rs +++ b/kayak_font/src/renderer/font_texture_cache.rs @@ -7,12 +7,11 @@ use bevy::{ render_resource::{ AddressMode, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindingResource, CommandEncoderDescriptor, Extent3d, FilterMode, ImageCopyTexture, - ImageDataLayout, Origin3d, SamplerDescriptor, TextureAspect, TextureDescriptor, - TextureDimension, TextureFormat, TextureUsages, TextureViewDescriptor, - TextureViewDimension, + Origin3d, SamplerDescriptor, TextureAspect, TextureDescriptor, TextureDimension, + TextureFormat, TextureUsages, TextureViewDescriptor, TextureViewDimension, }, renderer::{RenderDevice, RenderQueue}, - texture::{GpuImage, Image, TextureFormatPixelInfo}, + texture::{GpuImage, Image}, }, utils::HashMap, }; diff --git a/kayak_font/src/sdf.rs b/kayak_font/src/sdf.rs index 485e21398444669f41e9060575b43649917fccae..f8000bbbe8fdbff0c81b78de1dc06b133df135d9 100644 --- a/kayak_font/src/sdf.rs +++ b/kayak_font/src/sdf.rs @@ -1,4 +1,4 @@ -use crate::{atlas::Atlas, glyph::Glyph, metrics::Metrics, SDFType}; +use crate::{atlas::Atlas, glyph::Glyph, metrics::Metrics}; use bevy::math::Vec2; use serde::Deserialize; @@ -68,6 +68,7 @@ impl Sdf { #[test] fn test_sdf_loader() { + use crate::SDFType; let sdf = Sdf::from_string(include_str!("../assets/roboto.kayak_font").to_string()); assert!(sdf.max_glyph_size() == Vec2::new(30.0, 36.0)); assert!(sdf.atlas.width == 212);