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

Updated to the latest bevy.

parent aaf5ab8d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Cargo.lock
+ 32
− 34
View file @ e9b85350
......@@ -193,7 +193,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bevy"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_internal",
]
......@@ -201,7 +201,7 @@ dependencies = [
[[package]]
name = "bevy-crevice-derive"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
......@@ -212,7 +212,7 @@ dependencies = [
[[package]]
name = "bevy_app"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_derive",
"bevy_ecs",
......@@ -225,7 +225,7 @@ dependencies = [
[[package]]
name = "bevy_asset"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
......@@ -252,7 +252,7 @@ dependencies = [
[[package]]
name = "bevy_audio"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
......@@ -267,7 +267,7 @@ dependencies = [
[[package]]
name = "bevy_core"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_derive",
......@@ -282,7 +282,7 @@ dependencies = [
[[package]]
name = "bevy_core_pipeline"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
......@@ -294,7 +294,7 @@ dependencies = [
[[package]]
name = "bevy_crevice"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy-crevice-derive",
"bytemuck",
......@@ -305,7 +305,7 @@ dependencies = [
[[package]]
name = "bevy_derive"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"Inflector",
"bevy_macro_utils",
......@@ -316,7 +316,7 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_core",
......@@ -328,7 +328,7 @@ dependencies = [
[[package]]
name = "bevy_ecs"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"async-channel",
"bevy_ecs_macros",
......@@ -345,7 +345,7 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
......@@ -356,7 +356,7 @@ dependencies = [
[[package]]
name = "bevy_gilrs"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_ecs",
......@@ -368,7 +368,7 @@ dependencies = [
[[package]]
name = "bevy_gltf"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"base64",
......@@ -392,7 +392,7 @@ dependencies = [
[[package]]
name = "bevy_input"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_ecs",
......@@ -403,7 +403,7 @@ dependencies = [
[[package]]
name = "bevy_internal"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
......@@ -438,7 +438,6 @@ name = "bevy_kayak_ui"
version = "0.0.1"
dependencies = [
"bevy",
"bevy_crevice",
"bytemuck",
"kayak_core",
"kayak_font",
......@@ -450,7 +449,7 @@ dependencies = [
[[package]]
name = "bevy_log"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"android_log-sys",
"bevy_app",
......@@ -464,7 +463,7 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"cargo-manifest",
"quote",
......@@ -474,7 +473,7 @@ dependencies = [
[[package]]
name = "bevy_math"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_reflect",
"glam",
......@@ -483,7 +482,7 @@ dependencies = [
[[package]]
name = "bevy_pbr"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
......@@ -503,7 +502,7 @@ dependencies = [
[[package]]
name = "bevy_reflect"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_reflect_derive",
"bevy_utils",
......@@ -519,7 +518,7 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
......@@ -531,7 +530,7 @@ dependencies = [
[[package]]
name = "bevy_render"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
......@@ -565,7 +564,7 @@ dependencies = [
[[package]]
name = "bevy_scene"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"anyhow",
"bevy_app",
......@@ -583,7 +582,7 @@ dependencies = [
[[package]]
name = "bevy_sprite"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
......@@ -606,7 +605,7 @@ dependencies = [
[[package]]
name = "bevy_tasks"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"async-channel",
"async-executor",
......@@ -619,7 +618,7 @@ dependencies = [
[[package]]
name = "bevy_text"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"ab_glyph",
"anyhow",
......@@ -642,7 +641,7 @@ dependencies = [
[[package]]
name = "bevy_transform"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_ecs",
......@@ -655,7 +654,7 @@ dependencies = [
[[package]]
name = "bevy_ui"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_asset",
......@@ -682,7 +681,7 @@ dependencies = [
[[package]]
name = "bevy_utils"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"ahash",
"bevy_derive",
......@@ -695,7 +694,7 @@ dependencies = [
[[package]]
name = "bevy_window"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"bevy_app",
"bevy_math",
......@@ -707,7 +706,7 @@ dependencies = [
[[package]]
name = "bevy_winit"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
dependencies = [
"approx",
"bevy_app",
......@@ -1854,7 +1853,6 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bevy",
"bevy_crevice",
"bytemuck",
"serde",
"serde_json",
......
Cargo.toml
+ 5
− 2
View file @ e9b85350
......@@ -17,14 +17,17 @@ bevy_renderer = [
]
[dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b", optional = true }
bevy = { git = "https://github.com/bevyengine/bevy", optional = true }
kayak_core = { path = "kayak_core" }
bevy_kayak_ui = { path = "bevy_kayak_ui", optional = true }
kayak_font = { path = "kayak_font", optional = true }
kayak_render_macros = { path = "kayak_render_macros" }
[dev-dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
bevy = { git = "https://github.com/bevyengine/bevy" }
[patch."https://github.com/bevyengine/bevy"] # < Fails here because you can't patch using the same URL :(
bevy = { git = "https://github.com/bevyengine//bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
[[example]]
name = "todo"
......
bevy_kayak_ui/Cargo.toml
+ 1
− 2
View file @ e9b85350
......@@ -5,8 +5,7 @@ edition = "2021"
[dependencies]
bytemuck = "1.7.2"
bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
bevy = { git = "https://github.com/bevyengine/bevy" }
kayak_core = { path = "../kayak_core" }
kayak_font = { path = "../kayak_font" }
serde = "1.0"
......
bevy_kayak_ui/src/render/unified/pipeline.rs
+ 1
− 1
View file @ e9b85350
use bevy::render::render_resource::std140::AsStd140;
use bevy::{
core::FloatOrd,
ecs::system::{
......@@ -29,7 +30,6 @@ use bevy::{
sprite::Rect,
utils::HashMap,
};
use bevy_crevice::std140::AsStd140;
use bytemuck::{Pod, Zeroable};
use kayak_font::{FontRenderingPipeline, FontTextureCache, KayakFont};
......
kayak_core/Cargo.toml
+ 1
− 1
View file @ e9b85350
......@@ -12,7 +12,7 @@ bevy_renderer = ["bevy"]
[dependencies]
as-any = "0.2"
derivative = "2.2"
bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b", optional = true }
bevy = { git = "https://github.com/bevyengine/bevy", optional = true }
flo_binding = { git = "https://github.com/StarArawn/flo_binding.git", rev = "c78431a56df5ec082b7e1c271871e6c0ac75e81e" }
kayak_render_macros = { path = "../kayak_render_macros" }
morphorm = { git = "https://github.com/geom3trik/morphorm", rev = "1243152d4cebea46fd3e5098df26402c73acae91" }
......
kayak_font/Cargo.toml
+ 1
− 2
View file @ e9b85350
......@@ -7,8 +7,7 @@ edition = "2021"
[dependencies]
anyhow = { version = "1.0" }
bevy = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
bevy = { git = "https://github.com/bevyengine/bevy" }
bytemuck = "1.7.2"
serde = "1.0"
serde_json = "1.0"
......
kayak_font/examples/renderer/pipeline.rs
+ 1
− 1
View file @ e9b85350
use bevy::render::render_resource::std140::AsStd140;
use bevy::{
core::FloatOrd,
core_pipeline::Transparent2d,
......@@ -26,7 +27,6 @@ use bevy::{
},
sprite::Rect,
};
use bevy_crevice::std140::AsStd140;
use bytemuck::{Pod, Zeroable};
use kayak_font::{FontRenderingPipeline, FontTextureCache, KayakFont};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment