Add frag uni parameter to demos, lifetime issue with shader?!

Author: jdahlstrom

core/examples/hello_tri.rs

@@ -14,7 +14,7 @@ fn main() {
             // Interpolate vertex colors in linear color space
             vertex(mvp.apply(&v.pos), v.attrib.to_linear())
         },
-        |frag: Frag<Color3f<_>>| frag.var.to_srgb().to_color4(),
+        |frag: Frag<Color3f<_>>, _| frag.var.to_srgb().to_color4(),
     );
     #[cfg(not(feature = "fp"))]
     let shader = shader::new(

core/src/render/cam.rs

@@ -4,7 +4,7 @@ use core::ops::Range;
 
 #[cfg(feature = "fp")]
 use crate::math::{
-    Angle, Vec3, orient_z, pt3, rotate_x, rotate_y, spherical, translate, turns,
+    Angle, Vec3, orient_z, rotate_x, rotate_y, spherical, translate, turns,
 };
 use crate::math::{
     Lerp, Mat4x4, Point3, SphericalVec, Vary, mat::RealToReal, orthographic,

core/tests/rendering.rs

@@ -27,7 +27,7 @@ fn textured_quad() {
         |v: Vertex3<_>, mvp: &Mat4x4<ModelToProj>| {
             vertex(mvp.apply(&v.pos), v.attrib)
         },
-        |frag: Frag<_>| SamplerClamp.sample(&checker, frag.var),
+        |frag: Frag<_>, _| SamplerClamp.sample(&checker, frag.var),
     );
 
     let (w, h) = (256, 256);

demos/src/bin/hello.rs

@@ -30,13 +30,6 @@ fn main() {
 
     win.ctx.face_cull = None;
 
-    let shader = shader::new(
-        |v: Vertex<_, _>, mvp: &Mat4x4<ModelToProj>| {
-            vertex(mvp.apply(&v.pos), v.attrib)
-        },
-        |frag: Frag<TexCoord>| text.sample(frag.var).to_rgba(),
-    );
-
     let vp: Mat4x4<mat::RealToProj<World>> = translate(vec3(0.0, 0.0, 15.0))
         .to()
         .then(&perspective(1.0, 4.0 / 3.0, 0.1..1000.0));
@@ -46,6 +39,13 @@ fn main() {
     win.run(|frame: &mut Frame<_, _>| {
         let secs = frame.t.as_secs_f32();
 
+        let shader = shader::new(
+            |v: Vertex<_, _>, mvp: &Mat4x4<ModelToProj>| {
+                vertex(mvp.apply(&v.pos), v.attrib)
+            },
+            |frag: Frag<TexCoord>, _| text.sample(frag.var).to_rgba(),
+        );
+
         let mvp = scale(splat(0.1))
             .then(&translate(vec3(-10.0, -5.0, 5.0 * secs.sin())))
             .then(&rotate_y(rads(secs * 0.59)))

demos/src/bin/solids.rs

@@ -76,7 +76,7 @@ fn main() {
         vertex(mvp.apply(&v.pos), col)
     }
 
-    fn frag_shader(f: Frag<Color3f>) -> Color4 {
+    fn frag_shader(f: Frag<Color3f>, _: Uniform) -> Color4 {
         f.var.to_color4()
     }
 

demos/src/bin/sprites.rs

@@ -3,11 +3,11 @@ use core::{array::from_fn, ops::ControlFlow::Continue};
 use re::prelude::*;
 
 use re::math::rand::{Distrib, PointsInUnitBall, Xorshift64};
-use re::render::{Model, ModelToView, ViewToProj, cam::*, render};
+use re::render::{ModelToView, ViewToProj, cam::*, render};
 use re_front::minifb::Window;
 
 fn main() {
-    let verts: [Vec2<Model>; 4] = [
+    let verts: [Vec2<View>; 4] = [
         vec2(-1.0, -1.0),
         vec2(-1.0, 1.0),
         vec2(1.0, -1.0),
@@ -32,23 +32,6 @@ fn main() {
         .build()
         .expect("should create window");
 
-    let shader = shader::new(
-        |v: Vertex3<Vec2<_>>,
-         (mv, proj): (&Mat4x4<ModelToView>, &Mat4x4<ViewToProj>)| {
-            let vertex_pos = 0.008 * v.attrib.to_vec3().to();
-            let view_pos = mv.apply_pt(&v.pos) + vertex_pos;
-            vertex(proj.apply(&view_pos), v.attrib)
-        },
-        |frag: Frag<Vec2<_>>| {
-            let d2 = frag.var.len_sqr();
-            (d2 < 1.0).then(|| {
-                // TODO ops trait for colors
-                let col: Vec3 = splat(1.0) - d2 * vec3(0.25, 0.5, 1.0);
-                rgba(col.x(), col.y(), col.z(), 1.0).to_color4()
-            })
-        },
-    );
-
     let (w, h) = win.dims;
     let cam = Camera::new(win.dims)
         .transform(translate(0.5 * Vec3::Z).to())
@@ -58,6 +41,22 @@ fn main() {
     win.run(|frame| {
         let theta = rads(frame.t.as_secs_f32());
 
+        let shader = shader::new(
+            |v: Vertex3<Vec2<_>>,
+             (mv, proj): (&Mat4x4<ModelToView>, &Mat4x4<ViewToProj>)| {
+                let vertex_pos = 0.008 * v.attrib.to_vec3();
+                let view_pos = mv.apply_pt(&v.pos) + vertex_pos;
+                vertex(proj.apply(&view_pos), v.attrib)
+            },
+            |frag: Frag<Vec2<_>>, _| {
+                let d2 = frag.var.len_sqr();
+                (d2 < 1.0).then(|| {
+                    let col = color::gray(1.0) - d2 * rgb(0.25, 0.5, 1.0);
+                    col.to_color4()
+                })
+            },
+        );
+
         let modelview = rotate_x(theta * 0.2)
             .then(&rotate_z(theta * 0.14))
             .to()

demos/src/bin/square.rs

@@ -36,20 +36,20 @@ fn main() {
         rgba(xor as u8 * 255, 128, 255 - xor as u8 * 128, 0)
     }));
 
-    let shader = shader::new(
-        |v: Vertex3<_>, mvp: &Mat4x4<ModelToProj>| {
-            vertex(mvp.apply(&v.pos), v.attrib)
-        },
-        |frag: Frag<_>| SamplerClamp.sample(&checker, frag.var),
-    );
-
     let (w, h) = win.dims;
     let projection = perspective(1.0, w as f32 / h as f32, 0.1..1000.0);
     let viewport = viewport(pt2(10, 10)..pt2(w - 10, h - 10));
 
     win.run(|frame| {
         let time = frame.t.as_secs_f32();
 
+        let shader = shader::new(
+            |v: Vertex3<_>, mvp: &Mat4x4<ModelToProj>| {
+                vertex(mvp.apply(&v.pos), v.attrib)
+            },
+            |frag: Frag<_>, _| SamplerClamp.sample(&checker, frag.var),
+        );
+
         let model_view_project = rotate_y(rads(time))
             .then(&translate3(0.0, 0.0, 3.0 + time.sin()))
             .to()

demos/wasm/src/triangle.rs

@@ -38,7 +38,7 @@ pub fn start() {
 
         let sh = Shader::new(
             |v: Vertex3<Color4f>, _| vertex(mvp.apply(&v.pos), v.attrib),
-            |f: Frag<Color4f>| f.var.to_color4(),
+            |f: Frag<Color4f>, _| f.var.to_color4(),
         );
 
         render(