Factor out unnecessary traits, replace with permutate conditionals

Author: ProfLander

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy-pbr-rust"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 [lib]
@@ -9,5 +9,5 @@ crate_type = ["dylib", "rlib"]
 [dependencies]
 bitflags = "1.3.2"
 spirv-std = { version = "0.5.0", features = ["glam"] }
-permutate-macro = { git = "https://github.com/Bevy-Rust-GPU/permutate-macro", tag = "v0.3.0" }
+permutate-macro = { git = "https://github.com/Bevy-Rust-GPU/permutate-macro", tag = "v0.4.0" }
 rust-gpu-bridge = { git = "https://github.com/Bevy-Rust-GPU/rust-gpu-bridge", tag = "v0.2.0", features = ["spirv-std"] }

src/mesh/base_material_normal_map.rs

@@ -5,7 +5,12 @@ use spirv_std::{
 
 use permutate_macro::permutate;
 
-use crate::prelude::{Mesh, Skinning, VertexNormal, VertexPosition, VertexTangent, View};
+use crate::{
+    prelude::{Mesh, View},
+    skinning::skin_normals,
+};
+
+use super::mesh_position_local_to_world;
 
 #[spirv(vertex)]
 #[allow(non_snake_case)]
@@ -16,6 +21,8 @@ use crate::prelude::{Mesh, Skinning, VertexNormal, VertexPosition, VertexTangent
         skinned: some | none
     },
     permutations = [
+        (none, none, none),
+        (some, some, some),
         file("../../entry_points.json", "mesh::entry_points"),
         env("BEVY_PBR_RUST_MESH_VERTEX_PERMUTATIONS", "mesh::entry_points")
     ]
@@ -52,29 +59,25 @@ pub fn vertex(
     #[permutate(tangent = some)]
     let mut in_tangent = in_tangent;
 
-    vertex_impl(
-        view,
-        mesh,
-        &mut in_position,
-        &mut in_normal,
-        #[permutate(tangent = some)]
-        &mut in_tangent,
-        #[permutate(tangent = none)]
-        &mut (),
-        #[permutate(skinned = some)]
-        joint_matrices,
-        #[permutate(skinned = none)]
-        &(),
-        #[permutate(skinned = some)]
-        in_joint_indices,
-        #[permutate(skinned = none)]
-        (),
-        #[permutate(skinned = some)]
-        in_joint_weights,
-        #[permutate(skinned = none)]
-        (),
-        out_clip_position,
-    );
+    #[permutate(skinned = some)]
+    let model = in_joint_weights.x * joint_matrices.data[in_joint_indices.x as usize]
+        + in_joint_weights.y * joint_matrices.data[in_joint_indices.y as usize]
+        + in_joint_weights.z * joint_matrices.data[in_joint_indices.z as usize]
+        + in_joint_weights.w * joint_matrices.data[in_joint_indices.w as usize];
+
+    #[permutate(skinned = none)]
+    let model = mesh.model;
+
+    #[permutate(skinned = some)]
+    in_normal = skin_normals(model, in_normal);
+    #[permutate(skinned = none)]
+    in_normal = mesh.mesh_normal_local_to_world(in_normal);
+
+    in_position = mesh_position_local_to_world(model, in_position);
+    *out_clip_position = view.mesh_position_world_to_clip(in_position);
+
+    #[permutate(tangent = some)]
+    in_tangent = mesh.mesh_tangent_local_to_world(model, in_tangent);
 
     *out_world_position = in_position;
     *out_world_normal = in_normal;
@@ -87,24 +90,6 @@ pub fn vertex(
     *out_color = in_color;
 }
 
-pub fn vertex_impl<P: VertexPosition, N: VertexNormal, T: VertexTangent, SM: Skinning>(
-    view: &View,
-    mesh: &Mesh,
-    vertex_position: &mut P,
-    vertex_normal: &mut N,
-    vertex_tangent: &mut T,
-    joint_matrices: &SM,
-    in_joint_indices: SM::JointIndices,
-    in_joint_weights: SM::JointWeights,
-    out_clip_position: &mut Vec4,
-) {
-    let model = joint_matrices.skin_model(mesh, in_joint_indices, in_joint_weights);
-
-    vertex_normal.skin_normals::<SM>(mesh, model);
-    vertex_position.transform_position(view, mesh, model, out_clip_position);
-    vertex_tangent.transform_tangent(mesh, model);
-}
-
 #[spirv(fragment)]
 #[allow(unused_variables)]
 pub fn fragment(

src/mesh/entry_points.rs

@@ -1,13 +1,6 @@
-pub mod base_material_normal_map;
 pub mod bindings;
 pub mod entry_points;
 pub mod skinned_mesh;
-pub mod skinning;
-pub mod vertex_color;
-pub mod vertex_normal;
-pub mod vertex_position;
-pub mod vertex_tangent;
-pub mod vertex_uv;
 
 use spirv_std::glam::{Mat3, Mat4, Vec3, Vec4};
 

src/mesh/mod.rs

@@ -1,29 +1,6 @@
-use spirv_std::glam::{Mat4, UVec4, Vec3, Vec4};
-
-use crate::skinning::skin_normals;
-
-use crate::prelude::Skinning;
-
-use super::Mesh;
+use spirv_std::glam::Mat4;
 
 #[repr(C)]
 pub struct SkinnedMesh {
     pub data: [Mat4; 256],
 }
-
-impl Skinning for SkinnedMesh {
-    type JointIndices = UVec4;
-    type JointWeights = Vec4;
-
-    fn skin_model(&self, _: &Mesh, indexes: UVec4, weights: Vec4) -> Mat4 {
-        weights.x * self.data[indexes.x as usize]
-            + weights.y * self.data[indexes.y as usize]
-            + weights.z * self.data[indexes.z as usize]
-            + weights.w * self.data[indexes.w as usize]
-    }
-
-    fn skin_normals(_: &Mesh, model: Mat4, normal: Vec3) -> Vec3 {
-        skin_normals(model, normal)
-    }
-}
-