Adds start of physics plugin

dev
Joey Pollack 2 years ago
parent c586c87afe
commit 236bb69be1

9
Cargo.lock generated

@ -1164,6 +1164,7 @@ dependencies = [
"bevy", "bevy",
"core", "core",
"hello", "hello",
"physics",
] ]
[[package]] [[package]]
@ -1381,6 +1382,7 @@ name = "core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"bevy", "bevy",
"physics",
] ]
[[package]] [[package]]
@ -2682,6 +2684,13 @@ dependencies = [
"indexmap", "indexmap",
] ]
[[package]]
name = "physics"
version = "0.1.0"
dependencies = [
"bevy",
]
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.2.14" version = "0.2.14"

@ -27,10 +27,12 @@ linker = "rust-lld.exe"
[dependencies] [dependencies]
hello = { workspace = true } hello = { workspace = true }
core = { workspace = true } core = { workspace = true }
physics = { workspace = true }
bevy = { workspace = true } bevy = { workspace = true }
# bevy = { version = "0.13.0", features = ["dynamic_linking"] } # bevy = { version = "0.13.0", features = ["dynamic_linking"] }
[workspace.dependencies] [workspace.dependencies]
hello = { path = "crates/hello" } hello = { path = "crates/hello" }
core = { path = "crates/core" } core = { path = "crates/core" }
physics = { path = "crates/physics" }
bevy = { version = "0.13.0" } bevy = { version = "0.13.0" }

BIN
asset src/brick.blend (Stored with Git LFS)

Binary file not shown.

BIN
asset src/wall.blend (Stored with Git LFS)

Binary file not shown.

BIN
assets/brick.glb (Stored with Git LFS)

Binary file not shown.

BIN
assets/wall.glb (Stored with Git LFS)

Binary file not shown.

@ -6,6 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
bevy = { workspace = true } bevy = { workspace = true }
physics = { workspace = true }

@ -1,15 +1,14 @@
use bevy::prelude::*; use bevy::prelude::*;
use crate::movement::{MovementPlugin, Velocity}; use physics::{PhysicsPlugin, components::Velocity};
pub struct CorePlugin; pub struct CorePlugin;
impl Plugin for CorePlugin impl Plugin for CorePlugin
{ {
fn build(&self, app: &mut App) fn build(&self, app: &mut App)
{ {
app.add_plugins(MovementPlugin) app.add_plugins(PhysicsPlugin)
.add_systems(Startup, setup); .add_systems(Startup, setup);
} }
} }
@ -40,7 +39,7 @@ fn setup(mut commands: Commands, server: Res<AssetServer>, mut ambient_light: Re
let brick_handle: Handle<Scene> = server.load("brick.glb#Scene0"); let brick_handle: Handle<Scene> = server.load("brick.glb#Scene0");
commands.spawn(SceneBundle { commands.spawn(SceneBundle {
scene: brick_handle, scene: brick_handle,
transform: Transform::from_xyz(0.0, 8.0, 0.0), transform: Transform::from_xyz(0.0, 7.0, 0.0),
.. default() .. default()
}); });
@ -51,7 +50,7 @@ fn setup(mut commands: Commands, server: Res<AssetServer>, mut ambient_light: Re
transform: Transform::from_xyz(0.0, -7.75, 0.0), transform: Transform::from_xyz(0.0, -7.75, 0.0),
..default() ..default()
}, },
Velocity::new(0.5, 0.5, 0.0))); Velocity::new(8.0, 8.0, 0.0)));
// PADDLE // PADDLE
let paddle_handle: Handle<Scene> = server.load("paddle.glb#Scene0"); let paddle_handle: Handle<Scene> = server.load("paddle.glb#Scene0");
@ -60,4 +59,26 @@ fn setup(mut commands: Commands, server: Res<AssetServer>, mut ambient_light: Re
transform: Transform::from_xyz(0.0, -8.0, 0.0), transform: Transform::from_xyz(0.0, -8.0, 0.0),
..default() ..default()
}); });
// WALLS
let wall_handle: Handle<Scene> = server.load("wall.glb#Scene0");
commands.spawn(SceneBundle {
scene: wall_handle.clone(),
transform: Transform::from_xyz(13.0, 0.0, 0.0),
..default()
});
commands.spawn(SceneBundle {
scene: wall_handle.clone(),
transform: Transform::from_xyz(-13.0, 0.0, 0.0),
..default()
});
commands.spawn(SceneBundle {
scene: wall_handle.clone(),
transform: Transform::from_rotation(Quat::from_rotation_z(3.14159 * 0.5))
.with_translation(Vec3::new(0.0, 10.0, 0.0)),
..default()
});
} }

@ -1,4 +1,3 @@
pub mod core; pub mod core;
pub mod movement;

@ -2,38 +2,16 @@
use bevy::prelude::*; use bevy::prelude::*;
pub struct MovementPlugin; // pub struct MovementPlugin;
impl Plugin for MovementPlugin // impl Plugin for MovementPlugin
{ // {
fn build(&self, app: &mut App) // fn build(&self, app: &mut App)
{ // {
app.add_systems(Update, update_movement); // app.add_systems(Update, update_movement);
} // }
} // }
#[derive(Component)] // COMPONENTS
pub struct Velocity(Vec3);
impl Default for Velocity
{
fn default() -> Self
{
Self { 0: Vec3::new(0.0, 0.0, 0.0)}
}
}
impl Velocity
{
pub fn new(x: f32, y: f32, z: f32) -> Self{
Self { 0: Vec3::new(x, y, z) }
}
}
// SYSTEMS // SYSTEMS
fn update_movement(mut moving_objects: Query<(&Velocity, &mut Transform)>, time: Res<Time>)
{
for (velocity, mut transform) in moving_objects.iter_mut()
{
transform.translation += velocity.0 * time.delta_seconds();
}
}

@ -0,0 +1,11 @@
[package]
name = "physics"
description = "The Physics Module For the Game"
version = "0.1.0"
edition = "2021"
[dependencies]
bevy = { workspace = true }

@ -0,0 +1,126 @@
use bevy::prelude::*;
#[derive(Component)]
pub struct Velocity
{
pub value: Vec3,
}
impl Default for Velocity
{
fn default() -> Self
{
Self { value: Vec3::new(0.0, 0.0, 0.0)}
}
}
impl Velocity
{
pub fn new(x: f32, y: f32, z: f32) -> Self{
Self { value: Vec3::new(x, y, z) }
}
}
#[derive(Component)]
pub struct AABB
{
min_extents: Vec3,
max_extents: Vec3,
half_size: Vec3,
}
impl AABB
{
// CONSTRUCTORS
pub fn from_point_and_size(center: Vec3, dimensions: Vec3) -> Self
{
let half_size = dimensions * 0.5;
Self {
min_extents: center - half_size,
max_extents: center + half_size,
half_size
}
}
// ACCESSORS
pub fn get_center_point(&self) -> Vec3
{
Vec3::new(self.min_extents.x + self.half_size.x,
self.min_extents.y + self.half_size.y,
self.min_extents.z + self.half_size.z)
}
pub fn get_half_size(&self) -> Vec3
{
self.half_size.clone()
}
// INTERFACE METHODS
pub fn set_position(&mut self, position: Vec3)
{
self.min_extents = Vec3::new(
position.x - self.half_size.x,
position.y - self.half_size.y,
position.z - self.half_size.z);
self.max_extents = Vec3::new(
position.x + self.half_size.x,
position.y + self.half_size.y,
position.z + self.half_size.z);
}
pub fn set_size(&mut self, size: Vec3)
{
let center = self.get_center_point();
self.half_size = size * 0.5;
self.min_extents = Vec3::new(
center.x - self.half_size.x,
center.y - self.half_size.y,
center.z - self.half_size.z);
self.max_extents = Vec3::new(
center.x + self.half_size.x,
center.y + self.half_size.y,
center.z + self.half_size.z);
}
pub fn translate(&mut self, translation: Vec3)
{
self.min_extents.x += translation.x;
self.min_extents.y += translation.y;
self.min_extents.z += translation.z;
self.max_extents.x += translation.x;
self.max_extents.y += translation.y;
self.max_extents.z += translation.z;
}
pub fn contains_point(&self, test_point: Vec3) -> bool
{
if test_point.x < self.min_extents.x { return false; }
if test_point.y < self.min_extents.y { return false; }
if test_point.z < self.min_extents.z { return false; }
if test_point.x > self.max_extents.x { return false; }
if test_point.y > self.max_extents.y { return false; }
if test_point.z > self.max_extents.z { return false; }
true
}
pub fn intersects_with(&self, other: &AABB) -> bool
{
if self.min_extents.x > other.max_extents.x ||
other.min_extents.x > self.max_extents.x { return false }
if self.min_extents.y > other.max_extents.y ||
other.min_extents.y > self.max_extents.y { return false }
if self.min_extents.z > other.max_extents.z ||
other.min_extents.z > self.max_extents.z { return false }
true
}
}

@ -0,0 +1,14 @@
pub mod components;
pub mod systems;
use bevy::prelude::*;
pub struct PhysicsPlugin;
impl Plugin for PhysicsPlugin
{
fn build(&self, app: &mut App)
{
app.add_systems(Update, systems::update_movement);
}
}

@ -0,0 +1,13 @@
use bevy::prelude::*;
use crate::components::Velocity;
pub(crate) fn update_movement(mut moving_objects: Query<(&Velocity, &mut Transform)>, time: Res<Time>)
{
for (velocity, mut transform) in moving_objects.iter_mut()
{
transform.translation += velocity.value * time.delta_seconds();
}
}
Loading…
Cancel
Save