Compare commits

..

No commits in common. "update" and "trunk" have entirely different histories.

5 changed files with 9 additions and 11 deletions

View file

@ -2,16 +2,14 @@
name = "montociel" name = "montociel"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
resolver = "2" # Important! wgpu/Bevy needs this! resolver = "2"
[dependencies] [dependencies]
bevy = { version = "0.6", default-features = false, features = ["bevy_winit", "render", "bevy_gltf", "png"] } bevy = {version = "0.5", default-features = false, features = ["bevy_winit", "render", "bevy_gltf", "png"]}
bevy_rapier2d = "*" bevy_rapier2d = "*"
rand = "0.8" rand = "0.8"
winit = "0.26.1" # newer version not ok with new rustc version
# Dependencies for native only. # Dependencies for native only.
# [target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]} bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]}

View file

@ -10,7 +10,7 @@ pub struct Evil;
pub struct CloudPlugin; pub struct CloudPlugin;
impl Plugin for CloudPlugin { impl Plugin for CloudPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut AppBuilder) {
app.init_resource::<NewCloudTimer>() app.init_resource::<NewCloudTimer>()
.add_system_set( .add_system_set(
SystemSet::on_enter(AppState::InGame) SystemSet::on_enter(AppState::InGame)

View file

@ -9,7 +9,7 @@ pub struct Montociel;
pub struct MontocielPlugin; pub struct MontocielPlugin;
impl Plugin for MontocielPlugin { impl Plugin for MontocielPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut AppBuilder) {
app.add_system_set( app.add_system_set(
SystemSet::on_enter(AppState::InGame).with_system(spawn_montociel.system()), SystemSet::on_enter(AppState::InGame).with_system(spawn_montociel.system()),
) )

View file

@ -26,7 +26,7 @@ impl Score {
pub struct ScorePlugin; pub struct ScorePlugin;
impl Plugin for ScorePlugin { impl Plugin for ScorePlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut AppBuilder) {
app.init_resource::<Score>() app.init_resource::<Score>()
.add_system_set( .add_system_set(
SystemSet::on_enter(AppState::InGame).with_system(setup_score_ui.system()), SystemSet::on_enter(AppState::InGame).with_system(setup_score_ui.system()),

View file

@ -4,7 +4,7 @@ use bevy::prelude::*;
pub struct UIPlugin; pub struct UIPlugin;
impl Plugin for UIPlugin { impl Plugin for UIPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut AppBuilder) {
app.add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup_button.system())) app.add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup_button.system()))
.add_system_set( .add_system_set(
SystemSet::on_enter(AppState::GameOver).with_system(setup_button.system()), SystemSet::on_enter(AppState::GameOver).with_system(setup_button.system()),