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

Rotation undo fix and remove a debug chatter i missed. Still not working: Individual child prim rotational undo and special cases where the root prim was moved or rotated (all the children then need to restore their offsets). Coming shortly.

avinationmerge
Tom Grimshaw 2010-07-04 19:58:52 -07:00
parent 5b68343361
commit c616335019
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/UndoState.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes
//FUBAR WARNING: Do NOT get the group's absoluteposition here //FUBAR WARNING: Do NOT get the group's absoluteposition here
//or you'll experience a loop and/or a stack issue //or you'll experience a loop and/or a stack issue
GroupPosition = part.ParentGroup.RootPart.AbsolutePosition; GroupPosition = part.ParentGroup.RootPart.AbsolutePosition;
GroupRotation = part.ParentGroup.Rotation; GroupRotation = part.ParentGroup.GroupRotation;
Position = part.ParentGroup.RootPart.AbsolutePosition; Position = part.ParentGroup.RootPart.AbsolutePosition;
Rotation = part.RotationOffset; Rotation = part.RotationOffset;
Scale = part.Shape.Scale; Scale = part.Shape.Scale;
@ -98,7 +98,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
if ((Type & UndoType.STATE_GROUP_SCALE) == 0 || ((last.Type & UndoType.STATE_GROUP_SCALE) >= (Type & UndoType.STATE_GROUP_SCALE))) if ((Type & UndoType.STATE_GROUP_SCALE) == 0 || ((last.Type & UndoType.STATE_GROUP_SCALE) >= (Type & UndoType.STATE_GROUP_SCALE)))
{ {
Console.WriteLine("Setting groupscale to " + last.GroupScale.ToString());
GroupScale = last.GroupScale; GroupScale = last.GroupScale;
Scale = last.Scale; Scale = last.Scale;
} }
@ -184,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
if (GroupChange) if (GroupChange)
{ {
part.ParentGroup.RootPart.Undoing = true; part.ParentGroup.RootPart.Undoing = true;
if (Position != Vector3.Zero) if (GroupPosition != Vector3.Zero)
{ {
//Calculate the scale... //Calculate the scale...
Vector3 gs = part.Shape.Scale; Vector3 gs = part.Shape.Scale;
@ -193,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
//Scale first since it can affect our position //Scale first since it can affect our position
part.ParentGroup.GroupResize(gs * scale, part.LocalId); part.ParentGroup.GroupResize(gs * scale, part.LocalId);
part.ParentGroup.AbsolutePosition = GroupPosition; part.ParentGroup.AbsolutePosition = GroupPosition;
part.ParentGroup.Rotation = GroupRotation; part.ParentGroup.UpdateGroupRotationR(GroupRotation);
} }
part.ParentGroup.RootPart.Undoing = false; part.ParentGroup.RootPart.Undoing = false;