Update dependencies & readme

Author: entropylost

Cargo.lock

@@ -9,15 +9,15 @@ nalgebra = { version = "0.33.0", features = [
     "convert-glam028",
     "convert-glam027",
 ] }
-prism = { path = "../prism" }
+prism = { git = "https://github.com/entropylost/prism" }
 color-eyre = "0.6.2"
-sefirot = { path = "../sefirot/sefirot", features = [
+sefirot = { git = "https://github.com/entropylost/sefirot", features = [
     "bevy",
     "glam",
     "nalgebra",
 ] }
-sefirot_grid = { path = "../sefirot/sefirot_grid" }
-bevy_sefirot = { path = "../sefirot/bevy_sefirot" }
+sefirot_grid = { git = "https://github.com/entropylost/sefirot" }
+bevy_sefirot = { git = "https://github.com/entropylost/sefirot" }
 bevy_egui = "0.29.0"
 egui = "0.28.1"
 bevy_flycam = "0.14.1"

Cargo.toml

@@ -12,23 +12,28 @@ Install [Rust](https://www.rust-lang.org/tools/install), clone this repository,
 
 To launch the program, execute `cargo r --release scenes/glassbreak-3.scene`. When running, the keys `WASD[Space][Shift]` can be used to move the camera, and the mouse will rotate the camera, togglable via `[Esc]`. The key `\` will toggle the controls display, and `[Enter]` will run/pause the simulation.
 
-The files use the [rusty object notation](https://github.com/ron-rs/ron) (ron) serialization format, with the `.scene` extension used to describe loadable scenes, and `.pts` to describe sets of points which can be referenced by objects in the scene files. The parameters used for the objects and constants can be seen in [`src/data.rs`](src/data.rs), as well as the default values.
+The files use the [Rusty Object Notation](https://github.com/ron-rs/ron) (RON) serialization format, with files ending in the `.scene` extension used to describe loadable scenes, and `.pts` to describe sets of points which can be referenced by objects in the scenes. The parameters used for the objects and constants can be seen in [`src/data.rs`](src/data.rs), as well as the default values. [`src/bin/generate.rs`](src/bin/generate.rs) also shows an example program that can be used to generate a `.pts` file.
 
 ## Gallery
 
 
 <table align="center">
     <tr>
-        <td align="center"><img src="images/glassbreak-3-fracture.png" alt="Glassbreak 3 Fracture Pattern"></td>
-        <td align="center"><img src="images/glassbreak-large-front.png" alt="Glassbreak Large Front Fracture>"></td>
-        <td align="center"><img src="images/glassbreak-large-back.png" alt="Glassbreak Large Back Fracture>"></td>
+        <td align="center"><img src="images/glassbreak-3-anim.gif" alt="Glassbreak 3 Fracture Pattern"><a href="scenes/glassbreak-3.scene"><code>glassbreak-3</code></a> (see <a href="images/glassbreak-3-fracture.png">still</a>)</td>
+        <td align="center"><img src="images/rigid-collide-4-side.png" alt="Rigid Collide 4 Side View"><a href="scenes/rigid-collide-4.scene"><code>rigid-collide-4</code></a> (side)</td>
+        <td align="center"><a href="images/glassbreak-large-front.png"><img src="images/glassbreak-large-front-50.png" alt="Glassbreak Large Front Fracture (downscaled)"></a><a href="scenes/glassbreak-large.scene"><code>glassbreak-large</code></a> (front)</td>
     </tr>
     <tr>
-        <td align="center"><img src="images/rigid-collide-4-side.png" alt="Rigid Collide 4 Side View"></td>
-        <td align="center"><img src="images/glassbreak-traced.png" alt="Rendered glassbreak"></td>
-        <td align="center"><img src="images/tablebreak-cone.png" alt="Hertzian cone display"></td>
+        <td align="center"><img src="images/prism-front.png" alt="Prism Front View"><a href="scenes/prism.scene">The Illumaniti</a></td>
+        <td align="center"><img src="images/rigid-collide-4-front.png" alt="Rigid Collide 4 Front View"><a href="scenes/rigid-collide-4.scene"><code>rigid-collide-4</code></a> (front)</td>
+        <td align="center"><img src="images/glassbreak-large-back.png" alt="Glassbreak Large Back Fracture"><a href="scenes/glassbreak-large.scene"><code>glassbreak-large</code></a> (back)</td>
     </tr>
     <tr>
-    <td colspan="3" align="center"><img src="images/banner-pattern.png" alt="Wide glassbreak pattern"></td>
+        <td align="center"><img src="images/glassbreak-traced.png" alt="Rendered glassbreak"><a href="scenes/glassbreak-3.scene"><code>glassbreak-3</code></a> using <a href="https://github.com/entropylost/morningstar/tree/render">the alternate renderer</a></td>
+        <td align="center"><img src="images/tablecrush-cone.png" alt="Tablecrush Hertzian cone"><a href="scenes/tablecrush.scene"><code>tablecrush</code></a> making a Hertzian cone</td>
+        <td align="center"><a href="images/collide-200x60x60.png"><img src="images/collide-200x60x60-50.png" alt="200x60x60 Collision"></a><a href="scenes/tablecrush.scene">Ball hitting a 200 by 60 by 60 block</td>
+    </tr>
+    <tr>
+        <td colspan="3" align="center"><img src="images/banner-pattern.png" alt="Wide glassbreak pattern"><a href="scenes/glassbreak-wide.scene"><code>glassbreak-wide</code></a></td>
     </tr>
 </table>

README.md

@@ -1,27 +1,27 @@
 Scene(
     objects: [
         (
-            color: Srgba((red:-1.0,green:-1.0,blue:-1.0,alpha:1.0)),
+            // color: Srgba((red:-1.0,green:-1.0,blue:-1.0,alpha:1.0)),
             particles: "prismpanel.pts",
             unfix: true,
-            lightness_multiplier: 15.0,
-            lightness_power: 3.0,
+            // lightness_multiplier: 15.0,
+            // lightness_power: 3.0,
         ),
         (
             color: Srgba((red:0.1,green:0.1,blue:0.1,alpha:1.0)),
             particles: "largeball.pts",
             position: (0.0, 40.0, 15.0),
-            velocity: (0.0, 0.0, -1.0),
+            velocity: (0.0, 1.0, -1.0),
             mass: inf,
         ),
     ],
     constants: (
-        background_color: Srgba((red:0.1,green:0.1,blue:0.1,alpha:1.0)),
+        // background_color: Srgba((red:0.1,green:0.1,blue:0.1,alpha:1.0)),
         ambient_only: true,
         dt: 0.016,
         substeps: 20,
         breaking_model: Distance(
-            max: 1.00007,
+            max: 1.0001,
         ),
         // breaking_model: Stress(
         //     normal: 2e-4,

images/collide-200x60x60-50.png

@@ -2,16 +2,13 @@ use std::fs::File;
 
 use bevy::math::{IVec3, Vec3};
 use bevy::utils::{default, HashMap};
-use ext::Volume2d;
 use morningstar::data::*;
-use nalgebra::{Vector2, Vector3};
+use nalgebra::Vector3;
 use prism::shape::*;
 use prism::*;
 use smallvec::SmallVec;
 
 fn main() {
-    let scaling = 60.0;
-
     let volume = Cuboid::new(Vector3::new(100.0, 100.0, 2.5));
 
     let points = volume.packed_points(PackedSettings {
@@ -50,7 +47,7 @@ fn main() {
                     let ix = ix + IVec3::new(x, y, z);
                     if let Some(neighbors) = grid.get(&ix) {
                         for &(n, pos) in neighbors {
-                            if n != i as u32 && ((pos - p.position) / Vec3::new(1.2, 0.5, 1.0)).length() < bond_radius {
+                            if n != i as u32 && (pos - p.position).length() < bond_radius {
                                 bonds.push(Bond { other_particle: n });
                                 p.bond_count += 1;
                             }
@@ -66,7 +63,7 @@ fn main() {
         }
     }
 
-    let file = File::create("scenes/panel-big-aniso.pts").unwrap();
+    let file = File::create("scenes/panel-big.pts").unwrap();
 
     ron::ser::to_writer(file, &Particles { particles, bonds }).unwrap();
 }

images/collide-200x60x60.png

@@ -282,7 +282,7 @@ impl Default for Controls {
         Self {
             slice: SliceAxis::None,
             running: false,
-            slice_position: 0.0..0.0,
+            slice_position: -100.0..0.0,
             slice_bounds: -100.0..100.0,
             visualize_bonds: false,
             remove_singletons: false,
@@ -329,11 +329,13 @@ fn update_ui(
                 &mut controls.slice_position.start,
                 bounds.start..=bounds.end,
             )
-            .text("Slice Start"),
+            .text("Slice Start")
+            .clamp_to_range(false),
         );
         ui.add(
             egui::Slider::new(&mut controls.slice_position.end, bounds.start..=bounds.end)
-                .text("Slice End"),
+                .text("Slice End")
+                .clamp_to_range(false),
         );
         ui.checkbox(&mut controls.visualize_bonds, "Render Bonds");
         ui.checkbox(&mut controls.remove_singletons, "Remove Single Particles");
@@ -348,6 +350,12 @@ fn update_ui(
         controls.slice_position.start = mid;
         controls.slice_position.end = mid;
     }
+    if controls.slice_position.start == bounds.start {
+        controls.slice_position.start = -f32::INFINITY;
+    }
+    if controls.slice_position.end == bounds.end {
+        controls.slice_position.end = f32::INFINITY;
+    }
 }
 
 #[expect(clippy::too_many_arguments)]