- Queries now fetch their archetypes directly by field rather than us…

…ing the turbofish accessor, this allows a sneaky trick in queries that enables cross-archetype nested mutability (including create/destroy!)
recatek · Jul 20, 2024 · 881ef1e · 881ef1e
1 parent 0d6d9ef
commit 881ef1e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/macros/src/generate/query.rs b/macros/src/generate/query.rs
@@ -5,6 +5,7 @@ use proc_macro2::{Ident, Span, TokenStream};
 use quote::{format_ident, quote, quote_spanned};
 
 use crate::data::{DataArchetype, DataWorld};
+use crate::generate::util::to_snake;
 
 use crate::parse::{
     ParseQueryFind, //.
@@ -75,10 +76,15 @@ pub fn generate_query_find(
                 .map(|p| to_type(p, &archetype))
                 .collect::<Vec<_>>(); // Bind-dependent!
 
+            // Variables
+            let archetype = format_ident!("{}", to_snake(&archetype.name));
+
+            // Fetch the archetype directly to allow queries to be sneaky with
+            // direct archetype access to get cross-archetype nested mutability
             #[rustfmt::skip]
             let get_archetype = match mode {
-                FetchMode::Borrow => quote!(#world.archetype::<#Archetype>()),
-                FetchMode::Mut => quote!(#world.archetype_mut::<#Archetype>()),
+                FetchMode::Borrow => quote!(&#world.#archetype),
+                FetchMode::Mut => quote!(&mut #world.#archetype),
             };
 
             #[rustfmt::skip]
@@ -248,10 +254,15 @@ pub fn generate_query_iter(
                 .map(|p| to_type(p, &archetype))
                 .collect::<Vec<_>>(); // Bind-dependent!
 
+            // Variables
+            let archetype = format_ident!("{}", to_snake(&archetype.name));
+
+            // Fetch the archetype directly to allow queries to be sneaky with
+            // direct archetype access to get cross-archetype nested mutability
             #[rustfmt::skip]
             let get_archetype = match mode {
-                FetchMode::Borrow => quote!(#world.archetype::<#Archetype>()),
-                FetchMode::Mut => quote!(#world.archetype_mut::<#Archetype>()),
+                FetchMode::Borrow => quote!(&#world.#archetype),
+                FetchMode::Mut => quote!(&mut #world.#archetype),
             };
 
             #[rustfmt::skip]
@@ -342,10 +353,15 @@ pub fn generate_query_iter_destroy(
                 .map(|p| to_type(p, &archetype))
                 .collect::<Vec<_>>(); // Bind-dependent!
 
+            // Variables
+            let archetype = format_ident!("{}", to_snake(&archetype.name));
+
+            // Fetch the archetype directly to allow queries to be sneaky with
+            // direct archetype access to get cross-archetype nested mutability
             #[rustfmt::skip]
             let get_archetype = match mode {
-                FetchMode::Borrow => panic!("borrow unsupported for iter_remove"),
-                FetchMode::Mut => quote!(#world.archetype_mut::<#Archetype>()),
+                FetchMode::Borrow => quote!(&#world.#archetype),
+                FetchMode::Mut => quote!(&mut #world.#archetype),
             };
 
             #[rustfmt::skip]

diff --git a/macros/src/generate/util.rs b/macros/src/generate/util.rs
@@ -15,6 +15,6 @@ pub fn generate_ecs_component_id(util: ParseEcsComponentId) -> TokenStream {
     quote!(#archetype::#get_id_component())
 }
 
-fn to_snake(name: &String) -> String {
+pub fn to_snake(name: &String) -> String {
     name.from_case(Case::Pascal).to_case(Case::Snake)
 }
diff --git a/macros/src/generate/world.rs b/macros/src/generate/world.rs
@@ -1,9 +1,9 @@
-use convert_case::{Case, Casing};
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
 use xxhash_rust::xxh3::xxh3_128;
 
 use crate::data::{DataArchetype, DataCapacity, DataWorld};
+use crate::generate::util::to_snake;
 
 #[allow(non_snake_case)] // Allow for type-like names to make quote!() clearer
 #[allow(unused_variables)] // For unused feature-controlled generation elements
@@ -881,7 +881,3 @@ fn with_capacity_new(archetype_data: &DataArchetype) -> TokenStream {
         DataCapacity::Dynamic => quote!(with_capacity(#archetype_capacity)),
     }
 }
-
-fn to_snake(name: &String) -> String {
-    name.from_case(Case::Pascal).to_case(Case::Snake)
-}