Fix merge errors

Author: Jondolf

src/collision/broad_phase/bvh_broad_phase.rs

@@ -244,7 +244,7 @@ fn query_tree(
             let entity2 = proxy2.collider;
 
             // Avoid duplicate pairs.
-            let pair_key = PairKey::new(entity1.index(), entity2.index());
+            let pair_key = PairKey::new(entity1.index_u32(), entity2.index_u32());
             if contact_graph.contains_key(&pair_key) {
                 continue;
             }

src/debug_render/mod.rs

@@ -7,6 +7,7 @@
 mod configuration;
 mod gizmos;
 
+use bevy_math::bounding::Aabb3d;
 pub use configuration::*;
 pub use gizmos::*;
 
@@ -255,18 +256,18 @@ fn debug_render_aabbs(
 fn debug_render_bvh(bvh: Res<ColliderTrees>, mut gizmos: Gizmos<PhysicsGizmos>) {
     for node in bvh.dynamic_tree.bvh.nodes.iter() {
         if node.prim_count == 0 {
-            gizmos.cuboid(
-                Transform::from_scale(node.aabb.diagonal().into())
-                    .with_translation(node.aabb.center().into()),
+            gizmos.aabb_3d(
+                Aabb3d::from_min_max(node.aabb.min, node.aabb.max),
+                Transform::IDENTITY,
                 WHITE,
             );
         }
     }
     for node in bvh.static_tree.bvh.nodes.iter() {
         if node.prim_count == 0 {
-            gizmos.cuboid(
-                Transform::from_scale(node.aabb.diagonal().into())
-                    .with_translation(node.aabb.center().into()),
+            gizmos.aabb_3d(
+                Aabb3d::from_min_max(node.aabb.min, node.aabb.max),
+                Transform::IDENTITY,
                 WHITE,
             );
         }