StrafesNET/rbx_loader
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update common

Browse Source
This commit is contained in:
Quaternions 2024-08-09 14:34:01 -07:00
parent f8f44b7b45
commit 418450e7d3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -484,9 +484,9 @@ dependencies = [
[[package]] [[package]]
name = "strafesnet_common" name = "strafesnet_common"
version = "0.3.0" version = "0.4.0"
source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/" source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
checksum = "1077d45a0b064964906a57de765a5a2bfe47b41f2f807d13b18c70765e76d3dd" checksum = "ea4126f6fbf9aecf89c9e319290f0221d177dcaa8659b4b9e3d82acc37829f12"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bitflags 2.6.0", "bitflags 2.6.0",

2
Cargo.toml
View File

@ -18,4 +18,4 @@ rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
rbx_mesh = "0.1.2" rbx_mesh = "0.1.2"
rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" } rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
rbx_xml = { version = "0.13.3", 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" }

8
src/rbx.rs
View File

@ -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})), "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 false=>if force_intersecting
||general.any() ||general.any()
||intersecting.any() ||intersecting.any()
{ {
attr::CollisionAttributes::Intersect{intersecting,general} attr::CollisionAttributes::Intersect(attr::IntersectAttributes{intersecting,general})
}else{ }else{
attr::CollisionAttributes::Decoration 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_id)=wormhole_in_model_to_id.get(&model_id){
if let Some(&wormhole_out_model_id)=wormhole_id_to_out_model.get(wormhole_id){ if let Some(&wormhole_out_model_id)=wormhole_id_to_out_model.get(wormhole_id){
match &mut model_owned_attributes.attributes{ match &mut model_owned_attributes.attributes{
attr::CollisionAttributes::Contact{contacting:_,general} attr::CollisionAttributes::Contact(attr::ContactAttributes{contacting:_,general})
|attr::CollisionAttributes::Intersect{intersecting:_,general} |attr::CollisionAttributes::Intersect(attr::IntersectAttributes{intersecting:_,general})
=>general.wormhole=Some(attr::Wormhole{destination_model:wormhole_out_model_id}), =>general.wormhole=Some(attr::Wormhole{destination_model:wormhole_out_model_id}),
attr::CollisionAttributes::Decoration=>println!("Not a wormhole"), attr::CollisionAttributes::Decoration=>println!("Not a wormhole"),
} }