src/camera.rs

@@ -20,12 +20,6 @@ impl OrbitalCamera {
 		self.distance * vec3(xy * x, xy * y, z)
 	}
 
-	pub fn direction(&self) -> Vec3 {
-		let (y, x) = self.position_yaw.sin_cos();
-		let (z, xy) = self.position_pitch.sin_cos();
-		-vec3(xy * x, xy * y, z)
-	}
-
 	pub fn transform(&self) -> Mat4 {
 		// for yaw=0, pitch=0:
 		// X -> -Z

src/lib.rs

@@ -393,15 +393,12 @@ impl Core {
 						.map(|&v| {
 							let pos = obj.position + obj.radius * v;
 							let normal = v;
-							let mut dir = (pos - camera.position()).normalize();
+							let dir = (pos - camera.position()).normalize();
-							if !dir.is_finite() {
-								dir = camera.direction();
-							}
 							let light = light_at(Hit {
 								incident: Ray::new(pos, dir),
 								normal,
 							});
-							let color = Vec3::splat(light);
+							let color = colormap(light);
 							render::faces::Vertex { pos, color }
 						})
 						.collect::<Vec<_>>(),

src/render/colormap.wgsl

@@ -1,32 +0,0 @@
-struct LookParams {
-	m: mat4x4f,
-}
-
-struct Vertex {
-	@location(0) pos: vec3f,
-	@location(1) color: vec3f,
-}
-
-struct Varying {
-	@builtin(position) screen: vec4f,
-	@location(0) color: vec4f,
-}
-
-@group(0) @binding(0) var<uniform> look: LookParams;
-
-fn colormap(light: f32) -> vec3f {
-	let brightness = 3. * (1. - 1. / (1. + light));
-	return vec3(brightness, brightness - 1., brightness - 2.);
-}
-
-@vertex
-fn on_vertex(in: Vertex) -> Varying {
-	let pos = look.m * vec4f(in.pos, 1.0);
-	let color = vec4f(in.color, 1.0);
-	return Varying(pos, color);
-}
-
-@fragment
-fn on_fragment(in: Varying) -> @location(0) vec4f {
-	return vec4f(colormap(in.color.x), 1.0);
-}

src/render/faces.rs

@@ -79,7 +79,7 @@ impl Pipeline {
 
 		let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
 			label: None,
-			source: wgpu::ShaderSource::Wgsl(super::COLORMAP_SHADER.into()),
+			source: wgpu::ShaderSource::Wgsl(super::SIMPLE_SHADER.into()),
 		});
 		let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
 			label: None,

src/render/mod.rs

@@ -2,7 +2,6 @@ pub mod faces;
 pub mod lines;
 
 static SIMPLE_SHADER: &str = include_str!("simple.wgsl");
-static COLORMAP_SHADER: &str = include_str!("colormap.wgsl");
 
 pub const OUTPUT_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Bgra8UnormSrgb;
 pub const DEPTH_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Depth24Plus;