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

Merge branch 'entity-physics' into debug-merge

Browse Source
This commit is contained in:
Quaternions 2025-03-11 17:46:09 -07:00
commit 5a4276052a
1 changed files with 6 additions and 2 deletions

8
lib/bsp_loader/src/bsp.rs

@ -205,7 +205,11 @@ pub fn convert<'a>(
model::PolygonGroup::PolygonList(model::PolygonList::new(polygon_list)) model::PolygonGroup::PolygonList(model::PolygonList::new(polygon_list))
}).collect(); }).collect();
mb.build(polygon_groups,graphics_groups,vec![]) let physics_groups=vec![model::IndexedPhysicsGroup{
groups:(0..world_model.face_count as u32).map(model::PolygonGroupId::new).collect(),
}];
mb.build(polygon_groups,graphics_groups,physics_groups)
}).collect(); }).collect();
let mut found_spawn=None; let mut found_spawn=None;
@ -228,7 +232,7 @@ pub fn convert<'a>(
let mut teleport_destinations=HashMap::new(); let mut teleport_destinations=HashMap::new();
const WHITE:vbsp::Color=vbsp::Color{r:255,g:255,b:255}; const WHITE:vbsp::Color=vbsp::Color{r:255,g:255,b:255};
const ENTITY_ATTRIBUTE:gameplay_attributes::CollisionAttributesId=ATTRIBUTE_DECORATION; const ENTITY_ATTRIBUTE:gameplay_attributes::CollisionAttributesId=ATTRIBUTE_CONTACT_DEFAULT;
const ENTITY_TRIGGER_ATTRIBUTE:gameplay_attributes::CollisionAttributesId=ATTRIBUTE_INTERSECT_DEFAULT; const ENTITY_TRIGGER_ATTRIBUTE:gameplay_attributes::CollisionAttributesId=ATTRIBUTE_INTERSECT_DEFAULT;
for raw_ent in &bsp.entities{ for raw_ent in &bsp.entities{
macro_rules! ent_brush_default{ macro_rules! ent_brush_default{