Add TestSetPhysics() to SOP status tests
parent
566327a948
commit
06552f217e
|
@ -1706,6 +1706,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// <param name="isNew"></param>
|
/// <param name="isNew"></param>
|
||||||
public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
|
public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
|
||||||
{
|
{
|
||||||
|
if (ParentGroup.Scene == null)
|
||||||
|
return;
|
||||||
|
|
||||||
if (!ParentGroup.Scene.PhysicalPrims && UsePhysics)
|
if (!ParentGroup.Scene.PhysicalPrims && UsePhysics)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -4161,7 +4164,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// For now, we use the NINJA naming scheme for identifying joints.
|
// For now, we use the NINJA naming scheme for identifying joints.
|
||||||
// In the future, we can support other joint specification schemes such as a
|
// In the future, we can support other joint specification schemes such as a
|
||||||
// custom checkbox in the viewer GUI.
|
// custom checkbox in the viewer GUI.
|
||||||
if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
|
if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
|
||||||
{
|
{
|
||||||
string hingeString = "hingejoint";
|
string hingeString = "hingejoint";
|
||||||
return (Name.Length >= hingeString.Length && Name.Substring(0, hingeString.Length) == hingeString);
|
return (Name.Length >= hingeString.Length && Name.Substring(0, hingeString.Length) == hingeString);
|
||||||
|
@ -4177,7 +4180,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// For now, we use the NINJA naming scheme for identifying joints.
|
// For now, we use the NINJA naming scheme for identifying joints.
|
||||||
// In the future, we can support other joint specification schemes such as a
|
// In the future, we can support other joint specification schemes such as a
|
||||||
// custom checkbox in the viewer GUI.
|
// custom checkbox in the viewer GUI.
|
||||||
if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
|
if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
|
||||||
{
|
{
|
||||||
string ballString = "balljoint";
|
string ballString = "balljoint";
|
||||||
return (Name.Length >= ballString.Length && Name.Substring(0, ballString.Length) == ballString);
|
return (Name.Length >= ballString.Length && Name.Substring(0, ballString.Length) == ballString);
|
||||||
|
@ -4193,7 +4196,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// For now, we use the NINJA naming scheme for identifying joints.
|
// For now, we use the NINJA naming scheme for identifying joints.
|
||||||
// In the future, we can support other joint specification schemes such as a
|
// In the future, we can support other joint specification schemes such as a
|
||||||
// custom checkbox in the viewer GUI.
|
// custom checkbox in the viewer GUI.
|
||||||
if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
|
if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
|
||||||
{
|
{
|
||||||
return IsHingeJoint() || IsBallJoint();
|
return IsHingeJoint() || IsBallJoint();
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,5 +62,25 @@ namespace OpenSim.Region.Framework.Scenes.Tests
|
||||||
|
|
||||||
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
|
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestSetPhysics()
|
||||||
|
{
|
||||||
|
TestHelpers.InMethod();
|
||||||
|
|
||||||
|
// Scene scene = SceneSetupHelpers.SetupScene();
|
||||||
|
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, UUID.Zero);
|
||||||
|
SceneObjectPart rootPart = so.RootPart;
|
||||||
|
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
|
||||||
|
|
||||||
|
so.ScriptSetPhysicsStatus(true);
|
||||||
|
|
||||||
|
// Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags);
|
||||||
|
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Physics));
|
||||||
|
|
||||||
|
so.ScriptSetPhysicsStatus(false);
|
||||||
|
|
||||||
|
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue