Fix NaturalLog backend variance, add Fract trait

Author: ProfLander

src/fract.rs

@@ -0,0 +1,56 @@
+//! Shader `fract()`
+
+use crate::glam::{Vec2, Vec3, Vec4};
+
+#[cfg(feature = "spirv-std")]
+#[allow(unused_imports)]
+use spirv_std::num_traits::Float;
+
+/// Returns the fractional part of self.
+///
+/// Equivalent of the `fract()` function.
+pub trait Fract {
+    fn fract(self) -> Self;
+}
+
+impl Fract for f32 {
+    fn fract(self) -> Self {
+        #[cfg(feature = "glam")]
+        {
+            f32::fract(self)
+        }
+
+        #[cfg(feature = "spirv-std")]
+        {
+            spirv_std::num_traits::Float::fract(self)
+        }
+    }
+}
+
+impl Fract for Vec2 {
+    fn fract(self) -> Self {
+        Vec2::new(Fract::fract(self.x), Fract::fract(self.y))
+    }
+}
+
+impl Fract for Vec3 {
+    fn fract(self) -> Self {
+        Vec3::new(
+            Fract::fract(self.x),
+            Fract::fract(self.y),
+            Fract::fract(self.z),
+        )
+    }
+}
+
+impl Fract for Vec4 {
+    fn fract(self) -> Self {
+        Vec4::new(
+            Fract::fract(self.x),
+            Fract::fract(self.y),
+            Fract::fract(self.z),
+            Fract::fract(self.w),
+        )
+    }
+}
+

src/lib.rs

@@ -17,13 +17,14 @@ pub use spirv_std::glam;
 compile_error!("Either the glam or spirv-std feature must be enabled.");
 
 mod abs;
-mod asin;
 mod acos;
+mod asin;
 mod atan2;
 mod clamp;
 mod cos;
 mod dot;
 mod exp2;
+mod fract;
 mod length;
 mod log2;
 mod mix;
@@ -48,6 +49,7 @@ pub use clamp::*;
 pub use cos::*;
 pub use dot::*;
 pub use exp2::*;
+pub use fract::*;
 pub use length::*;
 pub use log2::*;
 pub use mix::*;
@@ -67,10 +69,6 @@ pub use tan::*;
 
 use glam::Vec3;
 
-#[cfg(feature = "spirv-std")]
-#[allow(unused_imports)]
-use spirv_std::num_traits::Float;
-
 /// Convert from HSV to RGB.
 ///
 /// From `bevy_pbr/src/render/utils.wgsl`

src/natural_log.rs

@@ -12,17 +12,25 @@ use spirv_std::num_traits::Float;
 pub trait NaturalLog {
     const BASE: f32 = 2.718281828459;
 
-    fn natural_log(&self) -> Self;
+    fn natural_log(self) -> Self;
 }
 
 impl NaturalLog for f32 {
-    fn natural_log(&self) -> Self {
-        self.log(Self::BASE)
+    fn natural_log(self) -> Self {
+        #[cfg(feature = "glam")]
+        {
+            f32::log(self, Self::BASE)
+        }
+
+        #[cfg(feature = "spirv-std")]
+        {
+            spirv_std::num_traits::Float::log(self, Self::BASE)
+        }
     }
 }
 
 impl NaturalLog for Vec2 {
-    fn natural_log(&self) -> Self {
+    fn natural_log(self) -> Self {
         Vec2::new(
             NaturalLog::natural_log(self.x),
             NaturalLog::natural_log(self.y),
@@ -31,7 +39,7 @@ impl NaturalLog for Vec2 {
 }
 
 impl NaturalLog for Vec3 {
-    fn natural_log(&self) -> Self {
+    fn natural_log(self) -> Self {
         Vec3::new(
             NaturalLog::natural_log(self.x),
             NaturalLog::natural_log(self.y),
@@ -41,7 +49,7 @@ impl NaturalLog for Vec3 {
 }
 
 impl NaturalLog for Vec4 {
-    fn natural_log(&self) -> Self {
+    fn natural_log(self) -> Self {
         Vec4::new(
             NaturalLog::natural_log(self.x),
             NaturalLog::natural_log(self.y),