Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dynamic Systems and Components #623

Closed
wants to merge 3 commits into from
Closed

Dynamic Systems and Components #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0798295
Implement Custom Component Ids
zicklag Oct 4, 2020
9111e06
Implement Dynamic Systems and Components
zicklag Oct 24, 2020
40a70b4
Rename `dynamic-api` Feature to `dynamic_api`
zicklag Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ render = ["bevy_pbr", "bevy_render", "bevy_sprite", "bevy_text", "bevy_ui"]
png = ["bevy_render/png"]
hdr = ["bevy_render/hdr"]

# Enable the dynamic systems and components API ( useful for developing scripting solutions )
dynamic_api = ["bevy_ecs/dynamic_api", "bevy_scene/dynamic_api"]

# Audio format support (MP3 is enabled by default)
mp3 = ["bevy_audio/mp3"]
flac = ["bevy_audio/flac"]
Expand Down Expand Up @@ -90,6 +93,8 @@ serde = { version = "1", features = ["derive"] }
log = "0.4"
ron = "0.6"
anyhow = "1.0"
lazy_static = "1.4.0"


# bevy (Android)
[target.'cfg(target_os = "android")'.dependencies]
Expand Down Expand Up @@ -216,6 +221,16 @@ path = "examples/ecs/parallel_query.rs"
name = "hierarchy"
path = "examples/ecs/hierarchy.rs"

[[example]]
name = "dynamic_systems"
path = "examples/ecs/dynamic_systems.rs"
required-features = ["dynamic_api"]

[[example]]
name = "dynamic_components"
path = "examples/ecs/dynamic_components.rs"
required-features = ["dynamic_api"]

[[example]]
name = "breakout"
path = "examples/game/breakout.rs"
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_ecs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ categories = ["game-engines", "data-structures"]

[features]
profiler = []
dynamic_api = ["bevy_hecs/dynamic_api"]

[dependencies]
bevy_hecs = { path = "hecs", features = ["macros", "serialize"], version = "0.3.0" }
Expand Down
2 changes: 2 additions & 0 deletions crates/bevy_ecs/hecs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ std = []
# Enables derive(Bundle)
macros = ["bevy_hecs_macros", "lazy_static"]
serialize = ["serde"]
# Enables the dynamic components and systems APIs
dynamic_api = ["std"]

