ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few changes to ubode managed/umanaged interface

Browse Source
This commit is contained in:
UbitUmarov
2022-08-08 23:34:29 +01:00
parent 1b928c9fbd
commit 0f052f775d
4 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
View File

@@ -1014,8 +1014,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
y = tx * sin + y * cos;
}
internal bool Collide(IntPtr me, IntPtr other, bool reverse, ref SafeNativeMethods.ContactGeom contact,
ref SafeNativeMethods.ContactGeom altContact, ref bool useAltcontact, ref bool feetcollision)
internal bool Collide(IntPtr me, IntPtr other, bool reverse, ref SafeNativeMethods.ContactGeomClass contact,
ref SafeNativeMethods.ContactGeomClass altContact, ref bool useAltcontact, ref bool feetcollision)
{
feetcollision = false;
useAltcontact = false;
@@ -1094,7 +1094,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
IsColliding = true;
}
altContact = contact;
useAltcontact = true;
offset.Z -= 0.2f;
@@ -1115,6 +1114,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (tdp > 0.25f)
tdp = 0.25f;
altContact.pos = contact.pos;
//altContact.g1 = contact.g1;
//altContact.g2 = contact.g2;
//altContact.side1 = contact.side1;
//altContact.side2 = contact.side2;
altContact.depth = tdp;
if (reverse)