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

check if entity exists before accessing #68

Merged
merged 6 commits into from
Sep 4, 2023
Merged

check if entity exists before accessing #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6cae49
check if entity exists before accessing components.
LaserWitch Aug 24, 2023
217d1e8
cache entities on check to not access twice
LaserWitch Aug 27, 2023
bb785b8
Covered a few more cases.
LaserWitch Sep 2, 2023
cc44e91
Merge remote-tracking branch 'makspll/main' into fix/unsafe_entity_ac…
LaserWitch Sep 2, 2023
f1fc0e5
applied rustfmt changes
LaserWitch Sep 3, 2023
d2a3848
Merge remote-tracking branch 'makspll/main' into fix/unsafe_entity_ac…
LaserWitch Sep 3, 2023
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
39 changes: 28 additions & 11 deletions bevy_script_api/src/common/bevy/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ impl ScriptWorld {
) -> Result<ScriptRef, ScriptError> {
let mut w = self.write();

let mut entity_ref = w
.get_entity_mut(entity)
.ok_or_else(|| ScriptError::Other(format!("Entity is not valid {:#?}", entity)))?;

let component_data = comp_type.data::<ReflectComponent>().ok_or_else(|| {
ScriptError::Other(format!("Not a component {}", comp_type.short_name()))
})?;
Expand All @@ -177,18 +181,18 @@ impl ScriptWorld {
// TODO: maybe get an add_default impl added to ReflectComponent
// this means that we don't require ReflectDefault for adding components!
match comp_type.0.type_info(){
bevy::reflect::TypeInfo::Struct(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicStruct::default()),
bevy::reflect::TypeInfo::TupleStruct(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicTupleStruct::default()),
bevy::reflect::TypeInfo::Tuple(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicTuple::default()),
bevy::reflect::TypeInfo::List(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicList::default()),
bevy::reflect::TypeInfo::Array(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicArray::new(Box::new([]))),
bevy::reflect::TypeInfo::Map(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicMap::default()),
bevy::reflect::TypeInfo::Value(_) => component_data.insert(&mut w.entity_mut(entity),
bevy::reflect::TypeInfo::Struct(_) => component_data.insert(&mut entity_ref, &DynamicStruct::default()),
bevy::reflect::TypeInfo::TupleStruct(_) => component_data.insert(&mut entity_ref, &DynamicTupleStruct::default()),
bevy::reflect::TypeInfo::Tuple(_) => component_data.insert(&mut entity_ref, &DynamicTuple::default()),
bevy::reflect::TypeInfo::List(_) => component_data.insert(&mut entity_ref, &DynamicList::default()),
bevy::reflect::TypeInfo::Array(_) => component_data.insert(&mut entity_ref, &DynamicArray::new(Box::new([]))),
bevy::reflect::TypeInfo::Map(_) => component_data.insert(&mut entity_ref, &DynamicMap::default()),
bevy::reflect::TypeInfo::Value(_) => component_data.insert(&mut entity_ref,
comp_type.data::<ReflectDefault>().ok_or_else(||
ScriptError::Other(format!("Component {} is a value or dynamic type with no `ReflectDefault` type_data, cannot instantiate sensible value",comp_type.short_name())))?
.default()
.as_ref()),
bevy::reflect::TypeInfo::Enum(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicEnum::default())
bevy::reflect::TypeInfo::Enum(_) => component_data.insert(&mut entity_ref, &DynamicEnum::default())
};

Ok(ScriptRef::new_component_ref(
Expand All @@ -205,11 +209,15 @@ impl ScriptWorld {
) -> Result<Option<ScriptRef>, ScriptError> {
let w = self.read();

let entity_ref = w
.get_entity(entity)
.ok_or_else(|| ScriptError::Other(format!("Entity is not valid {:#?}", entity)))?;

let component_data = comp_type.data::<ReflectComponent>().ok_or_else(|| {
ScriptError::Other(format!("Not a component {}", comp_type.short_name()))
})?;

Ok(component_data.reflect(w.entity(entity)).map(|_component| {
Ok(component_data.reflect(entity_ref).map(|_component| {
ScriptRef::new_component_ref(component_data.clone(), entity, self.clone().into())
}))
}
Expand All @@ -224,7 +232,11 @@ impl ScriptWorld {
ScriptError::Other(format!("Not a component {}", comp_type.short_name()))
})?;

Ok(component_data.reflect(w.entity(entity)).is_some())
let entity_ref = w
.get_entity(entity)
.ok_or_else(|| ScriptError::Other(format!("Entity is not valid {:#?}", entity)))?;

Ok(component_data.reflect(entity_ref).is_some())
}

pub fn remove_component(
Expand All @@ -233,10 +245,15 @@ impl ScriptWorld {
comp_type: ScriptTypeRegistration,
) -> Result<(), ScriptError> {
let mut w = self.write();

let mut entity_ref = w
.get_entity_mut(entity)
.ok_or_else(|| ScriptError::Other(format!("Entity is not valid {:#?}", entity)))?;

let component_data = comp_type.data::<ReflectComponent>().ok_or_else(|| {
ScriptError::Other(format!("Not a component {}", comp_type.short_name()))
})?;
component_data.remove(&mut w.entity_mut(entity));
component_data.remove(&mut entity_ref);
Ok(())
}

Expand Down
9 changes: 8 additions & 1 deletion bevy_script_api/src/sub_reflect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,14 @@ impl ReflectPath {
ReflectBase::Component { comp, entity } => {
let g = world_ptr.read();

let ref_ = self.walk_path(comp.reflect(g.entity(*entity)).ok_or_else(|| {
let entity_ref =
g.get_entity(*entity)
.ok_or_else(|| ReflectionError::InvalidBaseReference {
base: self.base.to_string(),
reason: "This entity does not exist".to_owned(),
})?;

let ref_ = self.walk_path(comp.reflect(entity_ref).ok_or_else(|| {
ReflectionError::InvalidBaseReference {
base: self.base.to_string(),
reason: "Given component does not exist on this entity".to_owned(),
Expand Down
Loading