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

minor changes on updates control on doChangeObject(..)

avinationmerge
UbitUmarov 2012-03-11 02:55:39 +00:00
parent e4e6f781a6
commit dba0d79833
1 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3498,6 +3498,15 @@ namespace OpenSim.Region.Framework.Scenes
ScheduleGroupForFullUpdate(); ScheduleGroupForFullUpdate();
} }
private enum updatetype :int
{
none = 0,
partterse = 1,
partfull = 2,
groupterse = 3,
groupfull = 4
}
public void doChangeObject(SceneObjectPart part, ObjectChangeData data) public void doChangeObject(SceneObjectPart part, ObjectChangeData data)
{ {
// TODO this still as excessive ScheduleGroupForTerseUpdate()s // TODO this still as excessive ScheduleGroupForTerseUpdate()s
@ -3511,7 +3520,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = part.ParentGroup; SceneObjectGroup group = part.ParentGroup;
PhysicsActor pha = group.RootPart.PhysActor; PhysicsActor pha = group.RootPart.PhysActor;
bool needgrpUpdate = false; updatetype updateType = updatetype.none;
if (togroup) if (togroup)
{ {
@ -3519,15 +3528,21 @@ namespace OpenSim.Region.Framework.Scenes
if ((what & ObjectChangeWhat.Position) != 0) if ((what & ObjectChangeWhat.Position) != 0)
{ {
group.AbsolutePosition = data.position; group.AbsolutePosition = data.position;
needgrpUpdate = true; updateType = updatetype.groupterse;
} }
if ((what & ObjectChangeWhat.Rotation) != 0) if ((what & ObjectChangeWhat.Rotation) != 0)
{
group.RootPart.UpdateRotation(data.rotation); group.RootPart.UpdateRotation(data.rotation);
updateType = updatetype.none;
}
if ((what & ObjectChangeWhat.Scale) != 0) if ((what & ObjectChangeWhat.Scale) != 0)
{ {
if (pha != null) if (pha != null)
pha.Building = true; pha.Building = true;
group.GroupResize(data.scale); group.GroupResize(data.scale);
updateType = updatetype.none;
if (pha != null) if (pha != null)
pha.Building = false; pha.Building = false;
} }
@ -3547,30 +3562,53 @@ namespace OpenSim.Region.Framework.Scenes
group.UpdateRootPosition(data.position); group.UpdateRootPosition(data.position);
if ((what & ObjectChangeWhat.Rotation) != 0) if ((what & ObjectChangeWhat.Rotation) != 0)
group.UpdateRootRotation(data.rotation); group.UpdateRootRotation(data.rotation);
if ((what & ObjectChangeWhat.Scale) != 0)
part.Resize(data.scale);
} }
else else
{ {
if ((what & ObjectChangeWhat.Position) != 0) if ((what & ObjectChangeWhat.Position) != 0)
{ {
part.OffsetPosition = data.position; part.OffsetPosition = data.position;
needgrpUpdate = true; updateType = updatetype.partterse;
} }
if ((what & ObjectChangeWhat.Rotation) != 0) if ((what & ObjectChangeWhat.Rotation) != 0)
{
part.UpdateRotation(data.rotation); part.UpdateRotation(data.rotation);
updateType = updatetype.none;
}
if ((what & ObjectChangeWhat.Scale) != 0)
{
part.Resize(data.scale);
updateType = updatetype.none;
}
} }
if ((what & ObjectChangeWhat.Scale) != 0)
part.Resize(data.scale);
if (pha != null) if (pha != null)
pha.Building = false; pha.Building = false;
} }
if (needgrpUpdate) if (updateType != updatetype.none)
{ {
HasGroupChanged = true; group.HasGroupChanged = true;
ScheduleGroupForTerseUpdate();
switch (updateType)
{
case updatetype.partterse:
part.ScheduleTerseUpdate();
break;
case updatetype.partfull:
part.ScheduleFullUpdate();
break;
case updatetype.groupterse:
group.ScheduleGroupForTerseUpdate();
break;
case updatetype.groupfull:
group.ScheduleGroupForFullUpdate();
break;
default:
break;
}
} }
} }
} }