diff --git a/lib/bsp_loader/src/bsp.rs b/lib/bsp_loader/src/bsp.rs index 95070488..a083a787 100644 --- a/lib/bsp_loader/src/bsp.rs +++ b/lib/bsp_loader/src/bsp.rs @@ -42,8 +42,10 @@ pub fn convert<'a>( let mut unique_attributes=Vec::new(); unique_attributes.push(gameplay_attributes::CollisionAttributes::Decoration); unique_attributes.push(gameplay_attributes::CollisionAttributes::contact_default()); + unique_attributes.push(gameplay_attributes::CollisionAttributes::intersect_default()); const ATTRIBUTE_DECORATION:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(0); const ATTRIBUTE_CONTACT_DEFAULT:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(1); + const ATTRIBUTE_INTERSECT_DEFAULT:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(2); //declare all prop models to Loader let prop_models=bsp.static_props().map(|prop|{ @@ -206,7 +208,7 @@ pub fn convert<'a>( let model_id=model::ModelId::new(world_models.len() as u32); world_models.push(model::Model{ mesh:mesh_id, - attributes:ATTRIBUTE_CONTACT_DEFAULT, + attributes:ATTRIBUTE_INTERSECT_DEFAULT, transform:integer::Planar64Affine3::from_translation(spawn_point), color:glam::Vec4::W, }); diff --git a/lib/common/src/gameplay_attributes.rs b/lib/common/src/gameplay_attributes.rs index 79dae160..1738851c 100644 --- a/lib/common/src/gameplay_attributes.rs +++ b/lib/common/src/gameplay_attributes.rs @@ -171,4 +171,7 @@ impl CollisionAttributes{ pub fn contact_default()->Self{ Self::Contact(ContactAttributes::default()) } + pub fn intersect_default()->Self{ + Self::Intersect(IntersectAttributes::default()) + } }