[dependencies]
bevy_hecs_macros = { path = "macros", version = "0.3.0", optional = true }
Expand Down
38 changes: 24 additions & 14 deletions crates/bevy_ecs/hecs/macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream {
let n = tys.len();
let code = quote! {
impl #path::DynamicBundle for #ident {
fn with_ids<T>(&self, f: impl FnOnce(&[std::any::TypeId]) -> T) -> T {
fn with_ids<T>(&self, f: impl FnOnce(&[#path::ComponentId]) -> T) -> T {
Self::with_static_ids(f)
}

fn type_info(&self) -> Vec<#path::TypeInfo> {
Self::static_type_info()
}

unsafe fn put(mut self, mut f: impl FnMut(*mut u8, std::any::TypeId, usize) -> bool) {
unsafe fn put(mut self, mut f: impl FnMut(*mut u8, #path::ComponentId, usize) -> bool) {
#(
if f((&mut self.#fields as *mut #tys).cast::<u8>(), std::any::TypeId::of::<#tys>(), std::mem::size_of::<#tys>()) {
if f((&mut self.#fields as *mut #tys).cast::<u8>(), std::any::TypeId::of::<#tys>().into(), std::mem::size_of::<#tys>()) {
#[allow(clippy::forget_copy)]
std::mem::forget(self.#fields);
}
Expand All @@ -77,22 +77,22 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream {
}

impl #path::Bundle for #ident {
fn with_static_ids<T>(f: impl FnOnce(&[std::any::TypeId]) -> T) -> T {
fn with_static_ids<T>(f: impl FnOnce(&[#path::ComponentId]) -> T) -> T {
use std::any::TypeId;
use std::mem;

#path::lazy_static::lazy_static! {
static ref ELEMENTS: [TypeId; #n] = {
static ref ELEMENTS: [#path::ComponentId; #n] = {
let mut dedup = #path::bevy_utils::HashSet::default();
for &(ty, name) in [#((std::any::TypeId::of::<#tys>(), std::any::type_name::<#tys>())),*].iter() {
for &(ty, name) in [#((#path::ComponentId::from(std::any::TypeId::of::<#tys>()), std::any::type_name::<#tys>())),*].iter() {
if !dedup.insert(ty) {
panic!("{} has multiple {} fields; each type must occur at most once!", stringify!(#ident), name);
}
}

let mut tys = [#((mem::align_of::<#tys>(), TypeId::of::<#tys>())),*];
let mut tys = [#((mem::align_of::<#tys>(), #path::ComponentId::from(TypeId::of::<#tys>()))),*];
tys.sort_unstable_by(|x, y| x.0.cmp(&y.0).reverse().then(x.1.cmp(&y.1)));
let mut ids = [TypeId::of::<()>(); #n];
let mut ids: [#path::ComponentId; #n] = [TypeId::of::<()>().into(); #n];
for (id, info) in ids.iter_mut().zip(tys.iter()) {
*id = info.1;
}
Expand All @@ -104,16 +104,16 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream {
}

fn static_type_info() -> Vec<#path::TypeInfo> {
let mut info = vec![#(#path::TypeInfo::of::<#tys>()),*];
let mut info = vec![#(#path::TypeInfo::of::<#tys>().into()),*];
info.sort_unstable();
info
}

unsafe fn get(
mut f: impl FnMut(std::any::TypeId, usize) -> Option<std::ptr::NonNull<u8>>,
mut f: impl FnMut(#path::ComponentId, usize) -> Option<std::ptr::NonNull<u8>>,
) -> Result<Self, #path::MissingComponent> {
#(
let #fields = f(std::any::TypeId::of::<#tys>(), std::mem::size_of::<#tys>())
let #fields = f(std::any::TypeId::of::<#tys>().into(), std::mem::size_of::<#tys>())
.ok_or_else(#path::MissingComponent::new::<#tys>)?
.cast::<#tys>()
.as_ptr();
Expand Down Expand Up @@ -186,7 +186,12 @@ pub fn impl_query_set(_input: TokenStream) -> TokenStream {
let query_fn = &query_fns[0..query_count];
let query_fn_mut = &query_fn_muts[0..query_count];
tokens.extend(TokenStream::from(quote! {
impl<#(#lifetime,)* #(#query: HecsQuery,)*> QueryTuple for (#(Query<#lifetime, #query>,)*) {
impl<#(#lifetime,)* #(#query: HecsQuery,)*> QueryTuple for (#(Query<#lifetime, #query>,)*)
where
#(
#query::Fetch: for<'a> Fetch<'a, State = ()>
),*
{
unsafe fn new(world: &World, component_access: &TypeAccess<ArchetypeComponent>) -> Self {
(
#(
Expand All @@ -200,12 +205,17 @@ pub fn impl_query_set(_input: TokenStream) -> TokenStream {

fn get_accesses() -> Vec<QueryAccess> {
vec![
#(<#query::Fetch as Fetch>::access(),)*
#(<#query::Fetch as Fetch>::access(&()),)*
]
}
}

impl<#(#lifetime,)* #(#query: HecsQuery,)*> QuerySet<(#(Query<#lifetime, #query>,)*)> {
impl<#(#lifetime,)* #(#query: HecsQuery,)*> QuerySet<(#(Query<#lifetime, #query>,)*)>
where
#(
#query::Fetch: for<'a> Fetch<'a, State = ()>
),*
{
#(#query_fn)*
#(#query_fn_mut)*
}
Expand Down
69 changes: 36 additions & 33 deletions crates/bevy_ecs/hecs/src/access.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use core::{any::TypeId, hash::Hash};
use std::{boxed::Box, vec::Vec};

use crate::{Archetype, World};
use crate::{Archetype, ComponentId, World};
use bevy_utils::HashSet;

#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
Expand All @@ -14,52 +14,53 @@ pub enum Access {
#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
pub struct ArchetypeComponent {
pub archetype_index: u32,
pub component: TypeId,
pub component: ComponentId,
}

impl ArchetypeComponent {
#[inline]
pub fn new<T: 'static>(archetype_index: u32) -> Self {
ArchetypeComponent {
archetype_index,
component: TypeId::of::<T>(),
component: TypeId::of::<T>().into(),
}
}

#[inline]
pub fn new_ty(archetype_index: u32, component: TypeId) -> Self {
pub fn new_component(archetype_index: u32, component: ComponentId) -> Self {
ArchetypeComponent {
archetype_index,
component,
}
}
}

#[derive(Clone, Debug)]
pub enum QueryAccess {
None,
Read(TypeId, &'static str),
Write(TypeId, &'static str),
Read(ComponentId, &'static str),
Write(ComponentId, &'static str),
Optional(Box<QueryAccess>),
With(TypeId, Box<QueryAccess>),
Without(TypeId, Box<QueryAccess>),
With(ComponentId, Box<QueryAccess>),
Without(ComponentId, Box<QueryAccess>),
Union(Vec<QueryAccess>),
}

impl QueryAccess {
pub fn read<T: 'static>() -> QueryAccess {
QueryAccess::Read(TypeId::of::<T>(), std::any::type_name::<T>())
QueryAccess::Read(TypeId::of::<T>().into(), std::any::type_name::<T>())
}

pub fn write<T: 'static>() -> QueryAccess {
QueryAccess::Write(TypeId::of::<T>(), std::any::type_name::<T>())
QueryAccess::Write(TypeId::of::<T>().into(), std::any::type_name::<T>())
}

pub fn with<T: 'static>(access: QueryAccess) -> QueryAccess {
QueryAccess::With(TypeId::of::<T>(), Box::new(access))
QueryAccess::With(TypeId::of::<T>().into(), Box::new(access))
}

pub fn without<T: 'static>(access: QueryAccess) -> QueryAccess {
QueryAccess::Without(TypeId::of::<T>(), Box::new(access))
QueryAccess::Without(TypeId::of::<T>().into(), Box::new(access))
}

pub fn optional(access: QueryAccess) -> QueryAccess {
Expand All @@ -82,29 +83,29 @@ impl QueryAccess {
}
}

pub fn get_type_name(&self, type_id: TypeId) -> Option<&'static str> {
pub fn get_type_name(&self, component_id: ComponentId) -> Option<&'static str> {
match self {
QueryAccess::None => None,
QueryAccess::Read(current_type_id, name) => {
if type_id == *current_type_id {
QueryAccess::Read(current_component_id, name) => {
if component_id == *current_component_id {
Some(*name)
} else {
None
}
}
QueryAccess::Write(current_type_id, name) => {
if type_id == *current_type_id {
QueryAccess::Write(current_component_id, name) => {
if component_id == *current_component_id {
Some(*name)
} else {
None
}
}
QueryAccess::Optional(query_access) => query_access.get_type_name(type_id),
QueryAccess::With(_, query_access) => query_access.get_type_name(type_id),
QueryAccess::Without(_, query_access) => query_access.get_type_name(type_id),
QueryAccess::Optional(query_access) => query_access.get_type_name(component_id),
QueryAccess::With(_, query_access) => query_access.get_type_name(component_id),
QueryAccess::Without(_, query_access) => query_access.get_type_name(component_id),
QueryAccess::Union(query_accesses) => {
for query_access in query_accesses.iter() {
if let Some(name) = query_access.get_type_name(type_id) {
if let Some(name) = query_access.get_type_name(component_id) {
return Some(name);
}
}
Expand All @@ -125,19 +126,21 @@ impl QueryAccess {
match self {
QueryAccess::None => Some(Access::None),
QueryAccess::Read(ty, _) => {
if archetype.has_type(*ty) {
if archetype.has_component(*ty) {
if let Some(type_access) = type_access {
type_access.add_read(ArchetypeComponent::new_ty(archetype_index, *ty));
type_access
.add_read(ArchetypeComponent::new_component(archetype_index, *ty));
}
Some(Access::Read)
} else {
None
}
}
QueryAccess::Write(ty, _) => {
if archetype.has_type(*ty) {
if archetype.has_component(*ty) {
if let Some(type_access) = type_access {
type_access.add_write(ArchetypeComponent::new_ty(archetype_index, *ty));
type_access
.add_write(ArchetypeComponent::new_component(archetype_index, *ty));
}
Some(Access::Write)
} else {
Expand All @@ -157,14 +160,14 @@ impl QueryAccess {
}
}
QueryAccess::With(ty, query_access) => {
if archetype.has_type(*ty) {
if archetype.has_component(*ty) {
query_access.get_access(archetype, archetype_index, type_access)
} else {
None
}
}
QueryAccess::Without(ty, query_access) => {
if !archetype.has_type(*ty) {
if !archetype.has_component(*ty) {
query_access.get_access(archetype, archetype_index, type_access)
} else {
None
Expand Down Expand Up @@ -308,7 +311,7 @@ mod tests {
let e3_c = ArchetypeComponent::new::<C>(e3_archetype);

let mut a_type_access = TypeAccess::default();
<(&A,) as Query>::Fetch::access()
<(&A,) as Query>::Fetch::access(&())
.get_world_archetype_access(&world, Some(&mut a_type_access));

assert_eq!(
Expand All @@ -317,7 +320,7 @@ mod tests {
);

let mut a_b_type_access = TypeAccess::default();
<(&A, &B) as Query>::Fetch::access()
<(&A, &B) as Query>::Fetch::access(&())
.get_world_archetype_access(&world, Some(&mut a_b_type_access));

assert_eq!(
Expand All @@ -326,7 +329,7 @@ mod tests {
);

let mut a_bmut_type_access = TypeAccess::default();
<(&A, &mut B) as Query>::Fetch::access()
<(&A, &mut B) as Query>::Fetch::access(&())
.get_world_archetype_access(&world, Some(&mut a_bmut_type_access));

assert_eq!(
Expand All @@ -335,7 +338,7 @@ mod tests {
);

let mut a_option_bmut_type_access = TypeAccess::default();
<(Entity, &A, Option<&mut B>) as Query>::Fetch::access()
<(Entity, &A, Option<&mut B>) as Query>::Fetch::access(&())
.get_world_archetype_access(&world, Some(&mut a_option_bmut_type_access));

assert_eq!(
Expand All @@ -344,7 +347,7 @@ mod tests {
);

let mut a_with_b_type_access = TypeAccess::default();
<With<B, &A> as Query>::Fetch::access()
<With<B, &A> as Query>::Fetch::access(&())
.get_world_archetype_access(&world, Some(&mut a_with_b_type_access));

assert_eq!(
Expand All @@ -353,7 +356,7 @@ mod tests {
);

let mut a_with_b_option_c_type_access = TypeAccess::default();
<With<B, (&A, Option<&mut C>)> as Query>::Fetch::access()
<With<B, (&A, Option<&mut C>)> as Query>::Fetch::access(&())
.get_world_archetype_access(&world, Some(&mut a_with_b_option_c_type_access));

assert_eq!(
Expand Down
Loading