OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-12-11 05:49:52 +01:00
parent a1f0e3d95a 9a253c7c04
commit 377e6f44e7
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@ -71,6 +71,15 @@ namespace OpenSim.Region.Physics.Manager
RelativeSpeed = 0f; // for now let this one be set explicity
CharacterFeet = true; // keep other plugins work as before
}
public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth, bool feet)
{
Position = position;
SurfaceNormal = surfaceNormal;
PenetrationDepth = penetrationDepth;
RelativeSpeed = 0f; // for now let this one be set explicity
CharacterFeet = feet; // keep other plugins work as before
}
}
public struct ContactData

4
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -2521,7 +2521,7 @@ namespace OpenSim.Region.Physics.OdePlugin
prm.m_collisionCategories = m_collisionCategories;
prm.m_collisionFlags = m_collisionFlags;
if (prm.prim_geom != null)
if (prm.prim_geom != IntPtr.Zero)
{
if (prm.m_NoColide)
@ -2542,7 +2542,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// ((OdePrim)_parent).ChildSelectedChange(true);
if (prim_geom != null)
if (prim_geom != IntPtr.Zero)
{
if (m_NoColide)
{

1
OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
View File

@ -555,7 +555,6 @@ namespace OpenSim.Region.Physics.OdePlugin
break;
default:
return;
break;
}
}

2
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -515,7 +515,7 @@ namespace OpenSim.Region.Physics.OdePlugin
odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);
ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf);
GlobalContactsArray = GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
m_materialContactsData[(int)Material.Stone].mu = 0.8f;
m_materialContactsData[(int)Material.Stone].bounce = 0.4f;