StrafesNET/strafe-project
6
Fork 4
Code Issues5 Pull Requests2 Packages Projects Releases2 Wiki Activity

rename TEMP_TOUCH_ME_ATTRIBUTE

Browse Source
This commit is contained in:
Quaternions 2025-02-04 10:35:48 -08:00
parent 4805d237e2
commit 337cf031d3
1 changed files with 10 additions and 12 deletions

22
lib/bsp_loader/src/bsp.rs

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