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

"rotate scene" command now uses Constants.RegionSize / 2 to pick the center of rotation and center can be optionally overridden in the command line

master-beforevarregion
dahlia 2013-11-26 21:07:37 -08:00
parent 5a9ec0748b
commit e52a8d388f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Application/OpenSim.cs
View File

@ -512,9 +512,12 @@ namespace OpenSim
private void HandleRotateScene(string module, string[] args) private void HandleRotateScene(string module, string[] args)
{ {
string usage = "Usage: rotate scene <angle in degrees>"; string usage = "Usage: rotate scene <angle in degrees> [centerX centerY] (centerX and centerY are optional and default to Constants.RegionSize / 2";
if (args.Length != 3) float centerX = Constants.RegionSize * 0.5f;
float centerY = Constants.RegionSize * 0.5f;
if (args.Length < 3 || args.Length == 4)
{ {
MainConsole.Instance.Output(usage); MainConsole.Instance.Output(usage);
return; return;
@ -523,6 +526,14 @@ namespace OpenSim
float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI); float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle); OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
if (args.Length > 4)
{
centerX = Convert.ToSingle(args[3]);
centerY = Convert.ToSingle(args[4]);
}
Vector3 center = new Vector3(centerX, centerY, 0.0f);
SceneManager.ForEachSelectedScene(delegate(Scene scene) SceneManager.ForEachSelectedScene(delegate(Scene scene)
{ {
scene.ForEachSOG(delegate(SceneObjectGroup sog) scene.ForEachSOG(delegate(SceneObjectGroup sog)
@ -530,9 +541,9 @@ namespace OpenSim
if (sog.AttachmentPoint == 0) if (sog.AttachmentPoint == 0)
{ {
sog.RootPart.UpdateRotation(rot * sog.GroupRotation); sog.RootPart.UpdateRotation(rot * sog.GroupRotation);
Vector3 offset = sog.AbsolutePosition - new Vector3(128.0f, 128.0f, 0.0f); Vector3 offset = sog.AbsolutePosition - center;
offset *= rot; offset *= rot;
sog.UpdateGroupPosition(new Vector3(128.0f, 128.0f, 0.0f) + offset); sog.UpdateGroupPosition(center + offset);
} }
}); });
}); });