From 4811ad08201cd9e48a8e157f5f0b5e86795f1d30 Mon Sep 17 00:00:00 2001 From: kotofyt Date: Fri, 29 May 2026 19:19:16 +0300 Subject: [PATCH] fixed rapier.rs --- external/GameNetworkingSockets | 2 +- external/SDL | 2 +- external/SPIRV-Headers | 2 +- external/SPIRV-Tools | 1 - external/Vulkan-Headers | 2 +- external/Vulkan-Utility-Libraries | 2 +- external/VulkanMemoryAllocator | 2 +- external/funnystdlib | 2 +- external/slang | 2 +- external/stb | 2 +- external/volk | 2 +- external/xtool | 2 +- rapier/Cargo.toml | 1 - rapier/physics.rs | 9 +++++---- 14 files changed, 16 insertions(+), 17 deletions(-) delete mode 160000 external/SPIRV-Tools diff --git a/external/GameNetworkingSockets b/external/GameNetworkingSockets index 517fff0..98d8d95 160000 --- a/external/GameNetworkingSockets +++ b/external/GameNetworkingSockets @@ -1 +1 @@ -Subproject commit 517fff0cf6866ba163f4f016b0ef28f365c06c05 +Subproject commit 98d8d95aa10133c6e44886d7501aaea82ee62ed9 diff --git a/external/SDL b/external/SDL index 1d08131..634dff3 160000 --- a/external/SDL +++ b/external/SDL @@ -1 +1 @@ -Subproject commit 1d081314a89eb6bfd22bbc0224b604533ae6156b +Subproject commit 634dff3725b8419902b832d1c84363da211a3596 diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers index 1f2dd16..1e770e7 160000 --- a/external/SPIRV-Headers +++ b/external/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 1f2dd1627ae782fa999b6ed86514c6a905438e3c +Subproject commit 1e770e7de8373a8dd49f23416cf7ca4001d01040 diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools deleted file mode 160000 index 0436c4b..0000000 --- a/external/SPIRV-Tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0436c4b0556fbfcff46610e888974965fd36be2a diff --git a/external/Vulkan-Headers b/external/Vulkan-Headers index 29184b9..015e25c 160000 --- a/external/Vulkan-Headers +++ b/external/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 29184b98984f6169a5e83e97557a77cff1e5b0ca +Subproject commit 015e25c3c91b70eb1a754d36fb14c4ba6ad9b0b9 diff --git a/external/Vulkan-Utility-Libraries b/external/Vulkan-Utility-Libraries index c15a1ac..8383c46 160000 --- a/external/Vulkan-Utility-Libraries +++ b/external/Vulkan-Utility-Libraries @@ -1 +1 @@ -Subproject commit c15a1ac31670cb2ce61c235f070fb40ec6e42612 +Subproject commit 8383c46b129c2b3a5f3833e602d946d2fcc57e39 diff --git a/external/VulkanMemoryAllocator b/external/VulkanMemoryAllocator index b3cbbb4..a1d4347 160000 --- a/external/VulkanMemoryAllocator +++ b/external/VulkanMemoryAllocator @@ -1 +1 @@ -Subproject commit b3cbbb43ea3a506dffe10759e205a41c27c35ae2 +Subproject commit a1d434708c217b2a6c7b365f1fe41fa03a562e59 diff --git a/external/funnystdlib b/external/funnystdlib index 4a2e606..6137a52 160000 --- a/external/funnystdlib +++ b/external/funnystdlib @@ -1 +1 @@ -Subproject commit 4a2e606e2bf37fb1e5da2bcc4ba1d7709eee4d08 +Subproject commit 6137a522ac41b5f87f379d38d6959052ff467c3a diff --git a/external/slang b/external/slang index f267cb7..4cfe59c 160000 --- a/external/slang +++ b/external/slang @@ -1 +1 @@ -Subproject commit f267cb77a09b0f4cf083a9585bc1ddb3744c310a +Subproject commit 4cfe59c88c5a232d501f3c2843ce1ee8e1f04dad diff --git a/external/stb b/external/stb index e6cd956..31c1ad3 160000 --- a/external/stb +++ b/external/stb @@ -1 +1 @@ -Subproject commit e6cd9561ea6dae43d41633797745789d142b691e +Subproject commit 31c1ad37456438565541f4919958214b6e762fb4 diff --git a/external/volk b/external/volk index e91ceff..47cddf7 160000 --- a/external/volk +++ b/external/volk @@ -1 +1 @@ -Subproject commit e91ceff7db05f92ac8b498c9631235a6a73566e2 +Subproject commit 47cddf7ed97b94118a08aacb548a411188e016cc diff --git a/external/xtool b/external/xtool index f12a84e..e49934c 160000 --- a/external/xtool +++ b/external/xtool @@ -1 +1 @@ -Subproject commit f12a84e960fa9bced1249a8d233ab8eafca28f6f +Subproject commit e49934c1fef9c8cf401399dfb17afd93e9e82f69 diff --git a/rapier/Cargo.toml b/rapier/Cargo.toml index 8d53fdc..5c475d6 100644 --- a/rapier/Cargo.toml +++ b/rapier/Cargo.toml @@ -10,5 +10,4 @@ path = "physics.rs" [dependencies] libc = "0.2.182" -parry3d = "*" rapier3d = { version = "*", features = [ "simd-stable", "parallel" ] } diff --git a/rapier/physics.rs b/rapier/physics.rs index bc514a6..25fd315 100644 --- a/rapier/physics.rs +++ b/rapier/physics.rs @@ -15,9 +15,10 @@ macro_rules! V_malloc { use std::{default, ops::Index, ptr::{self, null, null_mut}, slice::from_raw_parts, sync::Arc}; -use parry3d::{glamx::vec3, shape::{Shape, ShapeType, SharedShape}}; -use parry3d::{glamx::{Pose3A}, query::ShapeCastOptions}; -use rapier3d::{geometry::Ball, na::{UnitQuaternion, Vector4, coordinates::XYZ}}; +use rapier3d::glamx::*; +use rapier3d::parry::query::ShapeCastOptions; +use rapier3d::geometry::*; +use rapier3d::na::*; use rapier3d::prelude::*; use libc::{malloc, free}; use std::ffi::c_void; @@ -153,7 +154,7 @@ pub unsafe extern "C" fn CRapierPhysicsBody_SetRotation( this: *mut RapierPhysic { let world: &mut RapierWorld_t = &mut *(*this).m_pWorld; world.m_rigidBodies[(*this).m_hRigidBodyHandle] - .set_rotation(parry3d::glamx::Quat::from_xyzw(fX, fY, fZ, fW), true); + .set_rotation(glamx::Quat::from_xyzw(fX, fY, fZ, fW), true); }