Add Prism solid

Cargo.toml

@@ -52,6 +52,7 @@ clippy.collapsible_if = "allow"
 [features]
 default = ["std"]
 std = ["retrofire-core/std", "retrofire-geom/std"]
+stats = ["retrofire-core/stats"]
 
 [dependencies]
 retrofire-core = { version = "0.4.0", path = "core" }
@@ -101,6 +102,18 @@ harness = false
 name = "isect"
 harness = false
 
+[[bench]]
+name = "poly"
+harness = false
+
 [[bench]]
 name = "vec"
 harness = false
+
+[[bench]]
+name = "noise"
+harness = false
+
+[[bench]]
+name = "mat"
+harness = false

README.md

@@ -54,6 +54,7 @@ for custom allocators is planned in order to make `alloc` optional as well.
 * Type-tagged affine and linear transforms and projections
 * Perspective-correct texture mapping
 * Triangle mesh data structure and a library of shapes
+* Point, directional, and spotlight support
 * Cubic Bézier, Hermite, Catmull–Rom, and B-splines
 * Simple random number generation and distributions
 * Simple text rendering with bitmap fonts
@@ -62,15 +63,14 @@ for custom allocators is planned in order to make `alloc` optional as well.
 * Reading and writing pnm image files
 * Reading and writing Wavefront .obj files
 * Minifb, SDL2, and Wasm frontends
+* Procedural noise generation
 * Forever emoji-free README and docs
 * Forever LLM-free code
 
 ## In progress
 
 * Different camera types
-* Builtin light source support
-* Spherical etc UV mapping
-* Procedural noise generation
+* Spherical etc. UV mapping
 * Terminal frontend with ncurses
 * Cube mapping and skyboxes
 
@@ -115,8 +115,8 @@ The `retrofire-demos` package depends on `retrofire`.
 
 # Screenshots
 
-The classic Stanford bunny.
-![The classic Stanford bunny 3D model.](docs/bunny.jpg)
+The classic Stanford dragon.
+![A detailed 3D model of a dragon sculpture.](docs/dragon.jpg)
 
 A first-person mouse-and-keyboard scene with many "Rust crates" strewn on a
 checkered floor.
@@ -125,6 +125,9 @@ checkered floor.
 Ten thousand spherical particles positioned randomly in a sphere.
 ![Ten thousand spherical particles in random positions.](docs/sprites.jpg)
 
+A colorful torus rendered in a terminal.
+![A torus rendered in a terminal using block characters.](docs/curses.png)
+
 # License
 
 Copyright 2020-2025 Johannes Dahlström.

benches/e2e.rs

@@ -2,14 +2,15 @@
 
 use divan::Bencher;
 
-use retrofire_core::geom::{Normal3, Vertex3, tri, vertex};
-use retrofire_core::math::{
-    Color3f, Color4, Color4f, ProjMat3, perspective, pt2, pt3, rgb, rgba,
-    translate, viewport,
+use retrofire_core::{
+    geom::{Normal3, Vertex3, tri, vertex},
+    math::{
+        Color3f, Color4, Color4f, ProjMat3, perspective, pt3, rgb, rgba,
+        translate, viewport,
+    },
+    render::{Context, Frag, Model, debug::dir_to_rgb, render, shader},
+    util::{Buf2, dims, pnm},
 };
-use retrofire_core::render::debug::dir_to_rgb;
-use retrofire_core::render::{Context, Frag, Model, render, shader};
-use retrofire_core::util::{buf::Buf2, pnm};
 use retrofire_geom::solids::{Build, Sphere};
 
 #[cfg(false)]
@@ -28,13 +29,13 @@ fn triangle(b: Bencher, n: u32) {
         |v: Vertex3<Color3f>, mvp: &ProjMat3<Model>| {
             vertex(mvp.apply(&v.pos), v.attrib)
         },
-        |frag: Frag<Color3f<_>>| frag.var.to_color4(),
+        |frag: Frag<Color3f<_>>, _: &_| frag.var.to_color4(),
     );
 
-    let dims @ (w, h) = (640, 480);
+    let dims = dims::VGA_640_480;
     let modelview = translate((0.0, 0.0, 2.0)).to();
-    let project = perspective(1.0, w as f32 / h as f32, 0.1..1000.0);
-    let viewport = viewport(pt2(0, h)..pt2(w, 0));
+    let project = perspective(1.0, dims.aspect(), 0.1..1000.0);
+    let viewport = viewport(dims.into());
 
     let mut framebuf = Buf2::<Color4>::new(dims);
 
@@ -52,7 +53,7 @@ fn triangle(b: Bencher, n: u32) {
         }
     });
 
