Fixup light source

Author: jdahlstrom

core/src/render/cam.rs

@@ -9,15 +9,15 @@ use crate::math::{
 };
 use crate::util::{Dims, rect::Rect};
 
-#[cfg(feature = "fp")]
-use crate::math::{
-    Angle, Vec3, orient_z, pt3, rotate_x, rotate_y, spherical, translate, turns,
-};
-
 use super::{
     Clip, Context, FragmentShader, NdcToScreen, RealToProj, Render, Target,
     VertexShader, View, ViewToProj, World, WorldToView, clip::ClipVec,
 };
+#[cfg(feature = "fp")]
+use crate::math::{
+    Angle, Vec3, orient_z, pt3, rotate_x, rotate_y, spherical, translate, turns,
+};
+use crate::prelude::Shader;
 
 /// Trait for different modes of camera motion.
 pub trait Transform {
@@ -198,6 +198,9 @@ impl<T> Camera<T> {
     }
 }
 
+// TODO Should probably pass view and projection matrices separately
+pub type CameraUni<'a, B, Uni> = (&'a Mat4x4<RealToProj<B>>, Uni);
+
 impl<T: Transform> Camera<T> {
     /// Returns the composed camera and projection matrix.
     pub fn world_to_project(&self) -> Mat4x4<RealToProj<World>> {
@@ -221,23 +224,18 @@ impl<T: Transform> Camera<T> {
     ) where
         Prim: Render<Var> + Clone,
         [<Prim>::Clip]: Clip<Item = Prim::Clip>,
-        Shd: for<'a> VertexShader<
-                Vtx,
-                (&'a Mat4x4<RealToProj<B>>, Uni),
-                Output = Vertex<ClipVec, Var>,
-            > + FragmentShader<Var, Uni>,
+        Shd: for<'a> Shader<Vtx, Var, CameraUni<'a, B, Uni>>,
     {
-        /*let tf = to_world.then(&self.world_to_project());
-
+        let to_proj = to_world.then(&self.world_to_project());
         super::render(
             prims.as_ref(),
             verts.as_ref(),
             shader,
-            (&tf, uniform),
+            (&to_proj, uniform),
             self.viewport,
             target,
             ctx,
-        );*/
+        );
     }
 }
 

core/src/render/light.rs

@@ -31,7 +31,6 @@ pub enum Kind<B: Default> {
     Point {
         pos: Point3<B>,
     },
-    #[cfg(feature = "fp")]
     Spot {
         pos: Point3<B>,
         dir: Vec3<B>,
@@ -98,7 +97,6 @@ impl<B: Debug + Default> Light<B> {
             Kind::Directional { dir } => {
                 Kind::Directional { dir: mat.to().apply3(&dir) }
             }
-            #[cfg(feature = "fp")]
             Kind::Spot { pos, dir, radii } => Kind::Spot {
                 pos: mat.apply_pt(&pos),
                 dir: mat.to().apply3(&dir),

core/src/render/raster.rs

@@ -373,7 +373,7 @@ mod tests {
         super::tri_fill(verts, |mut sl| {
             write!(s, "{:w$}", " ", w = sl.xs.start).ok();
 
-            for c in sl.fragments().map(|f| ((10.0 * f.var) as u8)) {
+            for c in sl.fragments().map(|f| (10.0 * f.var) as u8) {
                 write!(s, "{c}").ok();
             }
             writeln!(s).ok();