Compare commits
No commits in common. "a0f66f4fd0f7f887c23e8fd051156a034ed5829f" and "7de16e410e112c84746fe8c46396f214cda2d99a" have entirely different histories.
a0f66f4fd0
...
7de16e410e
12 changed files with 38 additions and 79 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,4 +1,3 @@
|
|||
.direnv/
|
||||
.devenv/
|
||||
/target
|
||||
dist/
|
||||
|
|
|
|||
10
Cargo.lock
generated
10
Cargo.lock
generated
|
|
@ -293,6 +293,7 @@ version = "0.13.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65b9eadaacf8fe971331bc3f250f35c18bc9dace3f96b483062f38ac07e3a1b4"
|
||||
dependencies = [
|
||||
"bevy_dylib",
|
||||
"bevy_internal",
|
||||
]
|
||||
|
||||
|
|
@ -469,6 +470,15 @@ dependencies = [
|
|||
"sysinfo",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_dylib"
|
||||
version = "0.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "922826e3b8f37c19836b49e18ceca662260cce87ab8faa4db6df8433903660cc"
|
||||
dependencies = [
|
||||
"bevy_internal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bevy_ecs"
|
||||
version = "0.13.2"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ version = "0.1.0"
|
|||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
# bevy = {version = "0.13.2", features = ["dynamic_linking"]}
|
||||
bevy = "0.13.2"
|
||||
bevy = {version = "0.13.2", features = ["dynamic_linking"]}
|
||||
bevy_rand = { version = "0.6.0", features = ["wyrand"] }
|
||||
bevy_rapier2d = "0.26.0"
|
||||
rand = "0.8.5"
|
||||
|
|
@ -19,7 +18,3 @@ opt-level = 3
|
|||
|
||||
[profile.dev.package.bevy_rapier2d]
|
||||
opt-level = 3
|
||||
|
||||
[profile.release]
|
||||
lto = true
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
rs-toolchain = with fenix.packages.${system};
|
||||
combine [
|
||||
complete.toolchain
|
||||
targets.wasm32-unknown-unknown.latest.rust-std
|
||||
# rust-analyzer
|
||||
];
|
||||
my-crate = craneLib.buildPackage {
|
||||
|
|
@ -72,8 +71,6 @@
|
|||
wayland
|
||||
mold-wrapped
|
||||
clang
|
||||
trunk
|
||||
binaryen
|
||||
];
|
||||
|
||||
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
|
||||
|
|
|
|||
15
index.html
15
index.html
|
|
@ -1,15 +0,0 @@
|
|||
<html>
|
||||
<head>
|
||||
<link data-trunk rel="css" href="main.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<section>
|
||||
<h1>Keybinds:</h1>
|
||||
<ul>
|
||||
<li>W: Jump</li>
|
||||
<li>A: Walk left</li>
|
||||
<li>D: Walk right</li>
|
||||
</ul>
|
||||
</section>
|
||||
</body>
|
||||
</html>
|
||||
5
justfile
5
justfile
|
|
@ -1,5 +0,0 @@
|
|||
deploy-katzencafe: build-wasm
|
||||
rsync dist/* root@katzen.cafe:/var/www/miau/evader
|
||||
|
||||
build-wasm:
|
||||
trunk build --release --public-url "/evader"
|
||||
27
main.css
27
main.css
|
|
@ -1,27 +0,0 @@
|
|||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #222;
|
||||
}
|
||||
|
||||
body {
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
flex-direction: column-reverse;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
canvas:focus {
|
||||
border: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
h1,
|
||||
li,
|
||||
ul {
|
||||
font-family: sans-serif;
|
||||
color: white;
|
||||
}
|
||||
16
src/drops.rs
16
src/drops.rs
|
|
@ -147,8 +147,8 @@ struct CrateCollision {
|
|||
}
|
||||
|
||||
enum CollisionType {
|
||||
Player,
|
||||
Scene,
|
||||
Player(Entity),
|
||||
Scene(Entity),
|
||||
}
|
||||
|
||||
fn crate_collisions(
|
||||
|
|
@ -165,13 +165,13 @@ fn crate_collisions(
|
|||
match collision_event {
|
||||
CollisionEvent::Started(e1, e2, _) if crates.contains(e1) || crates.contains(e2) => {
|
||||
let (coll_type, crate_) = if scene_objs.contains(e1) {
|
||||
(CollisionType::Scene, e2)
|
||||
(CollisionType::Scene(*e1), e2)
|
||||
} else if scene_objs.contains(e2) {
|
||||
(CollisionType::Scene, e1)
|
||||
(CollisionType::Scene(*e2), e1)
|
||||
} else if *e2 == p {
|
||||
(CollisionType::Player, e1)
|
||||
(CollisionType::Player(*e2), e1)
|
||||
} else if *e1 == p {
|
||||
(CollisionType::Player, e2)
|
||||
(CollisionType::Player(*e1), e2)
|
||||
} else if crates.contains(e1) && crates.contains(e2) {
|
||||
continue;
|
||||
} else {
|
||||
|
|
@ -192,7 +192,7 @@ fn crate_collisions(
|
|||
|
||||
fn delete_on_env_coll(mut ev_colls: EventReader<CrateCollision>, mut commands: Commands) {
|
||||
for CrateCollision { coll_crate, with } in ev_colls.read() {
|
||||
if let CollisionType::Player = with {
|
||||
if let CollisionType::Player(_) = with {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ fn player_coll(
|
|||
mut commands: Commands,
|
||||
) {
|
||||
for CrateCollision { coll_crate, with } in ev_colls.read() {
|
||||
if let CollisionType::Scene = with {
|
||||
if let CollisionType::Scene(_) = with {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy::{app::AppExit, prelude::*};
|
||||
|
||||
use crate::{game_state::GameTimer, main_menu::button_color_system, GameState};
|
||||
use crate::{game_state::GameTimer, GameState};
|
||||
pub fn game_over_menu_plugin(app: &mut App) {
|
||||
app.add_systems(
|
||||
OnEnter(GameState::GameOver),
|
||||
game_over_menu_setup.in_set(GameOverMenuSet),
|
||||
)
|
||||
.add_systems(
|
||||
Update,
|
||||
(button_action, button_color_system).in_set(GameOverMenuSet),
|
||||
)
|
||||
.add_systems(Update, button_action.in_set(GameOverMenuSet))
|
||||
.add_systems(OnExit(GameState::GameOver), exit_menu);
|
||||
}
|
||||
|
||||
|
|
@ -106,6 +103,7 @@ fn game_over_menu_setup(mut commands: Commands, timer: Query<&GameTimer>) {
|
|||
|
||||
fn button_action(
|
||||
interaction_query: Query<(&Interaction, &ButtonAction), (Changed<Interaction>, With<Button>)>,
|
||||
mut ev_exit: EventWriter<AppExit>,
|
||||
mut game_state: ResMut<NextState<GameState>>,
|
||||
) {
|
||||
for (interaction, action) in &interaction_query {
|
||||
|
|
|
|||
12
src/main.rs
12
src/main.rs
|
|
@ -1,12 +1,14 @@
|
|||
#![allow(clippy::type_complexity)]
|
||||
use crate::main_menu::main_menu_plugin;
|
||||
use bevy::prelude::*;
|
||||
use bevy::{
|
||||
prelude::*,
|
||||
sprite::{MaterialMesh2dBundle, Mesh2dHandle},
|
||||
};
|
||||
use bevy_rapier2d::prelude::*;
|
||||
use drops::spawner_plugin;
|
||||
use game_over_menu::{game_over_menu_plugin, GameOverMenuSet};
|
||||
use game_state::state_and_ui_plugin;
|
||||
use main_menu::MainMenuSet;
|
||||
use player::{player_plugin, GameOverEvent};
|
||||
use player::{player_plugin, GameOverEvent, LifeChangeEvent};
|
||||
use scene::scene_plugin;
|
||||
|
||||
const METER: f32 = 48.;
|
||||
|
|
@ -26,7 +28,7 @@ fn main() {
|
|||
rapier_config.timestep_mode = TimestepMode::Variable {
|
||||
max_dt: 1.0 / 60.0,
|
||||
time_scale: 1.0,
|
||||
substeps: 1,
|
||||
substeps: 4,
|
||||
};
|
||||
App::new()
|
||||
.add_plugins(DefaultPlugins)
|
||||
|
|
@ -61,7 +63,7 @@ fn handle_game_over(
|
|||
mut ev_gameover: EventReader<GameOverEvent>,
|
||||
mut game_state: ResMut<NextState<GameState>>,
|
||||
) {
|
||||
for _ in ev_gameover.read() {
|
||||
for ev in ev_gameover.read() {
|
||||
game_state.set(GameState::GameOver)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use bevy::{app::AppExit, prelude::*};
|
||||
|
||||
use crate::game_over_menu::GameOverMenuSet;
|
||||
use crate::GameState;
|
||||
|
||||
#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
|
||||
|
|
@ -11,7 +12,12 @@ pub fn main_menu_plugin(app: &mut App) {
|
|||
setup_main_menu_ui.in_set(MainMenuSet),
|
||||
)
|
||||
.add_systems(Update, button_action.in_set(MainMenuSet))
|
||||
.add_systems(Update, button_color_system.in_set(MainMenuSet))
|
||||
.add_systems(
|
||||
Update,
|
||||
button_color_system
|
||||
.in_set(MainMenuSet)
|
||||
.in_set(GameOverMenuSet),
|
||||
)
|
||||
.add_systems(OnExit(GameState::MainMenu), exit_menu.in_set(MainMenuSet));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use bevy::{
|
||||
prelude::*,
|
||||
sprite::{MaterialMesh2dBundle, Mesh2dHandle},
|
||||
utils::HashSet,
|
||||
utils::{HashMap, HashSet},
|
||||
};
|
||||
use bevy_rapier2d::prelude::*;
|
||||
|
||||
|
|
@ -14,7 +14,6 @@ pub struct Player {
|
|||
lives: u8,
|
||||
}
|
||||
|
||||
#[allow(unused)]
|
||||
#[derive(Event)]
|
||||
pub enum LifeChangeEvent {
|
||||
Gained,
|
||||
|
|
|
|||
Loading…
Reference in a new issue