aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2009-10-02 10:54:01 +1000
committerAdam Frisby2009-10-02 10:54:01 +1000
commita2cdbd784db2630d83546fcd9a41d2c8e2103408 (patch)
tree419af5c711a59add7ce64aa1c16b9d6001500f05
parent* Attempting to fix a issue with console commands & the estate module. Again. (diff)
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.zip
opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.gz
opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.bz2
opensim-SC_OLD-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs30
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs12
6 files changed, 28 insertions, 46 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 66f4da0..3809749 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule
68 68
69 public override void UpdateMovement() 69 public override void UpdateMovement()
70 { 70 {
71 UpdateGroupRotation(Rotation * m_rotationDirection); 71 UpdateGroupRotation(GroupRotation * m_rotationDirection);
72 72
73 base.UpdateMovement(); 73 base.UpdateMovement();
74 } 74 }
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 27a0785..c2ec6a5 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes
94 set { m_velocity = value; } 94 set { m_velocity = value; }
95 } 95 }
96 96
97 protected Quaternion m_rotation; 97 protected Quaternion m_rotation = new Quaternion(0f, 0f, 1f, 0f);
98 98
99 public virtual Quaternion Rotation 99 public virtual Quaternion Rotation
100 { 100 {
@@ -102,14 +102,6 @@ namespace OpenSim.Region.Framework.Scenes
102 set { m_rotation = value; } 102 set { m_rotation = value; }
103 } 103 }
104 104
105 protected Vector3 m_scale;
106
107 public virtual Vector3 Scale
108 {
109 get { return m_scale; }
110 set { m_scale = value; }
111 }
112
113 protected uint m_localId; 105 protected uint m_localId;
114 106
115 public virtual uint LocalId 107 public virtual uint LocalId
@@ -123,9 +115,13 @@ namespace OpenSim.Region.Framework.Scenes
123 /// </summary> 115 /// </summary>
124 public EntityBase() 116 public EntityBase()
125 { 117 {
126 m_rotation = Quaternion.Identity; 118 m_uuid = UUID.Zero;
127 m_scale = Vector3.One; 119
120 m_pos = Vector3.Zero;
121 m_velocity = Vector3.Zero;
122 Rotation = Quaternion.Identity;
128 m_name = "(basic entity)"; 123 m_name = "(basic entity)";
124 m_rotationalvelocity = Vector3.Zero;
129 } 125 }
130 126
131 /// <summary> 127 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0aa587e..05a6f13 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2305,8 +2305,8 @@ namespace OpenSim.Region.Framework.Scenes
2305 "to avatar {0} at position {1}", 2305 "to avatar {0} at position {1}",
2306 sp.UUID.ToString(), grp.AbsolutePosition); 2306 sp.UUID.ToString(), grp.AbsolutePosition);
2307 AttachObject(sp.ControllingClient, 2307 AttachObject(sp.ControllingClient,
2308 grp.LocalId, 0, 2308 grp.LocalId, (uint)0,
2309 grp.Rotation, 2309 grp.GroupRotation,
2310 grp.AbsolutePosition, false); 2310 grp.AbsolutePosition, false);
2311 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2311 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2312 grp.SendGroupFullUpdate(); 2312 grp.SendGroupFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6807e1b..25489d8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -204,22 +204,9 @@ namespace OpenSim.Region.Framework.Scenes
204 get { return m_parts.Count; } 204 get { return m_parts.Count; }
205 } 205 }
206 206
207 public override Quaternion Rotation 207 public Quaternion GroupRotation
208 { 208 {
209 get { return m_rootPart.RotationOffset; } 209 get { return m_rootPart.RotationOffset; }
210 set { m_rootPart.RotationOffset = value; }
211 }
212
213 public override Vector3 Scale
214 {
215 get { return m_rootPart.Scale; }
216 set { m_rootPart.Scale = value; }
217 }
218
219 public override Vector3 Velocity
220 {
221 get { return m_rootPart.Velocity; }
222 set { m_rootPart.Velocity = value; }
223 } 210 }
224 211
225 public UUID GroupID 212 public UUID GroupID
@@ -541,7 +528,7 @@ namespace OpenSim.Region.Framework.Scenes
541 // Temporary commented to stop compiler warning 528 // Temporary commented to stop compiler warning
542 //Vector3 partPosition = 529 //Vector3 partPosition =
543 // new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z); 530 // new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z);
544 Quaternion parentrotation = Rotation; 531 Quaternion parentrotation = GroupRotation;
545 532
546 // Telling the prim to raytrace. 533 // Telling the prim to raytrace.
547 //EntityIntersection inter = part.TestIntersection(hRay, parentrotation); 534 //EntityIntersection inter = part.TestIntersection(hRay, parentrotation);
@@ -1884,17 +1871,14 @@ namespace OpenSim.Region.Framework.Scenes
1884 1871
1885 checkAtTargets(); 1872 checkAtTargets();
1886 1873
1887 Quaternion rot = Rotation; 1874 if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
1888 1875 || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
1889 if (UsePhysics && 1876 || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1)
1890 ((Math.Abs(lastPhysGroupRot.W - rot.W) > 0.1f) 1877 || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1)))
1891 || (Math.Abs(lastPhysGroupRot.X - rot.X) > 0.1f)
1892 || (Math.Abs(lastPhysGroupRot.Y - rot.Y) > 0.1f)
1893 || (Math.Abs(lastPhysGroupRot.Z - rot.Z) > 0.1f)))
1894 { 1878 {
1895 m_rootPart.UpdateFlag = 1; 1879 m_rootPart.UpdateFlag = 1;
1896 1880
1897 lastPhysGroupRot = rot; 1881 lastPhysGroupRot = GroupRotation;
1898 } 1882 }
1899 1883
1900 foreach (SceneObjectPart part in m_parts.Values) 1884 foreach (SceneObjectPart part in m_parts.Values)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index bf83a49..0bd6546 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2007,10 +2007,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2007 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate 2007 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
2008 } 2008 }
2009 else 2009 else
2010 q = part.ParentGroup.Rotation; // Likely never get here but just in case 2010 q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
2011 } 2011 }
2012 else 2012 else
2013 q = part.ParentGroup.Rotation; // just the group rotation 2013 q = part.ParentGroup.GroupRotation; // just the group rotation
2014 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 2014 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2015 } 2015 }
2016 q = part.GetWorldRotation(); 2016 q = part.GetWorldRotation();
@@ -7181,10 +7181,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7181 else 7181 else
7182 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate 7182 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
7183 else 7183 else
7184 q = m_host.ParentGroup.Rotation; // Likely never get here but just in case 7184 q = m_host.ParentGroup.GroupRotation; // Likely never get here but just in case
7185 } 7185 }
7186 else 7186 else
7187 q = m_host.ParentGroup.Rotation; // just the group rotation 7187 q = m_host.ParentGroup.GroupRotation; // just the group rotation
7188 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 7188 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
7189 } 7189 }
7190 7190
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 84ccafe..4855d64 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -218,14 +218,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
218 } 218 }
219 } 219 }
220 220
221 Vector3 absPos = part.AbsolutePosition; 221 Position = new LSL_Types.Vector3(part.AbsolutePosition.X,
222 Position = new LSL_Types.Vector3(absPos.X, absPos.Y, absPos.Z); 222 part.AbsolutePosition.Y,
223 part.AbsolutePosition.Z);
223 224
224 Quaternion wr = part.ParentGroup.Rotation; 225 Quaternion wr = part.ParentGroup.GroupRotation;
225 Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); 226 Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W);
226 227
227 Vector3 vel = part.Velocity; 228 Velocity = new LSL_Types.Vector3(part.Velocity.X,
228 Velocity = new LSL_Types.Vector3(vel.X, vel.Y, vel.Z); 229 part.Velocity.Y,
230 part.Velocity.Z);
229 } 231 }
230 } 232 }
231 233