diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 370 |
1 files changed, 114 insertions, 256 deletions
diff --git a/src/main.rs b/src/main.rs index 5cff0f0..1c13386 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,248 +9,99 @@ use std::io::BufReader; use bevy_inspector_egui::Inspectable; use bevy::{ - prelude::*, - sprite::{MaterialMesh2dBundle, collide_aabb::collide}, - render::camera::ScalingMode, - ecs::system::EntityCommands, - math::Vec3Swizzles, core::FixedTimestep, + prelude::*, + render::camera::ScalingMode, + sprite::MaterialMesh2dBundle, + window::{Window, WindowResized}, }; -use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}; +use bevy_rapier2d::prelude::*; +use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}; fn main() { App::new() + .insert_resource(WindowDescriptor { + title: "Tanks!".to_string(), + resizable: true, + ..Default::default() + }) .add_plugins(DefaultPlugins) .add_startup_system(spawn_camera) .add_startup_system(setup) .add_plugin(LogDiagnosticsPlugin::default()) .add_plugin(FrameTimeDiagnosticsPlugin::default()) - .add_stage_after(CoreStage::Update, "physics", SystemStage::parallel() - .with_run_criteria(FixedTimestep::steps_per_second(60.0)) - .with_system(movement.label("movement")) - .with_system(camera_follow.after("movement")) - ) + .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0)) + .add_plugin(RapierDebugRenderPlugin::default()) + .add_system_to_stage(PhysicsStages::Writeback, camera_follow) + .add_system(movement) + .add_system(window_resized_event) .run(); } -fn spawn_camera(mut commands: Commands) { - let mut camera = OrthographicCameraBundle::new_2d(); - camera.orthographic_projection.scaling_mode = ScalingMode::None; - camera.transform = Transform::from_xyz(0.0, 0.0, 100.0); - commands.spawn_bundle(camera); +fn window_resized_event( + mut events: EventReader<WindowResized>, + mut window: ResMut<WindowDescriptor>, +) { + for event in events.iter() { + window.width = event.width.try_into().unwrap(); + window.height = event.height.try_into().unwrap(); + } } fn camera_follow( - player_query: Query<(&Transform, With<Player>)>, + player_query: Query<(&Player, &Transform)>, mut camera_query: Query<&mut Transform, (Without<Player>, With<Camera>)>, ) { - let (player_transform, _) = player_query.single(); + let (_, transform) = player_query.single(); let mut camera_transform = camera_query.single_mut(); - camera_transform.translation.x = player_transform.translation.x; - camera_transform.translation.y = player_transform.translation.y; + camera_transform.translation.x = transform.translation.x; + camera_transform.translation.y = transform.translation.y; } -#[derive(Component, Inspectable)] -pub struct Player { - speed: Vec3, - radius: f32 -} - -#[derive(Component, Clone)] -pub struct Collider { - speed_mul: f32, - height: bool, +fn spawn_camera(mut commands: Commands) { + let mut camera = OrthographicCameraBundle::new_2d(); + camera.orthographic_projection.scaling_mode = ScalingMode::WindowSize; + camera.orthographic_projection.scale = 1.0; + camera.transform = Transform::from_xyz(0.0, 0.0, 100.0); + commands.spawn_bundle(camera); } -fn rotate ( - -) { - +#[derive(Component, Inspectable)] +pub struct Player { + speed: f32, + radius: f32, } -fn wall_collision_check( - target_player_pos: Vec3, - wall_query: &Query<(&Transform, &Collider), - (With<Collider>, Without<Player>)>, -) -> Option<Collider> { - for (wall_transform, collider) in wall_query.iter() { - let collision = collide( - target_player_pos, - Vec2::splat(0.03), - wall_transform.translation, - wall_transform.scale.xy() - ); - if collision.is_some() { - return Some(collider.clone()); +fn movement(mut player_query: Query<(&mut Player, &mut Velocity)>, keyboard: Res<Input<KeyCode>>) { + for (player, mut rb_vels) in player_query.iter_mut() { + let mut acc = Vec2::new(0.0, 0.0); + if keyboard.pressed(KeyCode::W) { + acc.y += 1.0; } - } - None -} - -// https://stackoverflow.com/questions/3838329 -fn ccw (a: Vec3, b: Vec3, c: Vec3) -> bool { - (c.y - a.y) * (b.x - a.x) > (b.y - a.y) * (c.x - a.x) -} - -fn intersect_segment_segment (a: Vec3, b: Vec3, c: Vec3, d: Vec3) -> bool { - ccw(a, c, d) != ccw(b, c, d) && ccw(a, b, c) != ccw(a, b, d) -} - -fn collision_segment_segment ( - pos: Vec3, vel: Vec3, - lo: Vec3, hi: Vec3, norm: Vec3 -) -> (Vec3, Vec3) { - if intersect_segment_segment(pos, pos + vel, lo, hi) { - let target = pos + vel - lo; - let tan = (hi - lo).normalize(); - let tv = target.dot(tan) * tan; - return (lo + tv + norm * 0.0001, Vec3::ZERO) - } - (pos, vel) -} - -// https://stackoverflow.com/questions/1073336 -fn intersect_segment_circle (e: Vec3, l: Vec3, c: Vec3, r: f32) -> bool { - if (e + l - c).length_squared() < r * r { return true } - if (e - c).length_squared() < r * r { return true } - - let d = l; - let f = e - c; - let a = d.length_squared(); - let b = 2.0 * f.dot(d); - let z = f.dot(f) - r * r; - let delta = b * b - 4.0 * a * z; - if delta > 0.0 { - let deltaroot = delta.sqrt(); - let t1 = (-b - deltaroot) / (2.0 * a); - if t1 >= 0.0 && t1 <= 1.0 { return true } - let t2 = (-b + deltaroot) / (2.0 * a); - if t2 >= 0.0 && t2 <= 1.0 { return true } - } - false -} - -fn collision_segment_circle ( - pos: Vec3, vel: Vec3, - center: Vec3, rad: f32 -) -> (Vec3, Vec3) { - if intersect_segment_circle(pos, vel, center, rad) { - let out = pos + vel - center; - let norm = out.normalize(); - let perp = Vec3::new(-out.y, out.x, 0.0).dot(out) * 2.0; - return (norm * rad * 1.0005 + center, out * perp) - } - (pos, vel) -} - -fn movement ( - mut player_query: Query<(&mut Player, &mut Transform)>, - wall_query: Query<(&Transform, &Collider), - (With<Collider>, Without<Player>)>, - keyboard: Res<Input<KeyCode>>, - time: Res<Time>, -) { - let (mut player, mut transform) = player_query.single_mut(); - - let mut acc = Vec3::new(0.0, 0.0, 0.0); - if keyboard.pressed(KeyCode::W) { - acc.y += 1.0; - } - if keyboard.pressed(KeyCode::S) { - acc.y -= 1.0; - } - if keyboard.pressed(KeyCode::A) { - acc.x -= 1.0; - } - if keyboard.pressed(KeyCode::D) { - acc.x += 1.0; - } - if acc.length_squared() > 1.0 { acc = acc.normalize(); } - acc *= time.delta_seconds(); - - player.speed += acc * 0.1; - player.speed *= 0.8; - - for (wall_transform, collider) in wall_query.iter() { - let center = wall_transform.translation; - let size = wall_transform.scale; - let (pos, vel) = collision_segment_segment( - transform.translation, player.speed, - center + Vec3::new(size.x/2.0 + player.radius, size.y/2.0, 0.0), - center + Vec3::new(size.x/2.0 + player.radius, -size.y/2.0, 0.0), - Vec3::new(1.0, 0.0, 0.0) - ); - let (pos, vel) = collision_segment_segment( - pos, vel, - center + Vec3::new(-size.x/2.0 - player.radius, size.y/2.0, 0.0), - center + Vec3::new(-size.x/2.0 - player.radius, -size.y/2.0, 0.0), - Vec3::new(-1.0, 0.0, 0.0) - ); - let (pos, vel) = collision_segment_segment( - pos, vel, - center + Vec3::new(size.x/2.0, size.y/2.0 + player.radius, 0.0), - center + Vec3::new(-size.x/2.0, size.y/2.0 + player.radius, 0.0), - Vec3::new(0.0, 1.0, 0.0) - ); - let (pos, vel) = collision_segment_segment( - pos, vel, - center + Vec3::new(size.x/2.0, -size.y/2.0 - player.radius, 0.0), - center + Vec3::new(-size.x/2.0, -size.y/2.0 - player.radius, 0.0), - Vec3::new(0.0, -1.0, 0.0) - ); - let (pos, vel) = collision_segment_circle( - pos, vel, - center + Vec3::new(size.x/2.0, size.y/2.0, 0.0), - player.radius - ); - transform.translation = pos; - player.speed = vel; - } - - transform.translation += player.speed; - /* - let target = transform.translation + player.speed; - if let Some(collider) = wall_collision_check(target, &wall_query) { - if !collider.height { - transform.translation += player.speed - * collider.speed_mul; - player.speed *= 0.8; - } else { - player.speed *= 0.0; + if keyboard.pressed(KeyCode::S) { + acc.y -= 1.0; } - } else { - transform.translation = target; - }*/ -} - -fn spawn_rect( - commands: &mut Commands, - meshes: &mut ResMut<Assets<Mesh>>, - materials: &mut ResMut<Assets<ColorMaterial>>, - color: Color, - pos: Vec3, - size: Vec3 -) { - commands.spawn_bundle(MaterialMesh2dBundle { - mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), - transform: Transform { - translation: pos, - scale: size, - ..default() - }, - material: materials.add(ColorMaterial::from(color)), - ..default() - }); + if keyboard.pressed(KeyCode::A) { + acc.x -= 1.0; + } + if keyboard.pressed(KeyCode::D) { + acc.x += 1.0; + } + if acc.length_squared() > 0.0 { + acc /= acc.length(); + } + rb_vels.linvel = acc * player.speed; + } } #[derive(Deserialize)] struct Map { - name: String, - walls: Vec<Vec<i32>>, - hives: Vec<i32>, - lives: Vec<Vec<i32>> + name: String, + walls: Vec<Vec<i32>>, + hives: Vec<i32>, + lives: Vec<Vec<i32>>, } fn setup_map( @@ -258,28 +109,25 @@ fn setup_map( mut meshes: ResMut<Assets<Mesh>>, mut materials: ResMut<Assets<ColorMaterial>>, ) { - let file = File::open("assets/maps/TERM.txt").expect("No map file found"); - let map : Map = serde_json::from_reader(BufReader::new(file)).unwrap(); + let file = File::open("assets/maps/OFFC.txt").expect("No map file found"); + let map: Map = serde_json::from_reader(BufReader::new(file)).unwrap(); let minx = map.walls.iter().map(|w| w[0]).min().unwrap() as f32; let maxx = map.walls.iter().map(|w| w[2]).max().unwrap() as f32; let miny = map.walls.iter().map(|w| w[1]).min().unwrap() as f32; let maxy = map.walls.iter().map(|w| w[3]).max().unwrap() as f32; - let origin = Vec3::new( - maxx - minx, - maxy - miny, - 0.0 - ); + let origin = Vec3::new(maxx - minx, maxy - miny, 0.0); for wall in &map.walls { let upleft = Vec3::new(wall[0] as f32, wall[1] as f32, 0.0); let downright = Vec3::new(wall[2] as f32, wall[3] as f32, 0.0); - let center = (upleft + downright - origin) / 2.0 * 0.002; + let center = (upleft + downright - origin) / 2.0; let size_big = Vec3::new( - (wall[2] - wall[0] + 3) as f32, - (wall[3] - wall[1] + 3) as f32, 1.0) * 0.002; - let movecenter = center - Vec3::new(0.0, 0.0, - if wall[4] == 2 { 1.0 } else { 0.0 }); + (wall[2] - wall[0] + 3) as f32, + (wall[3] - wall[1] + 3) as f32, + 1.0, + ); + let movecenter = center - Vec3::new(0.0, 0.0, if wall[4] == 2 { 1.0 } else { 0.0 }); commands.spawn_bundle(MaterialMesh2dBundle { mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), transform: Transform { @@ -294,32 +142,27 @@ fn setup_map( for wall in &map.walls { let upleft = Vec3::new(wall[0] as f32, wall[1] as f32, 0.0); let downright = Vec3::new(wall[2] as f32, wall[3] as f32, 0.0); - let center = (upleft + downright - origin) / 2.0 * 0.002; - let size = Vec3::new( - (wall[2] - wall[0]) as f32, - (wall[3] - wall[1]) as f32, 1.0) * 0.002; + let center = (upleft + downright - origin) / 2.0; + let size = Vec3::new((wall[2] - wall[0]) as f32, (wall[3] - wall[1]) as f32, 1.0); let color = match wall[4] { 1 => Color::rgba(0.7, 0.2, 0.0, 1.0), 2 => Color::rgba(0.15, 0.4, 0.03, 1.0), 3 => Color::rgba(0.4, 0.4, 0.4, 1.0), _ => Color::rgba(1.0, 0.4, 0.03, 1.0), }; - let movecenter = center - Vec3::new(0.0, 0.0, - if wall[4] == 2 { 1.0 } else { 0.0 }); - commands.spawn_bundle(MaterialMesh2dBundle { - mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), - transform: Transform { - translation: movecenter, - scale: size, + let movecenter = center - Vec3::new(0.0, 0.0, if wall[4] == 2 { 1.0 } else { 0.0 }); + commands + .spawn_bundle(MaterialMesh2dBundle { + mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), + transform: Transform { + translation: movecenter, + scale: size, + ..default() + }, + material: materials.add(ColorMaterial::from(color)), ..default() - }, - material: materials.add(ColorMaterial::from(color)), - ..default() - }) - .insert(Collider { - speed_mul: if wall[4] == 2 { 0.5 } else { 1.0 }, - height: if wall[4] == 2 { false } else { true } - }); + }) + .insert(Collider::cuboid(0.5, 0.5)); } } @@ -327,25 +170,40 @@ fn setup( mut commands: Commands, mut meshes: ResMut<Assets<Mesh>>, mut materials: ResMut<Assets<ColorMaterial>>, + mut rapier_config: ResMut<RapierConfiguration>, ) { - let color = commands.spawn_bundle(MaterialMesh2dBundle { - mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), - transform: Transform::default().with_scale(Vec3::splat(1.2)), - material: materials.add(ColorMaterial::from(Color::BLACK)), - ..default() - }).id(); + rapier_config.gravity = Vec2::ZERO; + + let color = commands + .spawn_bundle(MaterialMesh2dBundle { + mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), + transform: Transform::default().with_scale(Vec3::splat(1.2)), + material: materials.add(ColorMaterial::from(Color::BLACK)), + ..default() + }) + .id(); - commands.spawn_bundle(MaterialMesh2dBundle { - mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), - transform: Transform::default().with_scale(Vec3::splat(0.03)), - material: materials.add(ColorMaterial::from(Color::WHITE)), - ..default() - }) + commands + .spawn_bundle(MaterialMesh2dBundle { + mesh: meshes.add(Mesh::from(shape::Quad::default())).into(), + transform: Transform::default().with_scale(Vec3::splat(13.0)), + material: materials.add(ColorMaterial::from(Color::WHITE)), + ..default() + }) .push_children(&[color]) - .insert(Player { - speed: Vec3::new(0.0, 0.0, 0.0), - radius: 0.015 - }); + .insert(Player { + speed: 300.0, + radius: 10.0, + }) + .insert(RigidBody::Dynamic) + .insert(Restitution::coefficient(0.0)) + .insert(Collider::ball(1.0)) + .insert(LockedAxes::ROTATION_LOCKED) + .insert(Damping { + linear_damping: 0.8, + angular_damping: 1.0, + }) + .insert(Velocity::zero()); setup_map(commands, meshes, materials); } |