aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorKitto Flora2010-03-14 16:22:13 -0400
committerKitto Flora2010-03-14 16:22:13 -0400
commit819806261026cccd68dee649f11938ae5bf10029 (patch)
tree4e772b2c06f42ace9236223da704666900ccae3e /OpenSim/Region/Framework
parentFix Rotation Lock. NOTE: This version had poor border crossing control (diff)
downloadopensim-SC_OLD-819806261026cccd68dee649f11938ae5bf10029.zip
opensim-SC_OLD-819806261026cccd68dee649f11938ae5bf10029.tar.gz
opensim-SC_OLD-819806261026cccd68dee649f11938ae5bf10029.tar.bz2
opensim-SC_OLD-819806261026cccd68dee649f11938ae5bf10029.tar.xz
RotLookAt repaired; debug msg cleanup.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs35
2 files changed, 4 insertions, 35 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f35a7c5..5443c28 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1955,7 +1955,7 @@ namespace OpenSim.Region.Framework.Scenes
1955 else 1955 else
1956 { 1956 {
1957 if (rootpart.PhysActor != null) 1957 if (rootpart.PhysActor != null)
1958 { 1958 { // APID must be implemented in your physics system for this to function.
1959 rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W); 1959 rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
1960 rootpart.PhysActor.APIDStrength = strength; 1960 rootpart.PhysActor.APIDStrength = strength;
1961 rootpart.PhysActor.APIDDamping = damping; 1961 rootpart.PhysActor.APIDDamping = damping;
@@ -1971,7 +1971,7 @@ namespace OpenSim.Region.Framework.Scenes
1971 if (rootpart != null) 1971 if (rootpart != null)
1972 { 1972 {
1973 if (rootpart.PhysActor != null) 1973 if (rootpart.PhysActor != null)
1974 { 1974 { // APID must be implemented in your physics system for this to function.
1975 rootpart.PhysActor.APIDActive = false; 1975 rootpart.PhysActor.APIDActive = false;
1976 } 1976 }
1977 } 1977 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 31ea502..548a64f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2705,38 +2705,7 @@ namespace OpenSim.Region.Framework.Scenes
2705 2705
2706 public void RotLookAt(Quaternion target, float strength, float damping) 2706 public void RotLookAt(Quaternion target, float strength, float damping)
2707 { 2707 {
2708 rotLookAt(target, strength, damping); 2708 m_parentGroup.rotLookAt(target, strength, damping); // This calls method in SceneObjectGroup.
2709 }
2710
2711 public void rotLookAt(Quaternion target, float strength, float damping)
2712 {
2713 if (IsAttachment)
2714 {
2715 /*
2716 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
2717 if (avatar != null)
2718 {
2719 Rotate the Av?
2720 } */
2721 }
2722 else
2723 {
2724 APIDDamp = damping;
2725 APIDStrength = strength;
2726 APIDTarget = target;
2727 }
2728 }
2729
2730 public void startLookAt(Quaternion rot, float damp, float strength)
2731 {
2732 APIDDamp = damp;
2733 APIDStrength = strength;
2734 APIDTarget = rot;
2735 }
2736
2737 public void stopLookAt()
2738 {
2739 APIDTarget = Quaternion.Identity;
2740 } 2709 }
2741 2710
2742 /// <summary> 2711 /// <summary>
@@ -3460,7 +3429,7 @@ namespace OpenSim.Region.Framework.Scenes
3460 3429
3461 public void StopLookAt() 3430 public void StopLookAt()
3462 { 3431 {
3463 m_parentGroup.stopLookAt(); 3432 m_parentGroup.stopLookAt(); // This calls method in SceneObjectGroup.
3464 3433
3465 m_parentGroup.ScheduleGroupForTerseUpdate(); 3434 m_parentGroup.ScheduleGroupForTerseUpdate();
3466 } 3435 }