Add spawn/destroy controls

Author: Pixels67

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+      - uses: actions/checkout@v4
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose

Cargo.lock

@@ -4,4 +4,5 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-macroquad = "0.4.13"
+macroquad = "0.4.13"
+rand = "0.9.0"

Cargo.toml

@@ -1,15 +1,25 @@
 # Gravity Simulator
+
 A gravity simulator tech demo, made with Macroquad.
+
 ## Building from Source
+
 - [Install Rust](https://www.rust-lang.org/learn/get-started)
 - Run the following commands:
+
 ```sh
 git clone https://github.com/Pixels67/gravity-sim.git
 cd gravity-sim
 cargo build --release
 ```
+
 ***Note***: To get debug lines build with `--dev`
+
 ## Controls
+
 **[A]** / **[D]**: Left / Right \
 **[W]** / **[S]**: Forward / Back \
-**[LShift]** / **[LCtrl]**: Up / Down
+**[LShift]** / **[LCtrl]**: Up / Down
+
+**[LMB]** To enter object creation mode or if in object creation mode go into drag mode \
+**[RMB]** To return to idle/default mode

README.md

@@ -1,17 +1,23 @@
 pub mod object;
-pub mod world;
 pub mod physics;
 pub mod screen;
+pub mod world;
 
 #[cfg(test)]
 mod tests {
-    use macroquad::prelude::*;
     use crate::physics::*;
+    use macroquad::prelude::*;
 
     #[test]
     fn physics_get_grav_force() {
-        assert_eq!(get_grav_force(1., 1., 1., vec3(1., 0. ,0.)), vec3(1., 0., 0.));
-        assert_eq!(get_grav_force(1., 2., 3., vec3(2., 0. ,0.)), vec3(1.5, 0., 0.));
+        assert_eq!(
+            get_grav_force(1., 1., 1., vec3(1., 0., 0.)),
+            vec3(1., 0., 0.)
+        );
+        assert_eq!(
+            get_grav_force(1., 2., 3., vec3(2., 0., 0.)),
+            vec3(1.5, 0., 0.)
+        );
         assert_eq!(get_grav_force(1., 1., 1., Vec3::ZERO), Vec3::ZERO);
     }
 
@@ -126,4 +132,4 @@ mod tests {
 
         assert!(!ray.raycast(pos, 1.));
     }
-}
+}

src/lib.rs

@@ -1,9 +1,14 @@
-use macroquad::miniquad::window::*;
-use macroquad::prelude::*;
 use gravity_sim::object::*;
 use gravity_sim::world::*;
+use macroquad::miniquad::window::*;
+use macroquad::prelude::*;
 
-const BG_COLOR: Color = Color{r: 0.05, g: 0.05, b: 0.05, a: 1.};
+const BG_COLOR: Color = Color {
+    r: 0.05,
+    g: 0.05,
+    b: 0.05,
+    a: 1.,
+};
 const WINDOW_WIDTH: u32 = 1280;
 const WINDOW_HEIGHT: u32 = 720;
 const GRAV_CONST: f32 = 0.5;
@@ -14,9 +19,27 @@ async fn main() {
     let mut world = World::new(GRAV_CONST, UPDATE_INTERVAL);
     set_window_size(WINDOW_WIDTH, WINDOW_HEIGHT);
 
-    world.add_object(Object::new(vec3( 5., 0., 0.), vec3(0., 0.,  0.01), 1., 0.5, RED));
-    world.add_object(Object::new(vec3( 0., 0., 0.), vec3(0., 0.,  0.),   1., 0.5, GREEN));
-    world.add_object(Object::new(vec3(-5., 0., 0.), vec3(0., 0., -0.01), 1., 0.5, BLUE));
+    world.add_object(Object::new(
+        vec3(5., 0., 0.),
+        vec3(0., 0., 0.01),
+        1.,
+        0.5,
+        RED,
+    ));
+    world.add_object(Object::new(
+        vec3(0., 0., 0.),
+        vec3(0., 0., 0.),
+        1.,
+        0.5,
+        GREEN,
+    ));
+    world.add_object(Object::new(
+        vec3(-5., 0., 0.),
+        vec3(0., 0., -0.01),
+        1.,
+        0.5,
+        BLUE,
+    ));
 
     loop {
         clear_background(BG_COLOR);

src/main.rs

@@ -128,6 +128,16 @@ impl ObjectPool {
         self.objects.pop()
     }
 
+    pub fn remove(&mut self, id: usize) {
+        for i in 0..self.objects.len() {
+            if self.objects[i].id != id {
+                continue;
+            }
+            self.objects.swap_remove(i);
+            return;
+        }
+    }
+
     pub fn iter(&self) -> impl Iterator<Item = &Object> {
         self.objects.iter()
     }

src/object.rs

@@ -1,18 +1,24 @@
 use macroquad::prelude::*;
 
 pub fn get_grav_force(grav_const: f32, m1: f32, m2: f32, dist: Vec3) -> Vec3 {
-    if dist.length_squared() == 0. { return Vec3::ZERO; }
+    if dist.length_squared() == 0. {
+        return Vec3::ZERO;
+    }
     let force = grav_const * m1 * m2 / dist.length_squared();
     let dir = dist.normalize();
     dir * force
 }
 
 pub fn get_veloc(force: Vec3, mass: f32, time: f32) -> Vec3 {
-    if mass == 0. || time == 0. { return Vec3::ZERO; }
+    if mass == 0. || time == 0. {
+        return Vec3::ZERO;
+    }
     force / mass * time
 }
 
 pub fn get_displ(force: Vec3, mass: f32, time: f32) -> Vec3 {
-    if mass == 0. || time == 0. { return Vec3::ZERO; }
+    if mass == 0. || time == 0. {
+        return Vec3::ZERO;
+    }
     force / mass * time * time
-}
+}

src/physics.rs

@@ -41,6 +41,10 @@ impl Ray {
         }
     }
 
+    pub fn new_from_mouse(cam: &Camera3D, len: f32) -> Self {
+        Self::new_from_cam(cam, get_mouse_pos(), len)
+    }
+
     pub fn raycast(&self, target_pos: Vec3, margin_of_err: f32) -> bool {
         if self.dir == Vec3::ZERO {
             return false;
@@ -61,6 +65,18 @@ impl Ray {
         (closest_point - target_pos).length() <= margin_of_err
     }
 
+    pub fn end(&self) -> Vec3 {
+        self.origin + self.dir * self.len
+    }
+
+    pub fn grid_intersect(&self) -> Vec3 {
+        if self.dir.y >= 0. {
+            return Vec3::ZERO;
+        }
+
+        self.origin + (self.origin.y / self.dir.y.abs()) * self.dir
+    }
+
     #[cfg(debug_assertions)]
     pub fn draw(&self, color: Color) {
         draw_line_3d(self.origin, self.origin + self.dir * self.len, color);