changes in physics manager, needed for UbitODE
parent
815f3af1d7
commit
c75fa8b8a1
|
@ -68,6 +68,17 @@ namespace OpenSim.Region.Physics.Manager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public struct ContactData
|
||||||
|
{
|
||||||
|
public float mu;
|
||||||
|
public float bounce;
|
||||||
|
|
||||||
|
public ContactData(float _mu, float _bounce)
|
||||||
|
{
|
||||||
|
mu = _mu;
|
||||||
|
bounce = _bounce;
|
||||||
|
}
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Used to pass collision information to OnCollisionUpdate listeners.
|
/// Used to pass collision information to OnCollisionUpdate listeners.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -143,6 +154,14 @@ namespace OpenSim.Region.Physics.Manager
|
||||||
get { return new NullPhysicsActor(); }
|
get { return new NullPhysicsActor(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public virtual bool Building { get; set; }
|
||||||
|
|
||||||
|
public virtual ContactData ContactData
|
||||||
|
{
|
||||||
|
get { return new ContactData(0, 0); }
|
||||||
|
}
|
||||||
|
|
||||||
public abstract bool Stopped { get; }
|
public abstract bool Stopped { get; }
|
||||||
|
|
||||||
public abstract Vector3 Size { get; set; }
|
public abstract Vector3 Size { get; set; }
|
||||||
|
|
|
@ -225,7 +225,7 @@ namespace OpenSim.Region.Physics.Manager
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
|
public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
|
||||||
|
public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {}
|
||||||
public virtual void UnCombine(PhysicsScene pScene) {}
|
public virtual void UnCombine(PhysicsScene pScene) {}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -263,5 +263,13 @@ namespace OpenSim.Region.Physics.Manager
|
||||||
{
|
{
|
||||||
return new List<ContactResult>();
|
return new List<ContactResult>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){}
|
||||||
|
public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { }
|
||||||
|
public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count)
|
||||||
|
{
|
||||||
|
return new List<ContactResult>();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue