Adds clipping!

kayak_font/Cargo.toml

@@ -7,9 +7,9 @@ edition = "2021"
 
 [dependencies]
 anyhow = { version = "1.0" }
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" }
+bevy = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
 bytemuck = "1.7.2"
-crevice = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" }
+crevice = { git = "https://github.com/StarArawn/bevy", rev = "bcca341d696c66d0173d8b0ac7a1b23b4b9e775c" }
 serde = "1.0"
 serde_json = "1.0"
 serde_path_to_error = "0.1"

kayak_font/examples/bevy.rs

 use bevy::{
     math::Vec2,
     prelude::{App as BevyApp, AssetServer, Commands, Handle, Res},
-    render2::{camera::OrthographicCameraBundle, color::Color},
+    render::{camera::OrthographicCameraBundle, color::Color},
     window::WindowDescriptor,
-    PipelinedDefaultPlugins,
+    DefaultPlugins,
 };
 use kayak_font::{Alignment, KayakFont, KayakFontPlugin};
 
@@ -64,7 +64,7 @@ fn main() {
             title: String::from("UI Example"),
             ..Default::default()
         })
-        .add_plugins(PipelinedDefaultPlugins)
+        .add_plugins(DefaultPlugins)
         .add_plugin(KayakFontPlugin)
         .add_plugin(FontRenderPlugin)
         .add_startup_system(startup)

kayak_font/examples/renderer/extract.rs

 use bevy::{
     prelude::{Assets, Commands, Handle, Query, Res},
-    sprite2::Rect,
+    sprite::Rect,
 };
 use kayak_font::{CoordinateSystem, KayakFont};
 

kayak_font/examples/renderer/mod.rs

@@ -2,7 +2,7 @@ use bevy::{
     core_pipeline::Transparent2d,
     prelude::{Assets, HandleUntyped, Plugin, Res, ResMut},
     reflect::TypeUuid,
-    render2::{
+    render::{
         render_asset::RenderAssets,
         render_phase::DrawFunctions,
         render_resource::Shader,

kayak_font/examples/renderer/pipeline.rs

@@ -7,7 +7,7 @@ use bevy::{
     },
     math::{const_vec3, Mat4, Quat, Vec2, Vec3, Vec4},
     prelude::{Bundle, Component, Entity, FromWorld, Handle, Query, Res, ResMut, World},
-    render2::{
+    render::{
         color::Color,
         render_phase::{Draw, DrawFunctions, RenderPhase, TrackedRenderPass},
         render_resource::{
@@ -24,7 +24,7 @@ use bevy::{
         texture::{BevyDefault, GpuImage},
         view::{ViewUniformOffset, ViewUniforms},
     },
-    sprite2::Rect,
+    sprite::Rect,
 };
 use bytemuck::{Pod, Zeroable};
 use crevice::std140::AsStd140;

kayak_font/examples/renderer/text.rs

-use bevy::{math::Vec2, prelude::Component, render2::color::Color};
+use bevy::{math::Vec2, prelude::Component, render::color::Color};
 use kayak_font::Alignment;
 
 #[derive(Component)]

kayak_font/src/font.rs

@@ -5,7 +5,7 @@ use bevy::{
     math::Vec2,
     prelude::Handle,
     reflect::TypeUuid,
-    render2::texture::Image,
+    render::texture::Image,
 };
 
 use crate::Sdf;

kayak_font/src/lib.rs

@@ -10,7 +10,7 @@ use bevy::{
     prelude::{
         AddAsset, AssetEvent, Assets, Commands, EventReader, Handle, Local, Plugin, Res, ResMut,
     },
-    render2::{
+    render::{
         render_resource::{FilterMode, TextureFormat, TextureUsages},
         texture::Image,
         RenderApp, RenderStage,

kayak_font/src/renderer/font_texture_cache.rs

@@ -2,7 +2,7 @@ use crate::{KayakFont, Sdf};
 use bevy::{
     math::Vec2,
     prelude::{Handle, Res},
-    render2::{
+    render::{
         render_asset::RenderAssets,
         render_resource::{
             AddressMode, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout,
@@ -139,7 +139,7 @@ impl FontTextureCache {
             label: Some("font_texture_array_view"),
             format: Some(format),
             dimension: Some(TextureViewDimension::D2Array),
-            aspect: bevy::render2::render_resource::TextureAspect::All,
+            aspect: bevy::render::render_resource::TextureAspect::All,
             base_mip_level: 0,
             base_array_layer: 0,
             mip_level_count: None,
@@ -179,7 +179,7 @@ impl FontTextureCache {
             label: Some("font_texture_array_view"),
             format: None,
             dimension: Some(TextureViewDimension::D2Array),
-            aspect: bevy::render2::render_resource::TextureAspect::All,
+            aspect: bevy::render::render_resource::TextureAspect::All,
             base_mip_level: 0,
             base_array_layer: 0,
             mip_level_count: None,