cooking

Author: makspll

crates/bevy_mod_scripting_core/Cargo.toml

@@ -36,6 +36,8 @@ parking_lot = "0.12.1"
 dashmap = "6"
 smallvec = "1.11"
 itertools = "0.13"
+allocator-api2 = "0.2"
+blink-alloc = { version = "0.3", features = ["sync"] }
 
 [dev-dependencies]
 test_utils = { workspace = true }

crates/bevy_mod_scripting_core/src/bindings/access_map.rs

@@ -10,7 +10,7 @@ use smallvec::SmallVec;
 
 use crate::error::InteropError;
 
-use super::{ReflectAllocationId, ReflectBase};
+use super::{ReflectAllocation2, ReflectBase};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ClaimOwner {
@@ -153,10 +153,14 @@ impl ReflectAccessId {
         Ok(Self::for_component_id(component_id))
     }
 
-    pub fn for_allocation(id: ReflectAllocationId) -> Self {
+    pub fn for_allocation(allocation: &ReflectAllocation2) -> Self {
+        debug_assert!(
+            usize::MAX as u128 <= u64::MAX as u128,
+            "usize assumption broken"
+        );
         Self {
             kind: ReflectAccessKind::Allocation,
-            id: id.id(),
+            id: allocation.unique_id() as u64,
         }
     }
 
@@ -171,26 +175,20 @@ impl ReflectAccessId {
         match base {
             ReflectBase::Resource(id) => Self::for_component_id(id),
             ReflectBase::Component(_, id) => Self::for_component_id(id),
-            ReflectBase::Owned(id) => Self::for_allocation(id),
+            ReflectBase::Owned(id) => Self::for_allocation(&id),
         }
     }
 }
 
 impl From<ComponentId> for ReflectAccessId {
     fn from(value: ComponentId) -> Self {
-        Self {
-            kind: ReflectAccessKind::ComponentOrResource,
-            id: value.index() as u64,
-        }
+        ReflectAccessId::for_component_id(value)
     }
 }
 
-impl From<ReflectAllocationId> for ReflectAccessId {
-    fn from(value: ReflectAllocationId) -> Self {
-        Self {
-            kind: ReflectAccessKind::Allocation,
-            id: value.id(),
-        }
+impl From<&ReflectAllocation2> for ReflectAccessId {
+    fn from(value: &ReflectAllocation2) -> Self {
+        ReflectAccessId::for_allocation(value)
     }
 }
 
@@ -200,12 +198,6 @@ impl From<ReflectAccessId> for ComponentId {
     }
 }
 
-impl From<ReflectAccessId> for ReflectAllocationId {
-    fn from(val: ReflectAccessId) -> Self {
-        ReflectAllocationId::new(val.id)
-    }
-}
-
 #[derive(Debug, Default)]
 pub struct AccessMap {
     individual_accesses: DashMap<u64, AccessCount>,