Merge pull request #21 from LykenSol/sample-cube

Rename Channel to SampleCube.

Author: eddyb

shaders/src/bubble_buckey_balls.rs

@@ -8,7 +8,7 @@
 //! // Tested on Nvidia GTX 780 Windows 7
 //! ```
 
-use crate::Channel;
+use crate::SampleCube;
 use shared::*;
 use spirv_std::glam::{vec2, vec3, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles};
 
@@ -428,7 +428,7 @@ fn material(surfid: f32, surf: &mut SurfaceData) {
     }
 }
 
-impl<C0: Channel, C1: Channel> State<C0, C1> {
+impl<C0: SampleCube, C1: SampleCube> State<C0, C1> {
     fn integrate_dir_light(&self, ldir: Vec3, lcolor: Vec3, surf: SurfaceData) -> Vec3 {
         let vdir: Vec3 = (self.cam_origin - surf.point).normalize();
 

shaders/src/lib.rs

@@ -29,7 +29,7 @@ pub mod soft_shadow_variation;
 pub mod tileable_water_caustic;
 pub mod two_tweets;
 
-pub trait Channel: Copy {
+pub trait SampleCube: Copy {
     fn sample_cube(self, p: Vec3) -> Vec4;
 }
 
@@ -38,7 +38,7 @@ struct ConstantColor {
     color: Vec4,
 }
 
-impl Channel for ConstantColor {
+impl SampleCube for ConstantColor {
     fn sample_cube(self, _: Vec3) -> Vec4 {
         self.color
     }
@@ -50,7 +50,7 @@ struct RgbCube {
     intensity: f32,
 }
 
-impl Channel for RgbCube {
+impl SampleCube for RgbCube {
     fn sample_cube(self, p: Vec3) -> Vec4 {
         (p.abs() * self.intensity).extend(self.alpha)
     }

shaders/src/playing_marble.rs

@@ -6,7 +6,7 @@
 //! // Created by S. Guillitte 2015
 //! ```
 
-use crate::Channel;
+use crate::SampleCube;
 use shared::*;
 use spirv_std::glam::{vec2, vec3, vec4, Mat2, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles};
 
@@ -62,7 +62,7 @@ fn map(mut p: Vec3) -> f32 {
     res / 2.0
 }
 
-impl<C0: Channel> Inputs<C0> {
+impl<C0: SampleCube> Inputs<C0> {
     fn raymarch(&self, ro: Vec3, rd: Vec3, tminmax: Vec2) -> Vec3 {
         let mut t: f32 = tminmax.x;
         let dt: f32 = 0.02;

shaders/src/skyline.rs

@@ -11,7 +11,7 @@
 //! */
 //! ```
 
-use crate::Channel;
+use crate::SampleCube;
 use shared::*;
 use spirv_std::glam::{
     const_vec2, vec2, vec3, Vec2, Vec2Swizzles, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles,
@@ -497,7 +497,7 @@ fn calc_windows(
     normal.x += pits * 0.25;
 }
 
-impl<C0: Channel> State<C0> {
+impl<C0: SampleCube> State<C0> {
     // Input is UV coordinate of pixel to render.
     // Output is RGB color.
     fn ray_trace(&mut self, frag_coord: Vec2) -> Vec3 {
@@ -982,7 +982,7 @@ impl<C0: Channel> State<C0> {
     }
 }
 
-impl<C0: Channel> State<C0> {
+impl<C0: SampleCube> State<C0> {
     // This function breaks the image down into blocks and scans
     // through them, rendering 1 block at a time. It's for non-
     // realtime things that take a long time to render.