From 418450e7d320c178ade9205bcf17d9baa259b235 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Fri, 9 Aug 2024 14:34:01 -0700 Subject: [PATCH] update common --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/rbx.rs | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e4c2e8..d23ba63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -484,9 +484,9 @@ dependencies = [ [[package]] name = "strafesnet_common" -version = "0.3.0" +version = "0.4.0" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" -checksum = "1077d45a0b064964906a57de765a5a2bfe47b41f2f807d13b18c70765e76d3dd" +checksum = "ea4126f6fbf9aecf89c9e319290f0221d177dcaa8659b4b9e3d82acc37829f12" dependencies = [ "arrayvec", "bitflags 2.6.0", diff --git a/Cargo.toml b/Cargo.toml index 1afabd9..0caaba7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,4 +18,4 @@ rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" } rbx_mesh = "0.1.2" rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" } rbx_xml = { version = "0.13.3", registry = "strafesnet" } -strafesnet_common = { version = "0.3.0", registry = "strafesnet" } +strafesnet_common = { version = "0.4.0", registry = "strafesnet" } diff --git a/src/rbx.rs b/src/rbx.rs index 5035b28..76e5861 100644 --- a/src/rbx.rs +++ b/src/rbx.rs @@ -328,13 +328,13 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode "Ladder"=>contacting.contact_behaviour=Some(attr::ContactingBehaviour::Ladder(attr::ContactingLadder{sticky:true})), _=>(), } - attr::CollisionAttributes::Contact{contacting,general} + attr::CollisionAttributes::Contact(attr::ContactAttributes{contacting,general}) }, false=>if force_intersecting ||general.any() ||intersecting.any() { - attr::CollisionAttributes::Intersect{intersecting,general} + attr::CollisionAttributes::Intersect(attr::IntersectAttributes{intersecting,general}) }else{ attr::CollisionAttributes::Decoration }, @@ -840,8 +840,8 @@ impl PartialMap1{ if let Some(wormhole_id)=wormhole_in_model_to_id.get(&model_id){ if let Some(&wormhole_out_model_id)=wormhole_id_to_out_model.get(wormhole_id){ match &mut model_owned_attributes.attributes{ - attr::CollisionAttributes::Contact{contacting:_,general} - |attr::CollisionAttributes::Intersect{intersecting:_,general} + attr::CollisionAttributes::Contact(attr::ContactAttributes{contacting:_,general}) + |attr::CollisionAttributes::Intersect(attr::IntersectAttributes{intersecting:_,general}) =>general.wormhole=Some(attr::Wormhole{destination_model:wormhole_out_model_id}), attr::CollisionAttributes::Decoration=>println!("Not a wormhole"), }