OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix axis rotation on sog bounding box

master
UbitUmarov 2020-02-14 19:34:32 +00:00
parent a42085f1a9
commit 55333a5171
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -331,9 +331,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
{ {
previousParentFolderID = item.Folder; previousParentFolderID = item.Folder;
item.Folder = destinationFolderID; item.Folder = destinationFolderID;
invService.MoveItems(item.Owner, new List<InventoryItemBase>() { item });
invService.DeleteItems(item.Owner, new List<UUID>() { item.ID }); client.SendInventoryItemCreateUpdate(item, 0);
scene.AddInventoryItem(client, item);
} }
} }
else else

23
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1551,7 +1551,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 offset = part.OffsetPosition; Vector3 offset = part.OffsetPosition;
scale = part.Scale * 0.5f; scale = part.Scale * 0.5f;
Matrix4 m = Matrix4.CreateFromQuaternion(part.RotationOffset); Matrix4 m = Matrix4.CreateFromQuaternion(Quaternion.Conjugate(part.RotationOffset));
Vector3 a = m.AtAxis; Vector3 a = m.AtAxis;
a.X = Math.Abs(a.X); a.X = Math.Abs(a.X);
a.Y = Math.Abs(a.Y); a.Y = Math.Abs(a.Y);
@ -1598,7 +1598,6 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Gets a vector representing the size of the bounding box containing all the prims in the group /// Gets a vector representing the size of the bounding box containing all the prims in the group
/// Treats all prims as rectangular, so no shape (cut etc) is taken into account /// Treats all prims as rectangular, so no shape (cut etc) is taken into account
/// offsetHeight is the offset in the Z axis from the centre of the bounding box to the centre of the root prim
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ) public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
@ -1619,7 +1618,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 offset = part.GetWorldPosition() - absPos; Vector3 offset = part.GetWorldPosition() - absPos;
Vector3 scale = part.Scale * 0.5f; Vector3 scale = part.Scale * 0.5f;
Matrix4 m = Matrix4.CreateFromQuaternion(part.GetWorldRotation()); Matrix4 m = Matrix4.CreateFromQuaternion(Quaternion.Conjugate(part.GetWorldRotation()));
Vector3 a = m.AtAxis; Vector3 a = m.AtAxis;
a.X = Math.Abs(a.X); a.X = Math.Abs(a.X);
a.Y = Math.Abs(a.Y); a.Y = Math.Abs(a.Y);
@ -1664,6 +1663,12 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
/// <summary>
/// Gets a vector representing the size of the bounding box containing all the prims in the group
/// Treats all prims as rectangular, so no shape (cut etc) is taken into account
/// offsetHeight is the offset in the Z axis from the centre of the bounding box to the centre of the root prim
/// </summary>
/// <returns></returns>
public Vector3 GetAxisAlignedBoundingBox(out float offsetHeight) public Vector3 GetAxisAlignedBoundingBox(out float offsetHeight)
{ {
float minX; float minX;
@ -1677,17 +1682,11 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 boundingBox = new Vector3(maxX - minX, maxY - minY, maxZ - minZ); Vector3 boundingBox = new Vector3(maxX - minX, maxY - minY, maxZ - minZ);
offsetHeight = 0; offsetHeight = 0;
float lower = (minZ * -1); float lower = -minZ;
if (lower > maxZ) if (lower > maxZ)
{ offsetHeight = lower - 0.5f * boundingBox.Z;
offsetHeight = lower - (boundingBox.Z / 2);
}
else if (maxZ > lower) else if (maxZ > lower)
{ offsetHeight = 0.5f * boundingBox.Z - maxZ;
offsetHeight = maxZ - (boundingBox.Z / 2);
offsetHeight *= -1;
}
// m_log.InfoFormat("BoundingBox is {0} , {1} , {2} ", boundingBox.X, boundingBox.Y, boundingBox.Z); // m_log.InfoFormat("BoundingBox is {0} , {1} , {2} ", boundingBox.X, boundingBox.Y, boundingBox.Z);
return boundingBox; return boundingBox;