From be7abc7df0888ed3718ae7eaf45335169cf824d7 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Tue, 9 Jan 2024 16:49:08 -0800 Subject: [PATCH] ignore external props for now --- src/load_bsp.rs | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/load_bsp.rs b/src/load_bsp.rs index 2cc8846..5119940 100644 --- a/src/load_bsp.rs +++ b/src/load_bsp.rs @@ -180,22 +180,24 @@ pub fn generate_indexed_models(input:&mut R)->Res //generate model instances for prop in bsp.static_props(){ let placement=prop.as_prop_placement(); - let model=prop_models.get_mut(model_map[placement.model]).unwrap(); - model.instances.push(crate::model::ModelInstance{ - transform:crate::integer::Planar64Affine3::new( - crate::integer::Planar64Mat3::try_from( - glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale)) - *glam::Mat3A::from_quat( - //TODO: does rotation need valve transform? - glam::Quat::from_xyzw(placement.rotation.v.x,placement.rotation.v.y,placement.rotation.v.z,placement.rotation.s), - - ) - ).unwrap(), - valve_transform(<[f32;3]>::from(placement.origin)), - ), - attributes:crate::model::CollisionAttributes::Decoration, - ..Default::default() - }); + if let Some(&model_index)=model_map.get(placement.model){ + prop_models[model_index].instances.push(crate::model::ModelInstance{ + transform:crate::integer::Planar64Affine3::new( + crate::integer::Planar64Mat3::try_from( + glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale)) + *glam::Mat3A::from_quat( + //TODO: does rotation need valve transform? + glam::Quat::from_xyzw(placement.rotation.v.x,placement.rotation.v.y,placement.rotation.v.z,placement.rotation.s), + ) + ).unwrap(), + valve_transform(<[f32;3]>::from(placement.origin)), + ), + attributes:crate::model::CollisionAttributes::Decoration, + ..Default::default() + }); + }else{ + println!("model not found {}",placement.model); + } } //actually add the prop models