ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor, move OjectChangeData into it's own file and rename

Browse Source 
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
This commit is contained in:
Melanie
2012-03-13 13:08:32 +01:00
parent edc8a15487
commit ebcd4910a2
6 changed files with 133 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3521,9 +3521,9 @@ namespace OpenSim.Region.Framework.Scenes
if (part != null && part.ParentGroup != null)
{
ObjectChangeWhat what = data.what;
bool togroup = ((what & ObjectChangeWhat.Group) != 0);
// bool uniform = ((what & ObjectChangeWhat.UniformScale) != 0); not in use
ObjectChangeType change = data.change;
bool togroup = ((change & ObjectChangeType.Group) != 0);
// bool uniform = ((what & ObjectChangeType.UniformScale) != 0); not in use
SceneObjectGroup group = part.ParentGroup;
PhysicsActor pha = group.RootPart.PhysActor;
@@ -3533,17 +3533,17 @@ namespace OpenSim.Region.Framework.Scenes
if (togroup)
{
// related to group
if ((what & ObjectChangeWhat.Position) != 0)
if ((change & ObjectChangeType.Position) != 0)
{
group.AbsolutePosition = data.position;
updateType = updatetype.groupterse;
}
if ((what & ObjectChangeWhat.Rotation) != 0)
if ((change & ObjectChangeType.Rotation) != 0)
{
group.RootPart.UpdateRotation(data.rotation);
updateType = updatetype.none;
}
if ((what & ObjectChangeWhat.Scale) != 0)
if ((change & ObjectChangeType.Scale) != 0)
{
if (pha != null)
pha.Building = true;
@@ -3566,26 +3566,26 @@ namespace OpenSim.Region.Framework.Scenes
if (part == group.RootPart)
{
if ((what & ObjectChangeWhat.Position) != 0)
if ((change & ObjectChangeType.Position) != 0)
group.UpdateRootPosition(data.position);
if ((what & ObjectChangeWhat.Rotation) != 0)
if ((change & ObjectChangeType.Rotation) != 0)
group.UpdateRootRotation(data.rotation);
if ((what & ObjectChangeWhat.Scale) != 0)
if ((change & ObjectChangeType.Scale) != 0)
part.Resize(data.scale);
}
else
{
if ((what & ObjectChangeWhat.Position) != 0)
if ((change & ObjectChangeType.Position) != 0)
{
part.OffsetPosition = data.position;
updateType = updatetype.partterse;
}
if ((what & ObjectChangeWhat.Rotation) != 0)
if ((change & ObjectChangeType.Rotation) != 0)
{
part.UpdateRotation(data.rotation);
updateType = updatetype.none;
}
if ((what & ObjectChangeWhat.Scale) != 0)
if ((change & ObjectChangeType.Scale) != 0)
{
part.Resize(data.scale);
updateType = updatetype.none;