Fix 2d mesh raycasting

aevyrie · Aug 22, 2023 · 3c3fea0 · 3c3fea0
1 parent 867c231
commit 3c3fea0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.13.1
+
+- Fixed: overly-strict query filter preventing raycasting 2d meshes.
+
 # 0.13.0
 
 - Changed: the immediate mode raycasting system param `Raycast` no longer requires a type parameter

diff --git a/src/system_param.rs b/src/system_param.rs
@@ -70,6 +70,11 @@ impl<'a> Default for RaycastSettings<'a> {
  }
 }
 
+#[cfg(feature = "2d")]
+type MeshFilter = Or<(With<Handle<Mesh>>, With<Mesh2dHandle>)>;
+#[cfg(not(feature = "2d"))]
+type MeshFilter = With<Handle<Mesh>>;
+
 /// A [`SystemParam`] that allows you to raycast into the world.
 #[derive(SystemParam)]
 pub struct Raycast<'w, 's> {
@@ -86,7 +91,7 @@ pub struct Raycast<'w, 's> {
  Read<GlobalTransform>,
  Entity,
  ),
- With<Handle<Mesh>>,
+ MeshFilter,
  >,
  pub mesh_query: Query<
  'w,