webart
/
fyrox-platformer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new screens

This commit is contained in:
artem 2024-03-29 21:47:57 +03:00
parent 3460fc16e3
commit a3b18313a7
10 changed files with 875 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Cargo.lock generated
View File

@ -233,7 +233,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -302,9 +302,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
version = "1.5.0"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
[[package]]
name = "calloop"
@ -343,9 +343,9 @@ dependencies = [
[[package]]
name = "cargo-platform"
version = "0.1.7"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f"
checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
dependencies = [
"serde",
]
@ -452,7 +452,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -864,7 +864,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -939,7 +939,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -984,7 +984,7 @@ dependencies = [
[[package]]
name = "fyrox"
version = "0.33.1"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"fyrox-impl",
]
@ -992,7 +992,7 @@ dependencies = [
[[package]]
name = "fyrox-animation"
version = "0.1.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"fxhash",
"fyrox-core",
@ -1004,7 +1004,7 @@ dependencies = [
[[package]]
name = "fyrox-core"
version = "0.27.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"android-activity",
"arrayvec",
@ -1015,7 +1015,7 @@ dependencies = [
"futures",
"fxhash",
"fyrox-core-derive",
"fyrox-math 0.1.0 (git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c)",
"fyrox-math 0.1.0 (git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd)",
"instant",
"js-sys",
"lazy_static",
@ -1036,7 +1036,7 @@ dependencies = [
[[package]]
name = "fyrox-core-derive"
version = "0.22.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"convert_case",
"darling",
@ -1049,7 +1049,7 @@ dependencies = [
[[package]]
name = "fyrox-graph"
version = "0.1.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"fxhash",
"fyrox-core",
@ -1059,7 +1059,7 @@ dependencies = [
[[package]]
name = "fyrox-impl"
version = "0.33.1"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"base64",
"bitflags 2.5.0",
@ -1114,7 +1114,7 @@ dependencies = [
[[package]]
name = "fyrox-math"
version = "0.1.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"arrayvec",
"nalgebra",
@ -1126,7 +1126,7 @@ dependencies = [
[[package]]
name = "fyrox-resource"
version = "0.11.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"fxhash",
"fyrox-core",
@ -1139,7 +1139,7 @@ dependencies = [
[[package]]
name = "fyrox-sound"
version = "0.34.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"fyrox-core",
"fyrox-resource",
@ -1156,7 +1156,7 @@ dependencies = [
[[package]]
name = "fyrox-ui"
version = "0.24.0"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"copypasta",
"fontdue",
@ -1176,7 +1176,7 @@ dependencies = [
[[package]]
name = "fyroxed_base"
version = "0.20.1"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=a133cfab0615dae9b18470f4860e81363df2bd1c#a133cfab0615dae9b18470f4860e81363df2bd1c"
source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f"
dependencies = [
"cargo_metadata",
"fyrox",
@ -1408,9 +1408,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.2.5"
version = "2.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
dependencies = [
"equivalent",
"hashbrown",
@ -1850,7 +1850,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -1911,7 +1911,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -2034,9 +2034,9 @@ dependencies = [
[[package]]
name = "parry2d"
version = "0.13.6"
version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94683d8d7e785fe84b02d0a0dbe0fcf359c031c338dd6d144de958573c570c25"
checksum = "a996b83a7a12522b395c54f4ba59593b782e8004794c0212a2f487ed7ac6e419"
dependencies = [
"approx",
"arrayvec",
@ -2055,9 +2055,9 @@ dependencies = [
[[package]]
name = "parry3d"
version = "0.13.6"
version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d0bdaf533851feec5cba9af11cefcc753ecefba05f758cf6abe886086bc3f5"
checksum = "6ccba18a65dba56c08dadfa936e0c9efbc883b3a26dc77d2685f78be10f7667c"
dependencies = [
"approx",
"arrayvec",
@ -2133,12 +2133,13 @@ dependencies = [
[[package]]
name = "polling"
version = "3.5.0"
version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9"
checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
dependencies = [
"cfg-if",
"concurrent-queue",
"hermit-abi",
"pin-project-lite",
"rustix",
"tracing",
@ -2286,9 +2287,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
version = "1.9.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd"
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
@ -2344,9 +2345,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.10.3"
version = "1.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
dependencies = [
"aho-corasick",
"memchr",
@ -2522,7 +2523,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -2697,7 +2698,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -2713,9 +2714,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.53"
version = "2.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
dependencies = [
"proc-macro2",
"quote",
@ -2760,7 +2761,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]
[[package]]
@ -2996,7 +2997,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
"wasm-bindgen-shared",
]
@ -3030,7 +3031,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -3573,5 +3574,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.53",
"syn 2.0.55",
]

4
Cargo.toml
View File

@ -5,11 +5,11 @@ resolver = "2"
[workspace.dependencies.fyrox]
git = "https://github.com/FyroxEngine/Fyrox"
rev = "a133cfab0615dae9b18470f4860e81363df2bd1c"
rev = "7c5aacd"
[workspace.dependencies.fyroxed_base]
git = "https://github.com/FyroxEngine/Fyrox"
rev = "a133cfab0615dae9b18470f4860e81363df2bd1c"
rev = "7c5aacd"
# Optimize the engine in debug builds, but leave project's code non-optimized.
# By using this technique, you can still debug you code, but engine will be fully

BIN
assets/data/background/BG_.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 211 KiB

BIN
assets/data/background/plot/1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

BIN
assets/data/background/plot/StartScreen.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 91 KiB

BIN
assets/data/objects/Home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 341 KiB

BIN
data/menu.ui
View File

Binary file not shown.

5
game/src/lib.rs
View File

@ -41,7 +41,7 @@ use msg::ScreenSizeMessage;
use player::Player;
use sound::Sound;
const START_LEVEL: u32 = 1;
const START_LEVEL: u32 = 3;
pub struct GameConstructor;
// impl PluginConstructor for GameConstructor {
@ -76,7 +76,7 @@ impl Game {
pub fn default() -> Self {
return Game {
level: 1,
level: START_LEVEL,
..Default::default()
};
}
@ -151,6 +151,7 @@ impl Plugin for Game {
if self.need_show_menu && self.show_menu_time < context.elapsed_time {
self.need_show_menu = false;
self.show_menu_time = 0.0;
println!("self.level {}", self.level);
context
.user_interface
.send_message(WidgetMessage::visibility(

38
game/src/map.rs
View File

@ -206,22 +206,20 @@ fn build_stone_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f
)
}
// fn build_mushroom_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f32, y: f32) {
// let shape = ColliderShape::Cuboid(CuboidShape {
// half_extents: Vector2::new(0.25, 0.25),
// });
// build_block(
// graph,
// x as f32,
// y + 0.5,
// 0.5,
// build_material(
// resource_manager,
// "assets/data/objects/Mushroom_2.png".to_owned(),
// ),
// shape,
// )
// }
fn build_home_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f32, y: f32) {
let shape = ColliderShape::Cuboid(CuboidShape::default());
build_block(
graph,
x as f32,
y + 1.7,
3.,
build_material(
resource_manager,
"assets/data/objects/Home.png".to_owned(),
),
shape,
)
}
fn build_box_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f32, y: f32) {
let shape = ColliderShape::Cuboid(CuboidShape::default());
@ -250,8 +248,12 @@ pub fn build_map(graph: &mut Graph, resource_manager: &ResourceManager, level: u
build_ground_block(resource_manager, graph, x as f32, bottom_y);
}
build_stone_block(resource_manager, graph, 30.0, bottom_y);
build_tree_block(resource_manager, graph, 35.0, bottom_y);
build_stone_block(resource_manager, graph, -30.0, bottom_y);
if level == 3 {
build_home_block(resource_manager, graph, 0.0, bottom_y);
} else {
build_stone_block(resource_manager, graph, -30.0, bottom_y);
}
build_tree_block(resource_manager, graph, 35.0, bottom_y);
if level != 3 {
build_tree_block(resource_manager, graph, -35.0, bottom_y);
}

1267
settings.ron
View File

File diff suppressed because it is too large Load Diff