diff options
author | Justin Clark-Casey (justincc) | 2011-07-16 04:22:57 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-16 04:22:57 +0100 |
commit | 2b68ac4ba31205a55f53f1b69629dd9ebbd66ef6 (patch) | |
tree | 36c44de8244635be032a95d3a2a67f48e68a9b05 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | add test for resizing one part in a group (diff) | |
download | opensim-SC_OLD-2b68ac4ba31205a55f53f1b69629dd9ebbd66ef6.zip opensim-SC_OLD-2b68ac4ba31205a55f53f1b69629dd9ebbd66ef6.tar.gz opensim-SC_OLD-2b68ac4ba31205a55f53f1b69629dd9ebbd66ef6.tar.bz2 opensim-SC_OLD-2b68ac4ba31205a55f53f1b69629dd9ebbd66ef6.tar.xz |
refactor: Push all part resize code down into SceneObjectPart.Resize()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 7aa7831..477b3e3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2612,56 +2612,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2612 | #region Resize | 2612 | #region Resize |
2613 | 2613 | ||
2614 | /// <summary> | 2614 | /// <summary> |
2615 | /// Resize the given part | ||
2616 | /// </summary> | ||
2617 | /// <param name="scale"></param> | ||
2618 | /// <param name="localID"></param> | ||
2619 | public void Resize(Vector3 scale, uint localID) | ||
2620 | { | ||
2621 | if (scale.X > m_scene.m_maxNonphys) | ||
2622 | scale.X = m_scene.m_maxNonphys; | ||
2623 | if (scale.Y > m_scene.m_maxNonphys) | ||
2624 | scale.Y = m_scene.m_maxNonphys; | ||
2625 | if (scale.Z > m_scene.m_maxNonphys) | ||
2626 | scale.Z = m_scene.m_maxNonphys; | ||
2627 | |||
2628 | SceneObjectPart part = GetChildPart(localID); | ||
2629 | if (part != null) | ||
2630 | { | ||
2631 | part.Resize(scale); | ||
2632 | if (part.PhysActor != null) | ||
2633 | { | ||
2634 | if (part.PhysActor.IsPhysical) | ||
2635 | { | ||
2636 | if (scale.X > m_scene.m_maxPhys) | ||
2637 | scale.X = m_scene.m_maxPhys; | ||
2638 | if (scale.Y > m_scene.m_maxPhys) | ||
2639 | scale.Y = m_scene.m_maxPhys; | ||
2640 | if (scale.Z > m_scene.m_maxPhys) | ||
2641 | scale.Z = m_scene.m_maxPhys; | ||
2642 | } | ||
2643 | part.PhysActor.Size = scale; | ||
2644 | m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor); | ||
2645 | } | ||
2646 | //if (part.UUID != m_rootPart.UUID) | ||
2647 | |||
2648 | HasGroupChanged = true; | ||
2649 | part.TriggerScriptChangedEvent(Changed.SCALE); | ||
2650 | ScheduleGroupForFullUpdate(); | ||
2651 | |||
2652 | //if (part.UUID == m_rootPart.UUID) | ||
2653 | //{ | ||
2654 | //if (m_rootPart.PhysActor != null) | ||
2655 | //{ | ||
2656 | //m_rootPart.PhysActor.Size = | ||
2657 | //new PhysicsVector(m_rootPart.Scale.X, m_rootPart.Scale.Y, m_rootPart.Scale.Z); | ||
2658 | //m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | ||
2659 | //} | ||
2660 | //} | ||
2661 | } | ||
2662 | } | ||
2663 | |||
2664 | /// <summary> | ||
2665 | /// Resize the entire group of prims. | 2615 | /// Resize the entire group of prims. |
2666 | /// </summary> | 2616 | /// </summary> |
2667 | /// <param name="scale"></param> | 2617 | /// <param name="scale"></param> |