*New* new render trait (for real this time?)

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" }
@@ -104,3 +105,11 @@ 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/clip.rs

@@ -2,88 +2,74 @@
 
 use core::{array, iter::repeat_with};
 
-use divan::{Bencher, counter::ItemsCount};
+use divan::{AllocProfiler, Bencher};
 
 use retrofire_core::{
     geom::{Tri, vertex},
-    math::rand::{DEFAULT_RNG, DefaultRng, Distrib},
-    math::{orthographic, pt3},
-    render::clip::{ClipVert, view_frustum},
+    math::rand::{DefaultRng, Distrib},
+    math::{ProjMat3, orthographic, pt3},
+    render::View,
+    render::clip::{Clip, ClipVert, view_frustum},
 };
 
-//#[global_allocator]
-//static ALLOC: AllocProfiler = AllocProfiler::system();
+#[global_allocator]
+static ALLOC: AllocProfiler = AllocProfiler::system();
+
+static PROJ: ProjMat3<View> =
+    orthographic(pt3(-1.0, -1.0, -1.0), pt3(1.0, 1.0, 1.0));
 
 #[divan::bench(args = [1, 10, 100, 1000, 10_000])]
 fn clip_mixed(b: Bencher, n: usize) {
     let rng = &mut DefaultRng::default();
     let pts = pt3(-10.0, -10.0, -10.0)..pt3(10.0, 10.0, 10.0);
-    let proj = orthographic(pt3(-1.0, -1.0, -1.0), pt3(1.0, 1.0, 1.0));
 
     b.with_inputs(|| {
         repeat_with(|| {
-            let vs = array::from_fn(|_| {
-                ClipVert::new(vertex(proj.apply(&pts.sample(rng)), ()))
-            });
-            Tri(vs)
+            Tri(array::from_fn(|_| {
+                ClipVert::new(vertex(PROJ.apply(&pts.sample(rng)), ()))
+            }))
         })
         .take(n)
         .collect::<Vec<_>>()
     })
-    .input_counter(|tris| ItemsCount::of_iter(tris))
-    .bench_local_values(|tris| {
-        let mut out = Vec::new();
-        view_frustum::clip(tris.as_slice(), &mut out);
-        out
-    })
+    .counter(n)
+    .bench_local_values(|tris| Tri::clip(tris, &view_frustum::PLANES))
 }
 
 #[divan::bench(args = [1, 10, 100, 1000, 10_000])]
 fn clip_all_inside(b: Bencher, n: usize) {
     let rng = &mut DefaultRng::default();
     let pts = pt3(-1.0, -1.0, -1.0)..pt3(1.0, 1.0, 1.0);
-    let proj = orthographic(pt3(-1.0, -1.0, -1.0), pt3(1.0, 1.0, 1.0));
 
     b.with_inputs(|| {
         repeat_with(|| {
-            let vs = array::from_fn(|_| {
-                ClipVert::new(vertex(proj.apply(&pts.sample(rng)), ()))
-            });
-            Tri(vs)
+            Tri(array::from_fn(|_| {
+                ClipVert::new(vertex(PROJ.apply(&pts.sample(rng)), ()))
+            }))
         })
         .take(n)
         .collect::<Vec<_>>()
     })
-    .input_counter(|tris| ItemsCount::of_iter(tris))
-    .bench_local_values(|tris| {
-        let mut out = Vec::new();
-        view_frustum::clip(tris.as_slice(), &mut out);
-        out
-    })
+    .counter(n)
+    .bench_local_values(|tris| Tri::clip(tris, &view_frustum::PLANES))
 }
 
 #[divan::bench(args = [1, 10, 100, 1000, 10_000])]
 fn clip_all_outside(b: Bencher, n: usize) {
-    let mut rng = DEFAULT_RNG;
+    let rng = &mut DefaultRng::default();
     let pts = pt3(2.0, -10.0, -10.0)..pt3(10.0, 10.0, 10.0);
-    let proj = orthographic(pt3(-1.0, -1.0, -1.0), pt3(1.0, 1.0, 1.0));
 
     b.with_inputs(|| {
         repeat_with(|| {
-            let vs = ([pts.start; 3]..[pts.end; 3])
-                .sample(&mut rng)
-                .map(|pt| ClipVert::new(vertex(proj.apply(&pt), ())));
-            Tri(vs)
+            Tri(([pts.start; 3]..[pts.end; 3])
+                .sample(rng)
+                .map(|pt| ClipVert::new(vertex(PROJ.apply(&pt), ()))))
         })
         .take(n)
         .collect::<Vec<_>>()
     })
-    .input_counter(|tris| ItemsCount::of_iter(tris))
-    .bench_local_values(|tris| {
-        let mut out = Vec::with_capacity(tris.len());
-        view_frustum::clip(tris.as_slice(), &mut out);
-        out
-    })
+    .counter(n)
+    .bench_local_values(|tris| Tri::clip(tris, &view_frustum::PLANES))
 }
 
 fn main() {

benches/e2e.rs

@@ -2,47 +2,46 @@
 
 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, Tri, Vertex3, vertex},
