refactor common sop setup parts into a single method
parent
de88227bc4
commit
d5c7ae5c6b
|
@ -454,9 +454,7 @@ namespace OpenSim.Tests.Common.Setup
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static SceneObjectPart AddSceneObject(Scene scene, string name)
|
public static SceneObjectPart AddSceneObject(Scene scene, string name)
|
||||||
{
|
{
|
||||||
SceneObjectPart part
|
SceneObjectPart part = CreateSceneObjectPart(name, UUID.Random(), UUID.Zero);
|
||||||
= new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
|
|
||||||
part.Name = name;
|
|
||||||
|
|
||||||
//part.UpdatePrimFlags(false, false, true);
|
//part.UpdatePrimFlags(false, false, true);
|
||||||
//part.ObjectFlags |= (uint)PrimFlags.Phantom;
|
//part.ObjectFlags |= (uint)PrimFlags.Phantom;
|
||||||
|
@ -466,6 +464,20 @@ namespace OpenSim.Tests.Common.Setup
|
||||||
return part;
|
return part;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create a scene object part.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="name"></param>
|
||||||
|
/// <param name="id"></param>
|
||||||
|
/// <param name="ownerId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId)
|
||||||
|
{
|
||||||
|
return new SceneObjectPart(
|
||||||
|
ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
|
||||||
|
{ Name = name, UUID = id };
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a scene object but do not add it to the scene.
|
/// Create a scene object but do not add it to the scene.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -477,23 +489,17 @@ namespace OpenSim.Tests.Common.Setup
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
|
public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
|
||||||
{
|
{
|
||||||
SceneObjectPart rootPart
|
SceneObjectGroup sog
|
||||||
= new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
|
= new SceneObjectGroup(
|
||||||
{ Name = "part1", UUID = new UUID("00000000-0000-0000-0000-000000000001") };
|
CreateSceneObjectPart("part1", new UUID("00000000-0000-0000-0000-000000000001"), ownerId));
|
||||||
SceneObjectGroup sog = new SceneObjectGroup(rootPart);
|
|
||||||
|
|
||||||
if (parts > 1)
|
if (parts > 1)
|
||||||
{
|
|
||||||
for (int i = 2; i <= parts; i++)
|
for (int i = 2; i <= parts; i++)
|
||||||
{
|
|
||||||
sog.AddPart(
|
sog.AddPart(
|
||||||
new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
|
CreateSceneObjectPart(
|
||||||
{
|
string.Format("obj{0}", i),
|
||||||
Name = string.Format("obj{0}", i),
|
new UUID(string.Format("00000000-0000-0000-0000-{0:D12}", i)),
|
||||||
UUID = new UUID(string.Format("00000000-0000-0000-0000-{0:D12}", i))
|
ownerId));
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return sog;
|
return sog;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue