Merge pull request #28 from MonkeFix/lunacys/repo-restructure

Repo restructure

Author: lunacys

.vscode/tasks.json

@@ -13,9 +13,14 @@
 				"isDefault": true
 			},
 			"args": [
+				"--bin",
+				"vs-rs",
 				"--features",
 				"bevy/dynamic_linking"
-			]
+			],
+			"options": {
+				"cwd": "./vs-rs/"
+			}
 		}
 	]
 }

Cargo.lock

@@ -1,22 +1,16 @@
-[package]
-name = "vs-rs"
-version = "0.1.0"
-edition = "2021"
+[workspace]
+resolver = "2"
+members = [
+    "common",
+    "collisions", 
+    "movement", 
+    "vs-assets",
+    "worldgen",
+    "vs-rs"
+]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bevy = { version = "0.14" }
-rand = "0.8.5"
-serde_json = "1.0"
-serde = "1.0"
-num_enum = "0.7"
-bevy_framepace = "0.17"
-bevy-inspector-egui = { version = "0.25" }
-bevy_simple_tilemap = "0.15"
-tiled = "0.12"
-pathfinding = "4.9"
-thiserror = "1.0"
+[profile.release]
+lto = true
 
 # Enable a small amount of optimization in debug mode
 [profile.dev]

Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "collisions"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+"common" = { path = "../common" }
+"bevy" = { version = "0.14"}
+num_enum = "0.7"

collisions/Cargo.toml

@@ -1,10 +1,9 @@
-#![allow(dead_code)]
-
-use crate::movement::Position;
 use bevy::prelude::*;
+use common::FRect;
+use common::Position;
 
 use super::{
-    circle_to_circle, rect_to_circle, rect_to_rect,
+    shape_tests::*,
     shapes::{ColliderShape, ColliderShapeType},
     store::ALL_LAYERS,
     ColliderId, CollisionResultRef, RaycastHit,
@@ -52,10 +51,10 @@ impl Collider {
     pub fn new(data: ColliderData, entity: Option<Entity>) -> Self {
         let bounds = match data.shape_type {
             ColliderShapeType::Circle { radius } => {
-                super::Rect::new(0.0, 0.0, radius * 2.0, radius * 2.0)
+                FRect::new(0.0, 0.0, radius * 2.0, radius * 2.0)
             }
-            ColliderShapeType::Box { width, height } => super::Rect::new(0.0, 0.0, width, height),
-            ColliderShapeType::None => super::Rect::new(0.0, 0.0, 0.0, 0.0),
+            ColliderShapeType::Box { width, height } => FRect::new(0.0, 0.0, width, height),
+            ColliderShapeType::None => FRect::new(0.0, 0.0, 0.0, 0.0),
         };
 
         let mut shape = ColliderShape::new(data.shape_type);
@@ -78,7 +77,7 @@ impl Collider {
         self.shape.position + self.data.local_offset
     }
 
-    pub fn bounds(&self) -> super::Rect {
+    pub fn bounds(&self) -> FRect {
         self.shape.bounds
     }
 
@@ -240,20 +239,16 @@ impl Collider {
     pub fn recalc_bounds(&mut self) {
         match self.shape.shape_type {
             ColliderShapeType::Circle { radius } => {
-                self.shape.bounds.x =
-                    self.shape.center.x + self.data.local_offset.x - radius;
-                self.shape.bounds.y =
-                    self.shape.center.y + self.data.local_offset.y - radius;
+                self.shape.bounds.x = self.shape.center.x + self.data.local_offset.x - radius;
+                self.shape.bounds.y = self.shape.center.y + self.data.local_offset.y - radius;
                 self.shape.bounds.width = radius * 2.0;
                 self.shape.bounds.height = radius * 2.0;
             }
             ColliderShapeType::Box { width, height } => {
                 let hw = width / 2.0;
                 let hh = height / 2.0;
-                self.shape.bounds.x =
-                    self.shape.position.x + self.data.local_offset.x - hw;
-                self.shape.bounds.y =
-                    self.shape.position.y + self.data.local_offset.y - hh;
+                self.shape.bounds.x = self.shape.position.x + self.data.local_offset.x - hw;
+                self.shape.bounds.y = self.shape.position.y + self.data.local_offset.y - hh;
                 self.shape.bounds.width = width;
                 self.shape.bounds.height = height;
             }
@@ -299,8 +294,6 @@ impl Collider {
     }
 
     fn needs_update(&self, position: &Position) -> bool {
-        !self.is_registered
-            || self.shape.position != position.0
-            || self.shape.center != position.0
+        !self.is_registered || self.shape.position != position.0 || self.shape.center != position.0
     }
 }

src/collisions/colliders.rs renamed to collisions/src/colliders.rs

@@ -0,0 +1,70 @@
+use bevy::prelude::*;
+use colliders::Collider;
+
+pub mod colliders;
+pub mod plugin;
+pub mod prelude;
+pub mod shape_tests;
+pub mod shapes;
+mod spatial_hash;
+pub mod store;
+
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Reflect)]
+pub struct ColliderId(pub u32);
+
+#[derive(Debug, Default, Clone, Copy)]
+pub struct CollisionResult {
+    pub collider: Option<ColliderId>,
+    pub normal: Vec2,
+    pub min_translation: Vec2,
+    pub point: Vec2,
+}
+
+#[derive(Debug, Default, Clone, Copy)]
+pub struct CollisionResultRef<'a> {
+    pub collider: Option<&'a Collider>,
+    pub normal: Vec2,
+    pub min_translation: Vec2,
+    pub point: Vec2,
+}
+
+impl CollisionResult {
+    pub fn invert(&mut self) {
+        self.normal.x = -self.normal.x;
+        self.normal.y = -self.normal.y;
+
+        self.min_translation.x = -self.min_translation.x;
+        self.min_translation.y = -self.min_translation.y;
+    }
+
+    pub fn from_ref(result: &CollisionResultRef) -> Self {
+        let collider = result.collider.map(|col| col.id);
+
+        Self {
+            collider,
+            normal: result.normal,
+            min_translation: result.min_translation,
+            point: result.point,
+        }
+    }
+}
+
+impl<'a> CollisionResultRef<'a> {
+    pub fn invert(&mut self) {
+        self.normal.x = -self.normal.x;
+        self.normal.y = -self.normal.y;
+
+        self.min_translation.x = -self.min_translation.x;
+        self.min_translation.y = -self.min_translation.y;
+    }
+}
+
+#[derive(Debug, Default, Clone, Copy)]
+pub struct RaycastHit {
+    pub collider: Option<ColliderId>,
+    pub fraction: f32,
+    pub distance: f32,
+    pub point: Vec2,
+    pub normal: Vec2,
+    pub centroid: Vec2,
+}

collisions/src/lib.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code)]
 
 use super::{colliders::ColliderData, store::ColliderStore, ColliderId};
-use crate::movement::Position;
 use bevy::{ecs::system::EntityCommands, prelude::*};
+use common::Position;
 
 #[derive(Component, Debug, Clone, Copy, PartialEq, Eq, Reflect, Hash)]
 pub struct ColliderComponent {

src/collisions/plugin.rs renamed to collisions/src/plugin.rs

@@ -0,0 +1,5 @@
+pub use super::{ColliderId, CollisionResult, CollisionResultRef};
+pub use crate::colliders::{Collider, ColliderData};
+pub use crate::plugin::{ColliderBundle, ColliderComponent, ColliderDespawnable};
+pub use crate::shapes::{ColliderShape, ColliderShapeType};
+pub use crate::store::{ColliderIdResolver, ColliderStore, ALL_LAYERS};