+    math::{
+        Color3f, Color4, Color4f, ProjMat3, perspective, pt2, 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)]
 #[global_allocator]
 static ALLOC: divan::AllocProfiler = divan::AllocProfiler::system();
 
 #[divan::bench(args = [1, 4, 16, 64, 256, 1024], max_time = 2)]
 fn triangle(b: Bencher, n: u32) {
     let verts = [
-        vertex(pt3(-1.0, 1.0, 0.0), rgb(1.0, 0.0, 0.0)),
-        vertex(pt3(1.0, 1.0, 0.0), rgb(0.0, 0.8, 0.0)),
-        vertex(pt3(0.0, -1.0, 0.0), rgb(0.4, 0.4, 1.0)),
+        vertex(pt3(-1.0, -1.0, 0.0), rgb(1.0, 0.0, 0.0)),
+        vertex(pt3(0.0, 1.0, 0.0), rgb(0.0, 0.8, 0.0)),
+        vertex(pt3(1.0, -1.0, 0.0), rgb(0.4, 0.4, 1.0)),
     ];
 
     let shader = shader::new(
         |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(pt2(0, dims.1)..pt2(dims.0, 0));
 
     let mut framebuf = Buf2::<Color4>::new(dims);
 
-    b.bench_local(|| {
+    b.counter(n).bench_local(|| {
         for _ in 0..n {
             render(
-                [tri(0, 1, 2)],
-                verts,
+                Tri(verts),
                 &shader,
                 &modelview.then(&project),
                 viewport,
@@ -52,14 +51,13 @@ 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(89, 127, 64, 255));
 
-    assert_eq!(center_pixel, rgba(151, 128, 187, 255));
-
-    pnm::save_ppm("benches_e2e_triangle.ppm", framebuf).unwrap();
+    pnm::save_ppm("benches/out/e2e_triangle.ppm", framebuf).unwrap();
 }
 
-#[divan::bench(args=[4, 16, 64, 256, 1024], min_time=5, max_time=5)]
+#[divan::bench(args=[4, 16, 64, 256, 1024], min_time=1, max_time=2)]
 fn sphere(b: Bencher, res: u32) {
     let sphere = Sphere {
         sectors: res,
@@ -72,20 +70,19 @@ 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(pt2(0, dims.1)..pt2(dims.0, 0));
 
     let mut framebuf = Buf2::<Color4>::new(dims);
 
-    b.bench_local(|| {
+    b.counter(sphere.faces.len()).bench_local(|| {
         render(
-            &sphere.faces,
-            &sphere.verts,
+            sphere.clone(),
             &shader,
             &modelview.then(&project),
             viewport,
@@ -94,11 +91,11 @@ 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));
 
-    pnm::save_ppm("benches_e2e_sphere.ppm", framebuf).unwrap();
+    pnm::save_ppm(format!("benches/out/e2e_sphere_{res}.ppm"), framebuf)
+        .unwrap();
 }
 
 fn main() {