-    let center_pixel = framebuf[[w / 2, h / 2]];
+    let center_pixel = framebuf[[dims.0 / 2, dims.1 / 2]];
 
     assert_eq!(center_pixel, rgba(151, 128, 187, 255));
 
@@ -72,13 +73,13 @@ fn sphere(b: Bencher, res: u32) {
         |v: Vertex3<Normal3>, mvp: &ProjMat3<Model>| {
             vertex(mvp.apply(&v.pos), dir_to_rgb(v.attrib))
         },
-        |frag: Frag<Color4f>| frag.var.to_color4(),
+        |frag: Frag<Color4f>, _: &_| frag.var.to_color4(),
     );
 
-    let dims @ (w, h) = (640, 480);
+    let dims = dims::VGA_640_480;
     let modelview = translate((0.0, 0.0, 2.0)).to();
-    let project = perspective(1.0, w as f32 / h as f32, 0.1..1000.0);
-    let viewport = viewport(pt2(0, h)..pt2(w, 0));
+    let project = perspective(1.0, dims.aspect(), 0.1..1000.0);
+    let viewport = viewport(dims.into());
 
     let mut framebuf = Buf2::<Color4>::new(dims);
 
@@ -94,7 +95,7 @@ fn sphere(b: Bencher, res: u32) {
         );
     });
 
-    let center_pixel = framebuf[[w / 2, h / 2]];
+    let center_pixel = framebuf[[dims.0 / 2, dims.1 / 2]];
 
     assert_eq!(center_pixel, rgba(128, 127, 0, 255));
 

benches/fill.rs

@@ -2,15 +2,15 @@
 
 use core::iter::zip;
 
-use divan::{Bencher, counter::ItemsCount};
+use divan::Bencher;
 
 use retrofire_core::{
     geom::{Tri, vertex},
     math::{Color3, Color3f, color::gray, pt3, rgb},
     render::{
         Texture, raster::ScreenPt, raster::tri_fill, tex::SamplerRepeatPot, uv,
     },
-    util::{buf::Buf2, pnm::save_ppm},
+    util::{Buf2, Dims, pnm::save_ppm},
 };
 
 const SIZES: [f32; 5] = [4.0, 16.0, 64.0, 256.0, 1024.0];
