Merge branch 'master' into careminster

avinationmerge
Melanie 2012-04-14 01:54:24 +01:00
commit 6602dee2fc
1 changed files with 30 additions and 5 deletions

View File

@ -44,22 +44,47 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[TestFixture] [TestFixture]
public class SceneObjectSpatialTests public class SceneObjectSpatialTests
{ {
TestScene m_scene;
UUID m_ownerId = TestHelpers.ParseTail(0x1);
[SetUp]
public void SetUp()
{
m_scene = SceneHelpers.SetupScene();
}
[Test]
public void TestGetSceneObjectGroupPosition()
{
TestHelpers.InMethod();
Vector3 position = new Vector3(10, 20, 30);
SceneObjectGroup so
= SceneHelpers.CreateSceneObject(1, m_ownerId, "obj1", 0x10);
so.AbsolutePosition = position;
m_scene.AddNewSceneObject(so, false);
Assert.That(so.AbsolutePosition, Is.EqualTo(position));
}
[Test] [Test]
public void TestGetRootPartPosition() public void TestGetRootPartPosition()
{ {
TestHelpers.InMethod(); TestHelpers.InMethod();
Scene scene = SceneHelpers.SetupScene();
UUID ownerId = TestHelpers.ParseTail(0x1);
Vector3 partPosition = new Vector3(10, 20, 30); Vector3 partPosition = new Vector3(10, 20, 30);
SceneObjectGroup so SceneObjectGroup so
= SceneHelpers.CreateSceneObject(1, ownerId, "obj1", 0x10); = SceneHelpers.CreateSceneObject(1, m_ownerId, "obj1", 0x10);
so.AbsolutePosition = partPosition; so.AbsolutePosition = partPosition;
scene.AddNewSceneObject(so, false); m_scene.AddNewSceneObject(so, false);
Assert.That(so.AbsolutePosition, Is.EqualTo(partPosition));
Assert.That(so.RootPart.AbsolutePosition, Is.EqualTo(partPosition)); Assert.That(so.RootPart.AbsolutePosition, Is.EqualTo(partPosition));
Assert.That(so.RootPart.GroupPosition, Is.EqualTo(partPosition));
Assert.That(so.RootPart.GetWorldPosition(), Is.EqualTo(partPosition));
Assert.That(so.RootPart.RelativePosition, Is.EqualTo(partPosition));
Assert.That(so.RootPart.OffsetPosition, Is.EqualTo(Vector3.Zero));
} }
} }
} }