Fixing merge conflict again

Author: aloucks

crates/bevy_gltf/src/lib.rs

@@ -103,7 +103,7 @@ use bevy_app::prelude::*;
 use bevy_asset::AssetApp;
 use bevy_image::CompressedImageFormats;
 use bevy_render::{
-    mesh::{MeshVertexAttribute, TangentStrategy},
+    mesh::{MeshVertexAttribute, TangentCalculationStrategy},
     renderer::RenderDevice,
 };
 
@@ -121,8 +121,8 @@ pub use {assets::*, label::GltfAssetLabel, loader::*};
 #[derive(Default)]
 pub struct GltfPlugin {
     custom_vertex_attributes: HashMap<Box<str>, MeshVertexAttribute>,
-    /// The strategy to use when computing mesh tangents.
-    pub computed_tangent_strategy: TangentStrategy,
+    /// The strategy to use when computing tangents for meshes without them.
+    pub tangent_calculation_strategy: TangentCalculationStrategy,
 }
 
 impl GltfPlugin {
@@ -141,8 +141,11 @@ impl GltfPlugin {
     }
 
     /// The strategy to use when computing mesh tangents.
-    pub fn with_computed_tangent_strategy(mut self, tangent_strategy: TangentStrategy) -> Self {
-        self.computed_tangent_strategy = tangent_strategy;
+    pub fn with_tangent_calculation_strategy(
+        mut self,
+        tangent_strategy: TangentCalculationStrategy,
+    ) -> Self {
+        self.tangent_calculation_strategy = tangent_strategy;
         self
     }
 }
@@ -170,7 +173,7 @@ impl Plugin for GltfPlugin {
         app.register_asset_loader(GltfLoader {
             supported_compressed_formats,
             custom_vertex_attributes: self.custom_vertex_attributes.clone(),
-            computed_tangent_strategy: self.computed_tangent_strategy,
+            tangent_calculation_strategy: self.tangent_calculation_strategy,
         });
     }
 }

crates/bevy_gltf/src/loader/mod.rs

@@ -35,7 +35,8 @@ use bevy_render::{
     mesh::{
         morph::{MeshMorphWeights, MorphAttributes, MorphTargetImage, MorphWeights},
         skinning::{SkinnedMesh, SkinnedMeshInverseBindposes},
-        Indices, Mesh, Mesh3d, MeshVertexAttribute, TangentStrategy, VertexAttributeValues,
+        Indices, Mesh, Mesh3d, MeshVertexAttribute, TangentCalculationStrategy,
+        VertexAttributeValues,
     },
     primitives::Aabb,
     render_asset::RenderAssetUsages,
@@ -146,7 +147,7 @@ pub struct GltfLoader {
     /// for additional details on custom attributes.
     pub custom_vertex_attributes: HashMap<Box<str>, MeshVertexAttribute>,
     /// The strategy to use when computing mesh tangents.
-    pub computed_tangent_strategy: TangentStrategy,
+    pub tangent_calculation_strategy: TangentCalculationStrategy,
 }
 
 /// Specifies optional settings for processing gltfs at load time. By default, all recognized contents of
@@ -687,16 +688,16 @@ async fn load_gltf<'a, 'b, 'c>(
             {
                 tracing::debug!(
                     "Missing vertex tangents for {}, computing them using the {:?} strategy. Consider using a tool such as Blender to pre-compute the tangents.",
-                    file_name, loader.computed_tangent_strategy
+                    file_name, loader.tangent_calculation_strategy
                 );
 
                 let generate_tangents_span = info_span!("compute_tangents", name = file_name);
 
                 generate_tangents_span.in_scope(|| {
-                    if let Err(err) = mesh.compute_tangents(loader.computed_tangent_strategy) {
+                    if let Err(err) = mesh.compute_tangents(loader.tangent_calculation_strategy) {
                         warn!(
                             "Failed to generate vertex tangents using {:?}: {}",
-                            loader.computed_tangent_strategy, err
+                            loader.tangent_calculation_strategy, err
                         );
                     }
                 });

crates/bevy_mesh/src/gramschmidt.rs

@@ -133,13 +133,13 @@ pub(crate) fn generate_tangents_for_mesh(
 mod tests {
     use bevy_math::{primitives::*, Vec2, Vec3, Vec3A};
 
-    use crate::{Mesh, TangentStrategy};
+    use crate::{Mesh, TangentCalculationStrategy};
 
     // The tangents should be very close for simple shapes
     fn compare_tangents(mut mesh: Mesh) {
         let hq_tangents: Vec<[f32; 4]> = {
             mesh.remove_attribute(Mesh::ATTRIBUTE_TANGENT);
-            mesh.compute_tangents(TangentStrategy::HighQuality)
+            mesh.compute_tangents(TangentCalculationStrategy::HighQuality)
                 .expect("compute_tangents(HighQuality)");
             mesh.attribute(Mesh::ATTRIBUTE_TANGENT)
                 .expect("hq_tangents.attribute(tangent)")
@@ -150,7 +150,7 @@ mod tests {
 
         let fa_tangents: Vec<[f32; 4]> = {
             mesh.remove_attribute(Mesh::ATTRIBUTE_TANGENT);
-            mesh.compute_tangents(TangentStrategy::FastApproximation)
+            mesh.compute_tangents(TangentCalculationStrategy::FastApproximation)
                 .expect("compute_tangents(FastApproximation)");
             mesh.attribute(Mesh::ATTRIBUTE_TANGENT)
                 .expect("fa_tangents.attribute(tangent)")

crates/bevy_mesh/src/mesh.rs

@@ -776,22 +776,26 @@ impl Mesh {
     /// Requires a [`PrimitiveTopology::TriangleList`] topology and the [`Mesh::ATTRIBUTE_POSITION`], [`Mesh::ATTRIBUTE_NORMAL`] and [`Mesh::ATTRIBUTE_UV_0`] attributes set.
     #[deprecated(since = "0.16.0", note = "use compute_tangents")]
     pub fn generate_tangents(&mut self) -> Result<(), GenerateTangentsError> {
-        self.compute_tangents(TangentStrategy::HighQuality)?;
+        self.compute_tangents(TangentCalculationStrategy::HighQuality)?;
         Ok(())
     }
 
     /// Generate tangents for the mesh using the given algorithm.
     ///
     /// Sets the [`Mesh::ATTRIBUTE_TANGENT`] attribute if successful.
     ///
-    /// See [`TangentStrategy`] for mesh topology and attribute requirements.
+    /// See [`TangentCalculationStrategy`] for mesh topology and attribute requirements.
     pub fn compute_tangents(
         &mut self,
-        tangent_strategy: TangentStrategy,
+        strategy: TangentCalculationStrategy,
     ) -> Result<(), GenerateTangentsError> {
-        let tangents = match tangent_strategy {
-            TangentStrategy::HighQuality => mikktspace::generate_tangents_for_mesh(self)?,
-            TangentStrategy::FastApproximation => gramschmidt::generate_tangents_for_mesh(self)?,
+        let tangents = match strategy {
+            TangentCalculationStrategy::HighQuality => {
+                mikktspace::generate_tangents_for_mesh(self)?
+            }
+            TangentCalculationStrategy::FastApproximation => {
+                gramschmidt::generate_tangents_for_mesh(self)?
+            }
         };
         self.insert_attribute(Mesh::ATTRIBUTE_TANGENT, tangents);
         Ok(())
@@ -817,12 +821,12 @@ impl Mesh {
     ///
     /// (Alternatively, you can use [`Mesh::compute_tangents`] to mutate an existing mesh in-place)
     ///
-    /// See [`TangentStrategy`] for mesh topology and attribute requirements.
+    /// See [`TangentCalculationStrategy`] for mesh topology and attribute requirements.
     pub fn with_computed_tangents(
         mut self,
-        tangent_strategy: TangentStrategy,
+        strategy: TangentCalculationStrategy,
     ) -> Result<Mesh, GenerateTangentsError> {
-        self.compute_tangents(tangent_strategy)?;
+        self.compute_tangents(strategy)?;
         Ok(self)
     }
 
@@ -1272,7 +1276,7 @@ impl core::ops::Mul<Mesh> for Transform {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 /// The strategy to use when computing mesh tangents. Defaults to `HighQuality`.
-pub enum TangentStrategy {
+pub enum TangentCalculationStrategy {
     /// Uses the Morten S. Mikkelsen "mikktspace" algorithm. Produces potentially higher quality tangents, but much slower.
     ///
     /// Requires a [`PrimitiveTopology::TriangleList`] topology and the [`Mesh::ATTRIBUTE_POSITION`], [`Mesh::ATTRIBUTE_NORMAL`] and [`Mesh::ATTRIBUTE_UV_0`] attributes set.

crates/bevy_pbr/src/decal/forward.rs

@@ -9,7 +9,9 @@ use bevy_math::{prelude::Rectangle, Quat, Vec2, Vec3};
 use bevy_reflect::{Reflect, TypePath};
 use bevy_render::{
     alpha::AlphaMode,
-    mesh::{Mesh, Mesh3d, MeshBuilder, MeshVertexBufferLayoutRef, Meshable, TangentStrategy},
+    mesh::{
+        Mesh, Mesh3d, MeshBuilder, MeshVertexBufferLayoutRef, Meshable, TangentCalculationStrategy,
+    },
     render_resource::{
         AsBindGroup, CompareFunction, RenderPipelineDescriptor, Shader,
         SpecializedMeshPipelineError,
@@ -42,7 +44,7 @@ impl Plugin for ForwardDecalPlugin {
                 .mesh()
                 .build()
                 .rotated_by(Quat::from_rotation_arc(Vec3::Z, Vec3::Y))
-                .with_computed_tangents(TangentStrategy::HighQuality)
+                .with_computed_tangents(TangentCalculationStrategy::HighQuality)
                 .unwrap(),
         );
 

examples/3d/anisotropy.rs

@@ -7,7 +7,7 @@ use bevy::{
     core_pipeline::Skybox,
     math::vec3,
     prelude::*,
-    render::mesh::TangentStrategy,
+    render::mesh::TangentCalculationStrategy,
     time::Stopwatch,
 };
 
@@ -116,7 +116,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>, app_status: Res
         Mesh3d(
             asset_server.add(
                 Mesh::from(Sphere::new(0.1))
-                    .with_computed_tangents(TangentStrategy::HighQuality)
+                    .with_computed_tangents(TangentCalculationStrategy::HighQuality)
                     .unwrap(),
             ),
         ),

examples/3d/clearcoat.rs

@@ -25,7 +25,7 @@ use bevy::{
     image::ImageLoaderSettings,
     math::vec3,
     prelude::*,
-    render::mesh::TangentStrategy,
+    render::mesh::TangentCalculationStrategy,
 };
 
 /// The size of each sphere.
@@ -84,7 +84,7 @@ fn create_sphere_mesh(meshes: &mut Assets<Mesh>) -> Handle<Mesh> {
 
     let mut sphere_mesh = Sphere::new(1.0).mesh().build();
     sphere_mesh
-        .compute_tangents(TangentStrategy::HighQuality)
+        .compute_tangents(TangentCalculationStrategy::HighQuality)
         .expect("Failed to generate tangents");
     meshes.add(sphere_mesh)
 }

examples/3d/deferred_rendering.rs

@@ -12,7 +12,7 @@ use bevy::{
         NotShadowCaster, NotShadowReceiver, OpaqueRendererMethod,
     },
     prelude::*,
-    render::mesh::TangentStrategy,
+    render::mesh::TangentCalculationStrategy,
 };
 
 fn main() {
@@ -234,7 +234,7 @@ fn setup_parallax(
 
     // NOTE: for normal maps and depth maps to work, the mesh
     // needs tangents generated.
-    cube.compute_tangents(TangentStrategy::FastApproximation)
+    cube.compute_tangents(TangentCalculationStrategy::FastApproximation)
         .unwrap();
 
     let parallax_material = materials.add(StandardMaterial {

examples/3d/parallax_mapping.rs

@@ -3,7 +3,9 @@
 
 use std::fmt;
 
-use bevy::{image::ImageLoaderSettings, math::ops, prelude::*, render::mesh::TangentStrategy};
+use bevy::{
+    image::ImageLoaderSettings, math::ops, prelude::*, render::mesh::TangentCalculationStrategy,
+};
 
 fn main() {
     App::new()
@@ -267,7 +269,7 @@ fn setup(
                 // NOTE: for normal maps and depth maps to work, the mesh
                 // needs tangents generated.
                 Mesh::from(Cuboid::default())
-                    .with_computed_tangents(TangentStrategy::HighQuality)
+                    .with_computed_tangents(TangentCalculationStrategy::HighQuality)
                     .unwrap(),
             ),
         ),
@@ -277,7 +279,7 @@ fn setup(
 
     let background_cube = meshes.add(
         Mesh::from(Cuboid::new(40.0, 40.0, 40.0))
-            .with_computed_tangents(TangentStrategy::HighQuality)
+            .with_computed_tangents(TangentCalculationStrategy::HighQuality)
             .unwrap(),
     );
 

examples/3d/rotate_environment_map.rs

@@ -7,7 +7,7 @@ use bevy::{
     core_pipeline::{tonemapping::Tonemapping::AcesFitted, Skybox},
     image::ImageLoaderSettings,
     prelude::*,
-    render::mesh::TangentStrategy,
+    render::mesh::TangentCalculationStrategy,
 };
 
 /// Entry point.
@@ -52,7 +52,7 @@ fn create_sphere_mesh(meshes: &mut Assets<Mesh>) -> Handle<Mesh> {
 
     let mut sphere_mesh = Sphere::new(1.0).mesh().build();
     sphere_mesh
-        .compute_tangents(TangentStrategy::HighQuality)
+        .compute_tangents(TangentCalculationStrategy::HighQuality)
         .expect("Failed to generate tangents");
     meshes.add(sphere_mesh)
 }