@@ -20,10 +20,10 @@ const VERTS: [ScreenPt; 3] =
 
 #[divan::bench(args = SIZES)]
 fn flat(b: Bencher, sz: f32) {
-    let mut buf: Buf2<Color3> = Buf2::new((1024, 1024));
+    let mut buf: Buf2<Color3> = Buf2::new(Dims(1024, 1024));
 
     b.with_inputs(|| VERTS.map(|p| vertex(p * sz, ())))
-        .input_counter(move |vs| ItemsCount::new(Tri(*vs).area() as usize))
+        .input_counter(move |vs| Tri(*vs).area() as usize)
         .bench_local_values(|vs| {
             tri_fill(vs, |sl| {
                 buf[sl.y][sl.xs].fill(gray(0xCC));
@@ -34,7 +34,7 @@ fn flat(b: Bencher, sz: f32) {
 }
 #[divan::bench(args = SIZES)]
 fn gouraud(b: Bencher, sz: f32) {
-    let mut buf: Buf2<Color3f> = Buf2::new((1024, 1024));
+    let mut buf: Buf2<Color3f> = Buf2::new(Dims(1024, 1024));
 
     b.with_inputs(|| {
         [
@@ -43,7 +43,7 @@ fn gouraud(b: Bencher, sz: f32) {
             vertex(VERTS[2] * sz, rgb(0.2, 0.3, 1.0)),
         ]
     })
-    .input_counter(move |vs| ItemsCount::new(Tri(*vs).area() as usize))
+    .input_counter(move |vs| Tri(*vs).area() as usize)
     .bench_local_values(|vs| {
         tri_fill(vs, |sl| {
             let y = sl.y;
@@ -56,17 +56,19 @@ fn gouraud(b: Bencher, sz: f32) {
         });
     });
 
-    let buf =
-        Buf2::new_from((1024, 1024), buf.data().iter().map(|c| c.to_color3()));
+    let buf = Buf2::new_from(
+        Dims(1024, 1024),
+        buf.data().iter().map(|c| c.to_color3()),
+    );
     save_ppm("benches_fill_color.ppm", buf).unwrap();
 }
 
 #[divan::bench(args = SIZES)]
 fn texture(b: Bencher, sz: f32) {
-    let mut buf: Buf2<Color3> = Buf2::new((1024, 1024));
+    let mut buf: Buf2<Color3> = Buf2::new(Dims(1024, 1024));
 
     let tex = Texture::from(Buf2::<Color3>::new_from(
-        (2, 2),
+        Dims(2, 2),
         [gray(0xFF), gray(0x33), gray(0x33), gray(0xFF)],
     ));
     let sampler = SamplerRepeatPot::new(&tex);
@@ -78,7 +80,7 @@ fn texture(b: Bencher, sz: f32) {
             vertex(VERTS[2] * sz, uv(0.0, 4.0)),
         ]
     })
-    .input_counter(move |vs| ItemsCount::new(Tri(*vs).area() as usize))
+    .input_counter(move |vs| Tri(*vs).area() as usize)
     .bench_local_values(|vs| {
         tri_fill(vs, |sl| {
             let y = sl.y;

benches/isect.rs

@@ -2,16 +2,14 @@
 
 use core::hint::black_box;
 
-use divan::{Bencher, counter::ItemsCount};
+use divan::Bencher;
 
-use retrofire::core::{
+use retrofire_core::{
     geom::{Plane3, Ray, Sphere},
-    math::rand::*,
-    math::{Point3, degs, pt3, spherical, vec3},
+    math::{Point3, degs, pt3, rand::*, spherical, splat, vec3},
     render::scene::BBox,
 };
-use retrofire::geom::Intersect;
-use retrofire_core::math::splat;
+use retrofire_geom::Intersect;
 
 #[divan::bench]
 fn ray_plane_hit(b: Bencher) {
@@ -25,7 +23,7 @@ fn ray_plane_hit(b: Bencher) {
         let v = (splat(-1.0)..splat(0.0)).sample(&mut rng);
         Ray(pt3(0.0, 10.0, 0.0), 100.0 * (v - vec3(1.0, 1.0, 1.0)))
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| ray.intersect(&black_box(plane)));
 }
 #[divan::bench]
@@ -40,7 +38,7 @@ fn ray_plane_miss(b: Bencher) {
         let v = (splat(0.0)..splat(1.0)).sample(&mut rng);
         Ray(pt3(0.0, 10.0, 0.0), 100.0 * v)
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| ray.intersect(&black_box(plane)));
 }
 #[divan::bench]
@@ -55,7 +53,7 @@ fn ray_plane_mixed(b: Bencher) {
         let v = VectorsInUnitBall.sample(&mut rng);
         Ray(pt3(0.0, 10.0, 0.0), 100.0 * v)
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| ray.intersect(&black_box(plane)));
 }
 
@@ -68,7 +66,7 @@ fn ray_bbox_hit(b: Bencher) {
         let v = VectorsInUnitBall.sample(&mut rng);
         Ray(v.to_pt(), 100.0 * v)
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| {
         assert!(ray.intersect(&black_box(bbox)).is_some())
     });
@@ -84,7 +82,7 @@ fn ray_bbox_hit_2(b: Bencher) {
         let v = (min..max).sample(&mut rng);
         Ray(pt3(0.0, 2.0, 0.0), v.to_cart())
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| {
         assert!(ray.intersect(&black_box(bbox)).is_some())
     });
@@ -99,7 +97,7 @@ fn ray_bbox_inside(b: Bencher) {
         let dir = VectorsInUnitBall.sample(&mut rng);
         Ray(pt, dir)
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| {
         assert!(ray.intersect(&black_box(bbox)).is_some())
     });
@@ -116,7 +114,7 @@ fn ray_bbox_miss(b: Bencher) {
         let v = (min..max).sample(&mut rng);
         Ray(pt3(0.0, 3.0, 0.0), v.to_cart())
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| {
         assert!(ray.intersect(&black_box(bbox)).is_none())
     });
@@ -134,7 +132,7 @@ fn ray_bbox_mixed(b: Bencher) {
         let dir = (p..q).sample(&mut rng);
         Ray(2.0 * orig, 100.0 * dir.to_vec())
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| ray.intersect(&black_box(bbox)));
 }
 
@@ -150,7 +148,7 @@ fn ray_sphere_miss(b: Bencher) {
         let v = (min..max).sample(&mut rng);
         Ray(pt3(0.0, 3.0, 0.0), v.to_cart())
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| {
         let ip = ray.intersect(&black_box(sphere));
         assert!(ip.is_none());
@@ -170,7 +168,7 @@ fn ray_sphere_hit(b: Bencher) {
             .sample(&mut rng);
         Ray(pt3(0.0, 2.0f32.sqrt(), 0.0), v.to_cart())
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| {
         let ip = ray.intersect(&black_box(sphere));
         assert!(ip.is_some());
@@ -188,7 +186,7 @@ fn ray_sphere_mixed(b: Bencher) {
         let v = VectorsInUnitBall.sample(&mut rng);
         Ray(pt3(0.0, 2.0, 0.0), v)
     })
-    .counter(ItemsCount::new(1usize))
+    .counter(1u32)
     .bench_local_values(|ray| ray.intersect(&black_box(sphere)));
 }