forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scene: rename id to entity

Browse Source
This commit is contained in:
Carter Anderson 2020-05-21 18:23:22 -07:00
parent 38669107c9
commit fd26588dbd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/scene/load_scene_example.scn
View File

@ -1,6 +1,6 @@
[
(
id: 2309003120,
entity: 2309003120,
components: [
(
type: "Test",
@ -18,7 +18,7 @@
],
),
(
id: 4238063392,
entity: 4238063392,
components: [
(
type: "Test",

12
crates/bevy_scene/src/serde/scene_de.rs
View File

@ -56,7 +56,7 @@ struct EntityDeserializer<'a> {
}
pub const ENTITY_FIELD_ID: &str = "id";
pub const ENTITY_FIELD_ENTITY: &str = "entity";
pub const ENTITY_FIELD_COMPONENTS: &str = "components";
impl<'a, 'de> DeserializeSeed<'de> for EntityDeserializer<'a> {
@ -67,7 +67,7 @@ impl<'a, 'de> DeserializeSeed<'de> for EntityDeserializer<'a> {
{
deserializer.deserialize_struct(
"Entity",
&[ENTITY_FIELD_ID, ENTITY_FIELD_COMPONENTS],
&[ENTITY_FIELD_ENTITY, ENTITY_FIELD_COMPONENTS],
EntityVisiter {
world: self.world,
component_registry: self.component_registry,
@ -95,9 +95,9 @@ impl<'a, 'de> Visitor<'de> for EntityVisiter<'a> {
let mut components = false;
while let Some(key) = map.next_key()? {
match key {
EntityField::Id => {
EntityField::Entity => {
if entity.is_some() {
return Err(Error::duplicate_field(ENTITY_FIELD_ID));
return Err(Error::duplicate_field(ENTITY_FIELD_ENTITY));
}
let id = map.next_value()?;
self.world
@ -110,7 +110,7 @@ impl<'a, 'de> Visitor<'de> for EntityVisiter<'a> {
return Err(Error::duplicate_field(ENTITY_FIELD_COMPONENTS));
}
let entity = entity.ok_or_else(|| Error::missing_field(ENTITY_FIELD_ID))?;
let entity = entity.ok_or_else(|| Error::missing_field(ENTITY_FIELD_ENTITY))?;
// this is just a placeholder value to protect against duplicates
components = true;
map.next_value_seed(ComponentSeqDeserializer {
@ -128,7 +128,7 @@ impl<'a, 'de> Visitor<'de> for EntityVisiter<'a> {
#[derive(Deserialize)]
#[serde(field_identifier, rename_all = "lowercase")]
enum EntityField {
Id,
Entity,
Components,
}

2
crates/bevy_scene/src/serde/scene_ser.rs
View File

@ -60,7 +60,7 @@ impl<'a> Serialize for WorldEntity<'a> {
S: serde::Serializer,
{
let mut state = serializer.serialize_struct("Entity", 2)?;
state.serialize_field("id", &self.entity.index())?;
state.serialize_field("entity", &self.entity.index())?;
state.serialize_field(
"components",
&EntityComponents {