From 1d7ebfe35df9cff5815dce094c2902b4cf1fba07 Mon Sep 17 00:00:00 2001 From: Dmitry Stepanov Date: Sun, 22 Oct 2023 13:21:35 +0300 Subject: [PATCH] bumped versions + fixed `fyrox-template` --- Cargo.toml | 12 ++++++------ editor-standalone/Cargo.toml | 6 +++--- editor/Cargo.toml | 4 ++-- fyrox-core-derive/Cargo.toml | 2 +- fyrox-core/Cargo.toml | 4 ++-- fyrox-resource/Cargo.toml | 4 ++-- fyrox-scripts/Cargo.toml | 2 +- fyrox-sound/Cargo.toml | 6 +++--- fyrox-ui/Cargo.toml | 4 ++-- template/Cargo.toml | 2 +- template/src/main.rs | 5 +---- 11 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4624b3f30..38fd688a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox" -version = "0.31.0" +version = "0.32.0" authors = ["Dmitry Stepanov ", "Fyrox Engine Contributors"] edition = "2021" license = "MIT" @@ -36,11 +36,11 @@ opt-level = 3 debug = true [dependencies] -fyrox-core-derive = { path = "fyrox-core-derive", version = "0.20.0" } -fyrox-core = { path = "fyrox-core", version = "0.25.0", features = ["serde"] } -fyrox-sound = { path = "fyrox-sound", version = "0.32.0" } -fyrox-ui = { path = "fyrox-ui", version = "0.22.0" } -fyrox-resource = { path = "fyrox-resource", version = "0.9.0" } +fyrox-core-derive = { path = "fyrox-core-derive", version = "0.21.0" } +fyrox-core = { path = "fyrox-core", version = "0.26.0", features = ["serde"] } +fyrox-sound = { path = "fyrox-sound", version = "0.33.0" } +fyrox-ui = { path = "fyrox-ui", version = "0.23.0" } +fyrox-resource = { path = "fyrox-resource", version = "0.10.0" } rapier2d = { version = "0.17", features = ["debug-render"] } rapier3d = { version = "0.17", features = ["debug-render"] } image = { version = "0.24.3", default-features = false, features = ["gif", "jpeg", "png", "tga", "tiff", "bmp"] } diff --git a/editor-standalone/Cargo.toml b/editor-standalone/Cargo.toml index 390ff53b4..7518815cb 100644 --- a/editor-standalone/Cargo.toml +++ b/editor-standalone/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyroxed" -version = "0.15.0" +version = "0.16.0" license = "MIT" authors = ["Dmitry Stepanov "] edition = "2021" @@ -13,5 +13,5 @@ readme = "README.md" include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"] [dependencies] -fyrox = { version = "0.31.0", path = "../" } -fyroxed_base = { version = "0.18.0", path = "../editor" } \ No newline at end of file +fyrox = { version = "0.32.0", path = "../" } +fyroxed_base = { version = "0.19.0", path = "../editor" } \ No newline at end of file diff --git a/editor/Cargo.toml b/editor/Cargo.toml index ea3f0131d..1d7ad3dfc 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fyroxed_base" license = "MIT" -version = "0.18.0" +version = "0.19.0" authors = ["Dmitry Stepanov "] edition = "2021" rust-version = "1.56" @@ -13,7 +13,7 @@ readme = "README.md" include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md", "/resources/**/*"] [dependencies] -fyrox = { version = "0.31.0", path = ".." } +fyrox = { version = "0.32.0", path = ".." } lazy_static = "1.4.0" ron = "0.8.0" serde = "^1.0.0" diff --git a/fyrox-core-derive/Cargo.toml b/fyrox-core-derive/Cargo.toml index ac8c11e8e..ddca370f2 100644 --- a/fyrox-core-derive/Cargo.toml +++ b/fyrox-core-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-core-derive" -version = "0.20.0" +version = "0.21.0" authors = ["toyboot4e , Dmitry Stepanov "] edition = "2021" license = "MIT" diff --git a/fyrox-core/Cargo.toml b/fyrox-core/Cargo.toml index b5eb30a08..9e02ae7a7 100644 --- a/fyrox-core/Cargo.toml +++ b/fyrox-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-core" -version = "0.25.0" +version = "0.26.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -16,7 +16,7 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core-derive = { path = "../fyrox-core-derive", version = "0.20.0" } +fyrox-core-derive = { path = "../fyrox-core-derive", version = "0.21.0" } base64 = "0.21.0" byteorder = "1.4.3" diff --git a/fyrox-resource/Cargo.toml b/fyrox-resource/Cargo.toml index b7089661d..23488ab70 100644 --- a/fyrox-resource/Cargo.toml +++ b/fyrox-resource/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-resource" -version = "0.9.0" +version = "0.10.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -15,7 +15,7 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core = { path = "../fyrox-core", version = "0.25.0" } +fyrox-core = { path = "../fyrox-core", version = "0.26.0" } fxhash = "0.2.1" ron = "0.8.0" serde = { version = "1", features = ["derive"] } diff --git a/fyrox-scripts/Cargo.toml b/fyrox-scripts/Cargo.toml index bcf276430..c8d76b04f 100644 --- a/fyrox-scripts/Cargo.toml +++ b/fyrox-scripts/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fyrox = { version = "0.31.0", path = "../" } \ No newline at end of file +fyrox = { version = "0.32.0", path = "../" } \ No newline at end of file diff --git a/fyrox-sound/Cargo.toml b/fyrox-sound/Cargo.toml index b58caa421..d6b781db1 100644 --- a/fyrox-sound/Cargo.toml +++ b/fyrox-sound/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-sound" -version = "0.32.0" +version = "0.33.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -16,8 +16,8 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core = { path = "../fyrox-core", version = "0.25.0" } -fyrox-resource = { path = "../fyrox-resource", version = "0.9.0" } +fyrox-core = { path = "../fyrox-core", version = "0.26.0" } +fyrox-resource = { path = "../fyrox-resource", version = "0.10.0" } lewton = "0.10.2" ogg = "0.8.0" hrtf = "0.8.0" diff --git a/fyrox-ui/Cargo.toml b/fyrox-ui/Cargo.toml index 3f1267797..1e99a56dd 100644 --- a/fyrox-ui/Cargo.toml +++ b/fyrox-ui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-ui" -version = "0.22.0" +version = "0.23.0" authors = ["Dmitry Stepanov "] edition = "2021" license = "MIT" @@ -16,7 +16,7 @@ resolver = "2" rust-version = "1.56" [dependencies] -fyrox-core = { path = "../fyrox-core", version = "0.25.0", features = ["serde"] } +fyrox-core = { path = "../fyrox-core", version = "0.26.0", features = ["serde"] } lazy_static = "1.4.0" copypasta = "0.8.1" fontdue = "0.7.2" diff --git a/template/Cargo.toml b/template/Cargo.toml index f013ea598..5e5b7e5c6 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fyrox-template" -version = "0.8.0" +version = "0.9.0" edition = "2021" authors = ["Dmitry Stepanov "] license = "MIT" diff --git a/template/src/main.rs b/template/src/main.rs index 7419235e6..570c22905 100644 --- a/template/src/main.rs +++ b/template/src/main.rs @@ -152,7 +152,6 @@ fyrox = {{workspace = true}}"#, use fyrox::{ core::pool::Handle, event::Event, - event_loop::ControlFlow, gui::message::UiMessage, plugin::{Plugin, PluginConstructor, PluginContext, PluginRegistrationContext}, scene::Scene, @@ -192,7 +191,7 @@ impl Plugin for Game { // Do a cleanup here. } - fn update(&mut self, _context: &mut PluginContext, _control_flow: &mut ControlFlow) { + fn update(&mut self, _context: &mut PluginContext) { // Add your global update code here. } @@ -200,7 +199,6 @@ impl Plugin for Game { &mut self, _event: &Event<()>, _context: PluginContext, - _control_flow: &mut ControlFlow, ) { // Do something on OS event here. } @@ -209,7 +207,6 @@ impl Plugin for Game { &mut self, _context: &mut PluginContext, _message: &UiMessage, - _control_flow: &mut ControlFlow, ) { // Handle UI events here. }