pathtracer/src/core/color.rs

@@ -29,8 +29,6 @@ pub struct LinearColor {
     pub b: f32,
 }
 
-const GAMMA: f32 = 2.2;
-
 impl LinearColor {
     /// Creates the color black.
     ///
@@ -51,7 +49,6 @@ impl LinearColor {
     ///     }
     /// );
     /// ```
-    #[must_use]
     pub fn black() -> Self {
         LinearColor {
             r: 0.,
@@ -69,11 +66,11 @@ impl LinearColor {
     /// #
     /// let color = LinearColor::new(1.0, 0.0, 0.0); // bright red!
     /// ```
-    #[must_use]
     pub fn new(r: f32, g: f32, b: f32) -> Self {
         LinearColor { r, g, b }
     }
 
+    #[must_use]
     /// Clamps the color's RGB components between 0.0 and 1.0.
     ///
     /// # Examples
@@ -84,7 +81,6 @@ impl LinearColor {
     /// let color = LinearColor::new(1.5, -1.0, 0.5);
     /// assert_eq!(color.clamp(), LinearColor::new(1.0, 0.0, 0.5))
     /// ```
-    #[must_use]
     pub fn clamp(self) -> Self {
         fn clamp(v: f32) -> f32 {
             if v > 1. {
@@ -97,26 +93,6 @@ impl LinearColor {
         };
         LinearColor::new(clamp(self.r), clamp(self.g), clamp(self.b))
     }
-
-    /// Encode the linear color into the gamma corrected space, as expected by most picture
-    /// formats.
-    #[must_use]
-    pub fn gamma_encode(self) -> Self {
-        fn gamma(val: f32) -> f32 {
-            val.powf(1.0 / GAMMA)
-        };
-        LinearColor::new(gamma(self.r), gamma(self.g), gamma(self.b))
-    }
-
-    /// Decode the linear color from the gamma corrected space, which is used in most picture
-    /// formats.
-    #[must_use]
-    pub fn gamma_decode(self) -> Self {
-        fn gamma(val: f32) -> f32 {
-            val.powf(GAMMA)
-        };
-        LinearColor::new(gamma(self.r), gamma(self.g), gamma(self.b))
-    }
 }
 
 impl Default for LinearColor {
@@ -162,8 +138,8 @@ impl DivAssign for LinearColor {
 }
 
 impl From<LinearColor> for image::Rgb<u8> {
-    fn from(color: LinearColor) -> Self {
+    fn from(mut color: LinearColor) -> Self {
-        let color = color.clamp().gamma_encode();
+        color = color.clamp();
         image::Rgb([
             (color.r * 255.) as u8,
             (color.g * 255.) as u8,