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

* ODE step two on the way to separate dynamic space allocation ( One more to go )

Browse Source
This commit is contained in:
Teravus Ovares
2007-11-16 08:53:37 +00:00
parent 9020ec5af9
commit b63076c303
3 changed files with 178 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@@ -806,6 +806,7 @@ namespace OpenSim.Region.Environment.Scenes
bool IsTemporary = false;
bool IsPhantom = false;
bool CastsShadows = false;
bool wasUsingPhysics = ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0);
//bool IsLocked = false;
int i = 0;
@@ -829,19 +830,24 @@ namespace OpenSim.Region.Environment.Scenes
if (UsePhysics )
{
AddFlag(LLObject.ObjectFlags.Physics);
if (PhysActor != null)
PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
if (!wasUsingPhysics)
{
doPhysicsPropertyUpdate(UsePhysics);
}
}
else
{
if (m_parentGroup.m_scene.m_physicalPrim)
RemFlag(LLObject.ObjectFlags.Physics);
if (wasUsingPhysics)
{
RemFlag(LLObject.ObjectFlags.Physics);
if (PhysActor != null)
PhysActor.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
doPhysicsPropertyUpdate(UsePhysics);
}
}
if (IsPhantom)
{
@@ -884,6 +890,35 @@ namespace OpenSim.Region.Environment.Scenes
// System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
ScheduleFullUpdate();
}
private void doPhysicsPropertyUpdate(bool UsePhysics)
{
if (PhysActor != null)
{
if (PhysActor.IsPhysical)
{
PhysActor.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
PhysActor.OnOutOfBounds -= PhysicsOutOfBounds;
}
m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor);
/// that's not wholesome. Had to make m_scene public
PhysActor = null;
PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape(
Name,
Shape,
new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
AbsolutePosition.Z),
new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
new Quaternion(RotationOffset.W, RotationOffset.X,
RotationOffset.Y, RotationOffset.Z), UsePhysics);
if (UsePhysics)
{
PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
}
}
}
public void UpdateExtraParam(ushort type, bool inUse, byte[] data)
{
@@ -1130,6 +1165,13 @@ namespace OpenSim.Region.Environment.Scenes
}
#endregion
public void PhysicsOutOfBounds(PhysicsVector pos)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds.");
doPhysicsPropertyUpdate(false);
ScheduleFullUpdate();
}
public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient)
{