Skip to content
Snippets Groups Projects
Commit 0aac503c authored by StarArawn's avatar StarArawn
Browse files

The start of cleaning up font stuff..

parent 5134cd94
No related branches found
No related tags found
No related merge requests found
...@@ -202,7 +202,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ...@@ -202,7 +202,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]] [[package]]
name = "bevy" name = "bevy"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_internal", "bevy_internal",
] ]
...@@ -216,7 +216,7 @@ checksum = "0d5f2f58f0aec3c50a20799792c3705e80dd7df327e79791cacec197e84e5e61" ...@@ -216,7 +216,7 @@ checksum = "0d5f2f58f0aec3c50a20799792c3705e80dd7df327e79791cacec197e84e5e61"
[[package]] [[package]]
name = "bevy_app" name = "bevy_app"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_derive", "bevy_derive",
"bevy_ecs", "bevy_ecs",
...@@ -229,7 +229,7 @@ dependencies = [ ...@@ -229,7 +229,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_asset" name = "bevy_asset"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -256,7 +256,7 @@ dependencies = [ ...@@ -256,7 +256,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_audio" name = "bevy_audio"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -271,7 +271,7 @@ dependencies = [ ...@@ -271,7 +271,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_core" name = "bevy_core"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_derive", "bevy_derive",
...@@ -286,7 +286,7 @@ dependencies = [ ...@@ -286,7 +286,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_core_pipeline" name = "bevy_core_pipeline"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -298,7 +298,7 @@ dependencies = [ ...@@ -298,7 +298,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_derive" name = "bevy_derive"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"bevy_macro_utils", "bevy_macro_utils",
...@@ -309,7 +309,7 @@ dependencies = [ ...@@ -309,7 +309,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_diagnostic" name = "bevy_diagnostic"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_core", "bevy_core",
...@@ -321,7 +321,7 @@ dependencies = [ ...@@ -321,7 +321,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ecs" name = "bevy_ecs"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"bevy_ecs_macros", "bevy_ecs_macros",
...@@ -338,7 +338,7 @@ dependencies = [ ...@@ -338,7 +338,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ecs_macros" name = "bevy_ecs_macros"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2 1.0.32", "proc-macro2 1.0.32",
...@@ -349,7 +349,7 @@ dependencies = [ ...@@ -349,7 +349,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gilrs" name = "bevy_gilrs"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
...@@ -361,7 +361,7 @@ dependencies = [ ...@@ -361,7 +361,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gltf2" name = "bevy_gltf2"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
...@@ -386,7 +386,7 @@ dependencies = [ ...@@ -386,7 +386,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_input" name = "bevy_input"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
...@@ -397,7 +397,7 @@ dependencies = [ ...@@ -397,7 +397,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_internal" name = "bevy_internal"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -440,7 +440,6 @@ dependencies = [ ...@@ -440,7 +440,6 @@ dependencies = [
"crevice", "crevice",
"kayak_components", "kayak_components",
"kayak_core", "kayak_core",
"kayak_font",
"kayak_render_macros", "kayak_render_macros",
"serde", "serde",
"serde_json", "serde_json",
...@@ -450,7 +449,7 @@ dependencies = [ ...@@ -450,7 +449,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_log" name = "bevy_log"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"android_log-sys", "android_log-sys",
"bevy_app", "bevy_app",
...@@ -464,7 +463,7 @@ dependencies = [ ...@@ -464,7 +463,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_macro_utils" name = "bevy_macro_utils"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"cargo-manifest", "cargo-manifest",
"quote 1.0.10", "quote 1.0.10",
...@@ -474,7 +473,7 @@ dependencies = [ ...@@ -474,7 +473,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_math" name = "bevy_math"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_reflect", "bevy_reflect",
"glam", "glam",
...@@ -483,7 +482,7 @@ dependencies = [ ...@@ -483,7 +482,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_pbr" name = "bevy_pbr"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -499,7 +498,7 @@ dependencies = [ ...@@ -499,7 +498,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_pbr2" name = "bevy_pbr2"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -520,7 +519,7 @@ dependencies = [ ...@@ -520,7 +519,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_reflect" name = "bevy_reflect"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_reflect_derive", "bevy_reflect_derive",
"bevy_utils", "bevy_utils",
...@@ -536,7 +535,7 @@ dependencies = [ ...@@ -536,7 +535,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_reflect_derive" name = "bevy_reflect_derive"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2 1.0.32", "proc-macro2 1.0.32",
...@@ -548,7 +547,7 @@ dependencies = [ ...@@ -548,7 +547,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_render" name = "bevy_render"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy-glsl-to-spirv", "bevy-glsl-to-spirv",
...@@ -578,7 +577,7 @@ dependencies = [ ...@@ -578,7 +577,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_render2" name = "bevy_render2"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -611,7 +610,7 @@ dependencies = [ ...@@ -611,7 +610,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_scene" name = "bevy_scene"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -629,7 +628,7 @@ dependencies = [ ...@@ -629,7 +628,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_sprite" name = "bevy_sprite"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -652,7 +651,7 @@ dependencies = [ ...@@ -652,7 +651,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_sprite2" name = "bevy_sprite2"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -676,7 +675,7 @@ dependencies = [ ...@@ -676,7 +675,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_tasks" name = "bevy_tasks"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-executor", "async-executor",
...@@ -689,7 +688,7 @@ dependencies = [ ...@@ -689,7 +688,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_text" name = "bevy_text"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"anyhow", "anyhow",
...@@ -711,7 +710,7 @@ dependencies = [ ...@@ -711,7 +710,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_transform" name = "bevy_transform"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
...@@ -724,7 +723,7 @@ dependencies = [ ...@@ -724,7 +723,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ui" name = "bevy_ui"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -748,7 +747,7 @@ dependencies = [ ...@@ -748,7 +747,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_utils" name = "bevy_utils"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"ahash", "ahash",
"bevy_derive", "bevy_derive",
...@@ -761,7 +760,7 @@ dependencies = [ ...@@ -761,7 +760,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_wgpu" name = "bevy_wgpu"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -782,7 +781,7 @@ dependencies = [ ...@@ -782,7 +781,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_window" name = "bevy_window"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_math", "bevy_math",
...@@ -794,7 +793,7 @@ dependencies = [ ...@@ -794,7 +793,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_winit" name = "bevy_winit"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"approx", "approx",
"bevy_app", "bevy_app",
...@@ -1209,7 +1208,7 @@ dependencies = [ ...@@ -1209,7 +1208,7 @@ dependencies = [
[[package]] [[package]]
name = "crevice" name = "crevice"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"crevice-derive", "crevice-derive",
...@@ -1220,7 +1219,7 @@ dependencies = [ ...@@ -1220,7 +1219,7 @@ dependencies = [
[[package]] [[package]]
name = "crevice-derive" name = "crevice-derive"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/StarArawn/bevy?rev=f3c82f2b0091aefa832ab45eaf15c2be2faa0785#f3c82f2b0091aefa832ab45eaf15c2be2faa0785" source = "git+https://github.com/bevyengine/bevy?rev=38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c#38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c"
dependencies = [ dependencies = [
"proc-macro2 1.0.32", "proc-macro2 1.0.32",
"quote 1.0.10", "quote 1.0.10",
......
...@@ -17,5 +17,5 @@ kayak_components = { path = "kayak_components" } ...@@ -17,5 +17,5 @@ kayak_components = { path = "kayak_components" }
kayak_core = { path = "kayak_core" } kayak_core = { path = "kayak_core" }
[dev-dependencies] [dev-dependencies]
bevy = { git = "https://github.com/StarArawn/bevy", rev = "f3c82f2b0091aefa832ab45eaf15c2be2faa0785" } bevy = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" }
bevy_kayak_ui = { path = "bevy_kayak_ui" } bevy_kayak_ui = { path = "bevy_kayak_ui" }
...@@ -5,12 +5,12 @@ edition = "2021" ...@@ -5,12 +5,12 @@ edition = "2021"
[dependencies] [dependencies]
bytemuck = "1.7.2" bytemuck = "1.7.2"
bevy = { git = "https://github.com/StarArawn/bevy", rev = "f3c82f2b0091aefa832ab45eaf15c2be2faa0785" } bevy = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" }
kayak_core = { path = "../kayak_core" } kayak_core = { path = "../kayak_core" }
kayak_components = { path = "../kayak_components" } kayak_components = { path = "../kayak_components" }
kayak_render_macros = { path = "../kayak_render_macros" } kayak_render_macros = { path = "../kayak_render_macros" }
kayak_font = { path = "../kayak_font" } #kayak_font = { path = "../kayak_font" }
crevice = { git = "https://github.com/StarArawn/bevy", rev = "f3c82f2b0091aefa832ab45eaf15c2be2faa0785" } crevice = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" }
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_path_to_error = "0.1" serde_path_to_error = "0.1"
use bevy::{ use bevy::{
core_pipeline::{node::MAIN_PASS_DRIVER, MainPass2dNode},
prelude::{Commands, Plugin, Res}, prelude::{Commands, Plugin, Res},
render2::{ render2::{
camera::ActiveCameras, camera::ActiveCameras,
...@@ -70,6 +71,9 @@ impl Plugin for BevyKayakUIRenderPlugin { ...@@ -70,6 +71,9 @@ impl Plugin for BevyKayakUIRenderPlugin {
graph graph
.add_node_edge(node::UI_PASS_DEPENDENCIES, node::UI_PASS_DRIVER) .add_node_edge(node::UI_PASS_DEPENDENCIES, node::UI_PASS_DRIVER)
.unwrap(); .unwrap();
graph
.add_node_edge(MAIN_PASS_DRIVER, node::UI_PASS_DRIVER)
.unwrap();
app.add_plugin(UnifiedRenderPlugin); app.add_plugin(UnifiedRenderPlugin);
} }
......
...@@ -75,7 +75,7 @@ impl Node for MainPassUINode { ...@@ -75,7 +75,7 @@ impl Node for MainPassUINode {
view: &target.view, view: &target.view,
resolve_target: None, resolve_target: None,
ops: Operations { ops: Operations {
load: LoadOp::Clear(clear_color.0.into()), load: LoadOp::Load, //Clear(clear_color.0.into()),
store: true, store: true,
}, },
}], }],
......
...@@ -43,64 +43,12 @@ pub fn extract_texts( ...@@ -43,64 +43,12 @@ pub fn extract_texts(
}; };
let font_handle = font_mapping.get_handle(font).unwrap(); let font_handle = font_mapping.get_handle(font).unwrap();
let new_chars = {
let font = fonts.get(font_handle.clone()).unwrap();
font.font.check_chars(content.chars())
};
// Filter out non-renderable spaces.
let new_chars: Vec<_> = new_chars.into_iter().filter(|c| *c != ' ').collect();
// Add chars to font.
if new_chars.len() > 0 {
let font = fonts.get_mut(font_handle.clone()).unwrap();
for c in new_chars {
font.font.add_character(c);
}
}
let font = fonts.get(font_handle.clone()).unwrap(); let font = fonts.get(font_handle.clone()).unwrap();
let max_glyph_size = font let max_glyph_size = font.sdf.max_glyph_size();
.sdf
.as_ref()
.and_then(|sdf| Some(sdf.max_glyph_size()))
.unwrap_or_default();
// let char_layouts = font.font.get_layout(
// content,
// font_size,
// font.sdf.as_ref().unwrap().atlas.size,
// (max_glyph_size.x, max_glyph_size.y),
// );
// let font_scale = font_size / font.font.units_per_em() as f32;
// for (c, (x, y), (width, height)) in char_layouts {
// // let size = font.font.get_size(c, font_size);
// let position_x = layout.posx + x;
// let position_y = layout.posy + y;
// extracted_texts.push(ExtractQuadBundle {
// extracted_quad: ExtractedQuad {
// font_handle: Some(font_handle.clone()),
// rect: Rect {
// min: Vec2::new(position_x, position_y),
// max: Vec2::new(position_x + width, position_y + height),
// },
// color: to_bevy_color(background_color),
// vertex_index: 0,
// char_id: font.font.get_char_id(c),
// z_index: layout.z_index,
// quad_type: UIQuadType::Text,
// type_index: 0,
// border_radius: (0.0, 0.0, 0.0, 0.0),
// },
// });
// }
let mut x = 0.0; let mut x = 0.0;
for c in content.chars() { for c in content.chars() {
if let Some(glyph) = font if let Some(glyph) = font.sdf.glyphs.iter().find(|glyph| glyph.unicode == c) {
.sdf
.as_ref()
.unwrap()
.glyphs
.iter()
.find(|glyph| glyph.unicode == c)
{
let plane_bounds = glyph.plane_bounds.as_ref(); let plane_bounds = glyph.plane_bounds.as_ref();
let (left, top, _width, _height) = match plane_bounds { let (left, top, _width, _height) = match plane_bounds {
Some(val) => ( Some(val) => (
...@@ -112,7 +60,7 @@ pub fn extract_texts( ...@@ -112,7 +60,7 @@ pub fn extract_texts(
None => (0.0, 0.0, 0.0, 0.0), None => (0.0, 0.0, 0.0, 0.0),
}; };
let font_ratio = font_size / font.sdf.as_ref().unwrap().atlas.size; let font_ratio = font_size / font.sdf.atlas.size;
let resized_max_glyph_size = let resized_max_glyph_size =
(max_glyph_size.x * font_ratio, max_glyph_size.y * font_ratio); (max_glyph_size.x * font_ratio, max_glyph_size.y * font_ratio);
...@@ -130,7 +78,7 @@ pub fn extract_texts( ...@@ -130,7 +78,7 @@ pub fn extract_texts(
}, },
color: to_bevy_color(background_color), color: to_bevy_color(background_color),
vertex_index: 0, vertex_index: 0,
char_id: font.font.get_char_id(c), char_id: font.get_char_id(c).unwrap(),
z_index: layout.z_index, z_index: layout.z_index,
quad_type: UIQuadType::Text, quad_type: UIQuadType::Text,
type_index: 0, type_index: 0,
......
use bevy::{prelude::Handle, reflect::TypeUuid, render2::texture::Image}; use std::collections::HashMap;
use kayak_font::Font;
use super::sdf::Sdf; use super::sdf::Sdf;
use bevy::{prelude::Handle, reflect::TypeUuid, render2::texture::Image};
#[derive(Debug, Clone, TypeUuid)] #[derive(Debug, Clone, TypeUuid)]
#[uuid = "4fe4732c-6731-49bb-bafc-4690d636b848"] #[uuid = "4fe4732c-6731-49bb-bafc-4690d636b848"]
pub struct KayakFont { pub struct KayakFont {
pub sdf: Option<Sdf>, pub sdf: Sdf,
pub atlas_image: Option<Handle<Image>>, pub atlas_image: Handle<Image>,
pub font: Font, char_ids: HashMap<char, u32>,
} }
// impl KayakFont { impl KayakFont {
// pub fn from_atlas(atlas: Texture, ) pub fn new(sdf: Sdf, atlas_image: Handle<Image>) -> Self {
// } Self {
sdf,
atlas_image,
char_ids: HashMap::default(),
}
}
pub fn generate_char_ids(&mut self) {
let mut count = 0;
for glyph in self.sdf.glyphs.iter() {
self.char_ids.insert(glyph.unicode, count);
count += 1;
}
}
pub fn get_char_id(&self, c: char) -> Option<u32> {
self.char_ids.get(&c).and_then(|id| Some(*id))
}
}
...@@ -70,52 +70,20 @@ impl FontTextureCache { ...@@ -70,52 +70,20 @@ impl FontTextureCache {
for kayak_font_handle in new_fonts { for kayak_font_handle in new_fonts {
let mut was_processed = true; let mut was_processed = true;
if let Some(font) = self.fonts.get(&kayak_font_handle) { if let Some(font) = self.fonts.get(&kayak_font_handle) {
if let Some(sdf) = &font.sdf { if let Some(atlas_texture) = render_images.get(&font.atlas_image) {
let atlas_handle = font.atlas_image.as_ref().unwrap(); Self::create_from_atlas(
if let Some(atlas_texture) = render_images.get(atlas_handle) {
Self::create_from_atlas(
&mut self.images,
&mut self.bind_groups,
sdf,
kayak_font_handle.clone_weak(),
device,
queue,
pipeline,
atlas_texture,
sdf.max_glyph_size(),
);
} else {
was_processed = false;
}
} else {
Self::create_texture(
&mut self.images, &mut self.images,
&mut self.bind_groups,
&font.sdf,
kayak_font_handle.clone_weak(), kayak_font_handle.clone_weak(),
(font.font.cache.dimensions.0, font.font.cache.dimensions.1),
device, device,
TextureFormat::Rgba32Float, queue,
pipeline,
atlas_texture,
font.sdf.max_glyph_size(),
); );
} else {
let gpu_image = self.images.get(&kayak_font_handle).unwrap(); was_processed = false;
// create bind group
let binding = device.create_bind_group(&BindGroupDescriptor {
label: Some("text_image_bind_group"),
entries: &[
BindGroupEntry {
binding: 0,
resource: BindingResource::TextureView(&gpu_image.texture_view),
},
BindGroupEntry {
binding: 1,
resource: BindingResource::Sampler(&gpu_image.sampler),
},
],
layout: &pipeline.font_image_layout,
});
self.bind_groups
.insert(kayak_font_handle.clone_weak(), binding);
} }
} }
if !was_processed { if !was_processed {
...@@ -124,20 +92,6 @@ impl FontTextureCache { ...@@ -124,20 +92,6 @@ impl FontTextureCache {
} }
} }
pub fn process_updated(&mut self, queue: &RenderQueue) {
let updated_fonts = self.updated_fonts.drain(..);
for kayak_font_handle in updated_fonts {
if let Some(font) = self.fonts.get_mut(&kayak_font_handle) {
Self::process_new_chars_into_texture(
&mut self.images,
kayak_font_handle,
font,
queue,
);
}
}
}
fn create_texture( fn create_texture(
images: &mut HashMap<Handle<KayakFont>, GpuImage>, images: &mut HashMap<Handle<KayakFont>, GpuImage>,
font_handle: Handle<KayakFont>, font_handle: Handle<KayakFont>,
...@@ -197,45 +151,6 @@ impl FontTextureCache { ...@@ -197,45 +151,6 @@ impl FontTextureCache {
images.insert(font_handle, image); images.insert(font_handle, image);
} }
pub fn process_new_chars_into_texture(
images: &mut HashMap<Handle<KayakFont>, GpuImage>,
kayak_font_handle: Handle<KayakFont>,
font: &mut KayakFont,
queue: &RenderQueue,
) {
let size = font.font.cache.dimensions;
if let Some(gpu_image) = images.get_mut(&kayak_font_handle) {
for (_, id, pixels) in font.font.get_data_to_process() {
let format_size = TextureFormat::Rgba32Float.pixel_size();
queue.write_texture(
ImageCopyTexture {
texture: &gpu_image.texture,
mip_level: 0,
origin: Origin3d {
x: 0,
y: 0,
z: id as u32,
},
aspect: TextureAspect::All,
},
&pixels,
ImageDataLayout {
offset: 0,
bytes_per_row: Some(
std::num::NonZeroU32::new(size.0 * format_size as u32).unwrap(),
),
rows_per_image: None,
},
Extent3d {
width: size.0,
height: size.1,
depth_or_array_layers: 1,
},
);
}
}
}
pub fn get_empty( pub fn get_empty(
device: &RenderDevice, device: &RenderDevice,
image_layout: &BindGroupLayout, image_layout: &BindGroupLayout,
......
...@@ -59,27 +59,15 @@ fn load_fonts( ...@@ -59,27 +59,15 @@ fn load_fonts(
mut font_mapping: ResMut<FontMapping>, mut font_mapping: ResMut<FontMapping>,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
) { ) {
let font_bytes = include_bytes!("../../../../../resources/Roboto-Regular.ttf");
let sdf = Sdf::from_string(include_str!("../../../../../assets/roboto.json").to_string()); let sdf = Sdf::from_string(include_str!("../../../../../assets/roboto.json").to_string());
let max_glyph_size = sdf.max_glyph_size(); let max_glyph_size = sdf.max_glyph_size();
let mut font = kayak_font::Font::new(
font_bytes,
(max_glyph_size.x as u32, max_glyph_size.y as u32),
);
let atlas_image: Handle<Image> = asset_server.load("roboto.png"); let atlas_image: Handle<Image> = asset_server.load("roboto.png");
for glyph in sdf.glyphs.iter() { let mut font = KayakFont::new(sdf, atlas_image);
if !font.cache.has_character(glyph.unicode) { font.generate_char_ids();
font.cache.add_character(glyph.unicode);
}
}
let handle = font_assets.add(KayakFont { let handle = font_assets.add(font);
font,
atlas_image: Some(atlas_image),
sdf: Some(sdf),
});
font_mapping.add(handle); font_mapping.add(handle);
} }
...@@ -143,20 +131,18 @@ fn extract_fonts( ...@@ -143,20 +131,18 @@ fn extract_fonts(
for handle in changed_assets { for handle in changed_assets {
let font_asset = font_assets.get(&handle).unwrap(); let font_asset = font_assets.get(&handle).unwrap();
if let Some(image) = font_asset.atlas_image.as_ref() { if let Some(image) = textures.get(&font_asset.atlas_image) {
if let Some(image) = textures.get(image) { if !image
if !image .texture_descriptor
.texture_descriptor .usage
.usage .contains(TextureUsages::COPY_SRC)
.contains(TextureUsages::COPY_SRC) {
{
not_processed.push(handle);
continue;
}
} else {
not_processed.push(handle); not_processed.push(handle);
continue; continue;
} }
} else {
not_processed.push(handle);
continue;
} }
let font = font_asset.clone(); let font = font_asset.clone();
...@@ -184,5 +170,4 @@ fn create_and_update_font_cache_texture( ...@@ -184,5 +170,4 @@ fn create_and_update_font_cache_texture(
images: Res<RenderAssets<Image>>, images: Res<RenderAssets<Image>>,
) { ) {
font_texture_cache.process_new(&device, &queue, &pipeline, &images); font_texture_cache.process_new(&device, &queue, &pipeline, &images);
font_texture_cache.process_updated(&queue);
} }
...@@ -306,7 +306,7 @@ pub struct ExtractedQuad { ...@@ -306,7 +306,7 @@ pub struct ExtractedQuad {
pub rect: Rect, pub rect: Rect,
pub color: Color, pub color: Color,
pub vertex_index: usize, pub vertex_index: usize,
pub char_id: usize, pub char_id: u32,
pub z_index: f32, pub z_index: f32,
pub font_handle: Option<Handle<KayakFont>>, pub font_handle: Option<Handle<KayakFont>>,
pub quad_type: UIQuadType, pub quad_type: UIQuadType,
......
...@@ -68,7 +68,7 @@ impl KayakContext { ...@@ -68,7 +68,7 @@ impl KayakContext {
let states = self.component_states.get(&self.current_id).unwrap(); let states = self.component_states.get(&self.current_id).unwrap();
if states.contains::<T>() { if states.contains::<T>() {
let mut mutate_t = states.get_mut::<T>().unwrap(); let mut mutate_t = states.get_mut::<T>().unwrap();
self.widget_manager.dirty_nodes.push(self.current_id); self.widget_manager.dirty_nodes.insert(self.current_id);
*mutate_t = state; *mutate_t = state;
} else { } else {
panic!( panic!(
...@@ -96,22 +96,21 @@ impl KayakContext { ...@@ -96,22 +96,21 @@ impl KayakContext {
} }
pub fn render(&mut self) { pub fn render(&mut self) {
let dirty_nodes = self.widget_manager.dirty_nodes.clone(); let dirty_nodes: Vec<_> = self.widget_manager.dirty_nodes.drain().collect();
for node_index in dirty_nodes { for node_index in dirty_nodes {
if self // if self
.widget_manager // .widget_manager
.dirty_nodes // .dirty_nodes
.iter() // .iter()
.any(|dirty_index| node_index == *dirty_index) // .any(|dirty_index| node_index == *dirty_index)
{ // {
let mut widget = self.widget_manager.take(node_index); let mut widget = self.widget_manager.take(node_index);
widget.render(self); widget.render(self);
self.widget_manager.repossess(widget); self.widget_manager.repossess(widget);
} // }
} }
self.widget_manager.dirty_nodes.clear(); // self.widget_manager.dirty_nodes.clear();
self.widget_manager.render(); self.widget_manager.render();
self.widget_manager.calculate_layout(); self.widget_manager.calculate_layout();
} }
......
use std::collections::HashSet;
use crate::{ use crate::{
layout_cache::LayoutCache, layout_cache::LayoutCache,
node::{Node, NodeBuilder, NodeIndex}, node::{Node, NodeBuilder, NodeIndex},
...@@ -13,7 +15,7 @@ use crate::{ ...@@ -13,7 +15,7 @@ use crate::{
pub struct WidgetManager { pub struct WidgetManager {
pub(crate) current_widgets: Arena<Option<Box<dyn Widget>>>, pub(crate) current_widgets: Arena<Option<Box<dyn Widget>>>,
pub(crate) dirty_render_nodes: Vec<Index>, pub(crate) dirty_render_nodes: Vec<Index>,
pub(crate) dirty_nodes: Vec<Index>, pub(crate) dirty_nodes: HashSet<Index>,
pub(crate) nodes: Arena<Option<Node>>, pub(crate) nodes: Arena<Option<Node>>,
pub tree: Tree, pub tree: Tree,
pub node_tree: Tree, pub node_tree: Tree,
...@@ -26,7 +28,7 @@ impl WidgetManager { ...@@ -26,7 +28,7 @@ impl WidgetManager {
Self { Self {
current_widgets: Arena::new(), current_widgets: Arena::new(),
dirty_render_nodes: Vec::new(), dirty_render_nodes: Vec::new(),
dirty_nodes: Vec::new(), dirty_nodes: HashSet::new(),
nodes: Arena::new(), nodes: Arena::new(),
tree: Tree::default(), tree: Tree::default(),
node_tree: Tree::default(), node_tree: Tree::default(),
...@@ -40,11 +42,11 @@ impl WidgetManager { ...@@ -40,11 +42,11 @@ impl WidgetManager {
/// Can be slow. /// Can be slow.
pub fn dirty(&mut self, force: bool) { pub fn dirty(&mut self, force: bool) {
// Force tree to re-render from root. // Force tree to re-render from root.
self.dirty_nodes.push(self.tree.root_node); self.dirty_nodes.insert(self.tree.root_node);
if force { if force {
for (node_index, _) in self.current_widgets.iter() { for (node_index, _) in self.current_widgets.iter() {
self.dirty_nodes.push(node_index); self.dirty_nodes.insert(node_index);
self.dirty_render_nodes.push(node_index); self.dirty_render_nodes.push(node_index);
} }
} }
...@@ -62,9 +64,9 @@ impl WidgetManager { ...@@ -62,9 +64,9 @@ impl WidgetManager {
if let Some(widget_id) = parent_children.get(index) { if let Some(widget_id) = parent_children.get(index) {
widget.set_id(*widget_id); widget.set_id(*widget_id);
// Remove from the dirty nodes lists. // Remove from the dirty nodes lists.
if let Some(index) = self.dirty_nodes.iter().position(|id| *widget_id == *id) { // if let Some(index) = self.dirty_nodes.iter().position(|id| *widget_id == *id) {
self.dirty_nodes.remove(index); // self.dirty_nodes.remove(index);
} // }
// TODO: Figure a good way of diffing props passed to children of a widget // TODO: Figure a good way of diffing props passed to children of a widget
// that wont naturally-rerender it's children because of a lack of changes // that wont naturally-rerender it's children because of a lack of changes
...@@ -102,9 +104,9 @@ impl WidgetManager { ...@@ -102,9 +104,9 @@ impl WidgetManager {
self.dirty_render_nodes.push(widget_id); self.dirty_render_nodes.push(widget_id);
// Remove from the dirty nodes lists. // Remove from the dirty nodes lists.
if let Some(index) = self.dirty_nodes.iter().position(|id| widget_id == *id) { // if let Some(index) = self.dirty_nodes.iter().position(|id| widget_id == *id) {
self.dirty_nodes.remove(index); // self.dirty_nodes.remove(index);
} // }
self.tree.add(0, widget_id, parent); self.tree.add(0, widget_id, parent);
self.layout_cache.add(NodeIndex(widget_id)); self.layout_cache.add(NodeIndex(widget_id));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment