diff --git a/lib/bsp_loader/src/bsp.rs b/lib/bsp_loader/src/bsp.rs index 6c4897e..b625774 100644 --- a/lib/bsp_loader/src/bsp.rs +++ b/lib/bsp_loader/src/bsp.rs @@ -41,7 +41,7 @@ pub fn convert<'a>( //figure out real attributes later let mut unique_attributes=Vec::new(); unique_attributes.push(gameplay_attributes::CollisionAttributes::Decoration); - const TEMP_TOUCH_ME_ATTRIBUTE:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(0); + const ATTRIBUTE_DECORATION:gameplay_attributes::CollisionAttributesId=gameplay_attributes::CollisionAttributesId::new(0); //declare all prop models to Loader let prop_models=bsp.static_props().map(|prop|{ @@ -50,7 +50,7 @@ pub fn convert<'a>( let placement=prop.as_prop_placement(); model::Model{ mesh:mesh_id, - attributes:TEMP_TOUCH_ME_ATTRIBUTE, + attributes:ATTRIBUTE_DECORATION, transform:integer::Planar64Affine3::new( integer::mat3::try_from_f32_array_2d(( glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale)) @@ -143,16 +143,14 @@ pub fn convert<'a>( (model::MeshId::new(mesh_id),brush.origin,brush.color) ) ) - ).map(|(mesh_id,model_origin,vbsp::Color{r,g,b})|{ - model::Model{ - mesh:mesh_id, - attributes:TEMP_TOUCH_ME_ATTRIBUTE, - transform:integer::Planar64Affine3::new( - integer::mat3::identity(), - valve_transform(model_origin.into()) - ), - color:(glam::Vec3::from_array([r as f32,g as f32,b as f32])/255.0).extend(1.0), - } + ).map(|(mesh_id,model_origin,vbsp::Color{r,g,b})|model::Model{ + mesh:mesh_id, + attributes:ATTRIBUTE_DECORATION, + transform:integer::Planar64Affine3::new( + integer::mat3::identity(), + valve_transform(model_origin.into()) + ), + color:(glam::Vec3::from_array([r as f32,g as f32,b as f32])/255.0).extend(1.0), }).collect(); PartialMap1{