Reverting last commit and correctly remove redefinition

The last commit removed the MeshMetadata shader code from a shader which
was used as a header and broke other code. This commit readds it to the
header shader and removes it from the actual offending shader with a
double definition.

crates/renderer/src/collect.rs

@@ -164,7 +164,6 @@ impl RendererCollect {
             "collect",
             &[
                 get_defs_module(assets),
-                get_mesh_buffer_types(),
                 get_resources_module(),
                 GpuWorldShaderModuleKey { read_only: true }.get(assets),
                 ShaderModule::new(

crates/renderer/src/lib.rs

@@ -252,7 +252,7 @@ pub fn get_defs_module(_: &AssetCache) -> ShaderModule {
         [("PI", PI)]
             .iter()
             .map(|(k, v)| format!("const {k}: f32 = {v};\n"))
-            .chain([wgsl_interpolate(), include_file!("polyfill.wgsl")])
+            .chain([wgsl_interpolate(), include_file!("polyfill.wgsl"), MESH_BUFFER_TYPES_WGSL.to_string()])
             .collect::<String>(),
     )
 }