From e74bf4600759c3fee6aa62ee808bbf214c019b6d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 23 Feb 2012 23:18:01 +0100
Subject: Prevent a nullref when nonphysical motion objects cross sim
boundaries
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index cf8637f..248d4c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -582,7 +582,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (ScenePresence av in m_linkedAvatars)
{
SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
- if (m_parts.TryGetValue(p.UUID, out p))
+ if (p != null && m_parts.TryGetValue(p.UUID, out p))
{
Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
av.AbsolutePosition += offset;
--
cgit v1.1
From 991826ca76a80f8a1e03ce63d759185fddd5da4f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 24 Feb 2012 19:31:27 +0100
Subject: Try not to send the avatar updates on login. This may mean loggin in
with invisible attachments again but could help the appearance issues.
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 26fa6c0..01053bf 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1000,7 +1000,8 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- SendAvatarDataToAllAgents();
+ if (wasChild)
+ SendAvatarDataToAllAgents();
// send the animations of the other presences to me
m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
--
cgit v1.1
From 5eb1679367754d530edb4c50d432847ed1a027af Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 25 Feb 2012 12:25:16 +0100
Subject: Delay the sending of the initial werables update until the inventory
and VFS in the viewer are ready. We're much faster than SL and that exposes
this race condition. Also reinstate the extra avatar data send on login
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 01053bf..26fa6c0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1000,8 +1000,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- if (wasChild)
- SendAvatarDataToAllAgents();
+ SendAvatarDataToAllAgents();
// send the animations of the other presences to me
m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
--
cgit v1.1
From e07440d0c53fdc8e90f4887242e3b21049a729c0 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 25 Feb 2012 22:20:25 +0000
Subject: changed SOP Force and Torque, adding XML (de/)serialization, also
changed Buoyance. PLEASE trap deserialization from inventory etc, making
force and torque vector3.Zero, unless we want then to rez moving. (needs
checking/testing as usual)
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 23 +-----
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 93 +++++++++++++++++++---
.../Scenes/Serialization/SceneObjectSerializer.cs | 17 +++-
3 files changed, 98 insertions(+), 35 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 248d4c6..e9021f1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2045,30 +2045,9 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public void setAngularImpulse(Vector3 impulse)
- {
- if (RootPart.PhysActor != null)
- {
- if (!IsAttachment)
- {
- RootPart.PhysActor.Torque = impulse;
- m_scene.PhysicsScene.AddPhysicsActorTaint(RootPart.PhysActor);
- }
- }
- }
-
public Vector3 GetTorque()
{
- if (RootPart.PhysActor != null)
- {
- if (!IsAttachment)
- {
- Vector3 torque = RootPart.PhysActor.Torque;
- return torque;
- }
- }
-
- return Vector3.Zero;
+ return RootPart.Torque;
}
// This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dd9431b..f35a27e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -294,6 +294,8 @@ namespace OpenSim.Region.Framework.Scenes
protected Vector3 m_lastAngularVelocity;
protected int m_lastTerseSent;
protected float m_buoyancy = 0.0f;
+ protected Vector3 m_force;
+ protected Vector3 m_torque;
///
/// Stores media texture data
@@ -1302,14 +1304,66 @@ namespace OpenSim.Region.Framework.Scenes
public float Buoyancy
{
- get { return m_buoyancy; }
+ get
+ {
+ if (ParentID != 0 && ParentGroup != null)
+ m_buoyancy = ParentGroup.RootPart.Buoyancy;
+ return m_buoyancy;
+ }
set
{
m_buoyancy = value;
- if (PhysActor != null)
+ if (ParentID != 0)
{
+ if (ParentGroup != null)
+ ParentGroup.RootPart.Buoyancy = value;
+ }
+ else if (PhysActor != null)
PhysActor.Buoyancy = value;
+ }
+ }
+
+ public Vector3 Force
+ {
+ get
+ {
+ if (ParentID != 0 && ParentGroup != null)
+ m_force = ParentGroup.RootPart.Force;
+ return m_force;
+ }
+
+ set
+ {
+ m_force = value;
+ if (ParentID != 0)
+ {
+ if (ParentGroup != null)
+ ParentGroup.RootPart.Force = value;
}
+ else if (PhysActor != null)
+ PhysActor.Force = value;
+ }
+ }
+
+ public Vector3 Torque
+ {
+ get
+ {
+ if (ParentID != 0 && ParentGroup != null)
+ m_torque = ParentGroup.RootPart.Torque;
+ return m_torque;
+ }
+
+ set
+ {
+ m_torque = value;
+ if (ParentID != 0)
+ {
+ if (ParentGroup != null)
+ ParentGroup.RootPart.Torque = value;
+ }
+ else if (PhysActor != null)
+ PhysActor.Torque = value;
}
}
@@ -1488,20 +1542,24 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Vector force
/// true for the local frame, false for the global frame
- public void SetAngularImpulse(Vector3 impulsei, bool localGlobalTF)
+
+ // this is actualy Set Torque.. keeping naming so not to edit lslapi also
+ public void SetAngularImpulse(Vector3 torquei, bool localGlobalTF)
{
- Vector3 impulse = impulsei;
+ Vector3 torque = torquei;
if (localGlobalTF)
{
+/*
Quaternion grot = GetWorldRotation();
Quaternion AXgrot = grot;
Vector3 AXimpulsei = impulsei;
Vector3 newimpulse = AXimpulsei * AXgrot;
- impulse = newimpulse;
+ */
+ torque *= GetWorldRotation();
}
- ParentGroup.setAngularImpulse(impulse);
+ Torque = torque;
}
///
@@ -1571,14 +1629,22 @@ namespace OpenSim.Region.Framework.Scenes
DoPhysicsPropertyUpdate(RigidBody, true);
PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
+
+ if (!building)
+ PhysActor.Building = false;
Velocity = velocity;
AngularVelocity = rotationalVelocity;
PhysActor.Velocity = velocity;
PhysActor.RotationalVelocity = rotationalVelocity;
- if (!building)
- PhysActor.Building = false;
+ // if not vehicle and root part apply force and torque
+ if ((m_vehicle == null || m_vehicle.Type == Vehicle.TYPE_NONE)
+ && LocalId == ParentGroup.RootPart.LocalId)
+ {
+ PhysActor.Force = Force;
+ PhysActor.Torque = Torque;
+ }
}
}
}
@@ -2002,10 +2068,7 @@ namespace OpenSim.Region.Framework.Scenes
public Vector3 GetForce()
{
- if (PhysActor != null)
- return PhysActor.Force;
- else
- return Vector3.Zero;
+ return Force;
}
///
@@ -3150,10 +3213,13 @@ namespace OpenSim.Region.Framework.Scenes
public void SetBuoyancy(float fvalue)
{
+ Buoyancy = fvalue;
+/*
if (PhysActor != null)
{
PhysActor.Buoyancy = fvalue;
}
+ */
}
public void SetDieAtEdge(bool p)
@@ -3181,10 +3247,13 @@ namespace OpenSim.Region.Framework.Scenes
public void SetForce(Vector3 force)
{
+ Force = force;
+/*
if (PhysActor != null)
{
PhysActor.Force = force;
}
+ */
}
public SOPVehicle sopVehicle
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 72a0ec3..ed761da 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -349,6 +349,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4);
m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
+ m_SOPXmlProcessors.Add("Force", ProcessForce);
+ m_SOPXmlProcessors.Add("Torque", ProcessTorque);
m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive);
//Ubit comented until proper testing
@@ -762,7 +764,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader)
{
- obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
+ obj.Buoyancy = (float)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
+ }
+
+ private static void ProcessForce(SceneObjectPart obj, XmlTextReader reader)
+ {
+ obj.Force = Util.ReadVector(reader, "Force");
+ }
+ private static void ProcessTorque(SceneObjectPart obj, XmlTextReader reader)
+ {
+ obj.Torque = Util.ReadVector(reader, "Torque");
}
private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader)
@@ -1256,6 +1267,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
+
+ WriteVector(writer, "Force", sop.Force);
+ WriteVector(writer, "Torque", sop.Torque);
+
writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower());
//Ubit comented until proper testing
--
cgit v1.1
From c82709c0d6c72852d8614651f9cb31df09fff883 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 02:36:34 +0100
Subject: Implement llSetKeyframedMotion. No persistence, no region crossing.
Yet.
---
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 315 +++++++++++++++++++++
.../Region/Framework/Scenes/SceneObjectGroup.cs | 12 +
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 +
3 files changed, 330 insertions(+)
create mode 100644 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
new file mode 100644
index 0000000..239f7ca
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -0,0 +1,315 @@
+// Proprietary code of Avination Virtual Limited
+// (c) 2012 Melanie Thielker
+//
+
+using System;
+using System.Timers;
+using System.Collections.Generic;
+using System.IO;
+using System.Diagnostics;
+using System.Reflection;
+using System.Threading;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Framework.Scenes.Serialization;
+using Timer = System.Timers.Timer;
+using log4net;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+ public class KeyframeMotion
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ public enum PlayMode : int
+ {
+ Forward = 0,
+ Reverse = 1,
+ Loop = 2,
+ PingPong = 3
+ };
+
+ [Flags]
+ public enum DataFormat : int
+ {
+ Translation = 1,
+ Rotation = 2
+ }
+
+ public struct Keyframe
+ {
+ public Vector3? Position;
+ public Quaternion? Rotation;
+ public Quaternion StartRotation;
+ public int TimeMS;
+ public int TimeTotal;
+ public Vector3 AngularVelocity;
+ };
+
+ private Vector3 m_basePosition;
+ private Quaternion m_baseRotation;
+
+ private Keyframe m_currentFrame;
+ private List m_frames = new List();
+
+ private Keyframe[] m_keyframes;
+
+ private Timer m_timer = new Timer();
+
+ private readonly SceneObjectGroup m_group;
+
+ private PlayMode m_mode = PlayMode.Forward;
+ private DataFormat m_data = DataFormat.Translation | DataFormat.Rotation;
+
+ private int m_iterations = 0;
+
+ private const double timerInterval = 50.0;
+
+ public DataFormat Data
+ {
+ get { return m_data; }
+ }
+
+ public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data)
+ {
+ m_mode = mode;
+ m_data = data;
+
+ m_group = grp;
+ m_basePosition = grp.AbsolutePosition;
+ m_baseRotation = grp.GroupRotation;
+
+ m_timer.Interval = (int)timerInterval;
+ m_timer.AutoReset = true;
+ m_timer.Elapsed += OnTimer;
+ }
+
+ public void SetKeyframes(Keyframe[] frames)
+ {
+ m_keyframes = frames;
+ }
+
+ public void Start()
+ {
+ if (m_keyframes.Length > 0)
+ m_timer.Start();
+ }
+
+ public void Stop()
+ {
+ m_timer.Stop();
+
+ m_basePosition = m_group.AbsolutePosition;
+ m_baseRotation = m_group.GroupRotation;
+
+ m_group.RootPart.Velocity = Vector3.Zero;
+ m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
+ m_group.SendGroupRootTerseUpdate();
+
+ m_frames.Clear();
+ }
+
+ public void Pause()
+ {
+ m_group.RootPart.Velocity = Vector3.Zero;
+ m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
+ m_group.SendGroupRootTerseUpdate();
+
+ m_timer.Stop();
+ }
+
+ private void GetNextList()
+ {
+ m_frames.Clear();
+ Vector3 pos = m_basePosition;
+ Quaternion rot = m_baseRotation;
+
+ if (m_mode == PlayMode.Loop || m_mode == PlayMode.PingPong || m_iterations == 0)
+ {
+ int direction = 1;
+ if (m_mode == PlayMode.Reverse || ((m_mode == PlayMode.PingPong) && ((m_iterations & 1) != 0)))
+ direction = -1;
+
+ int start = 0;
+ int end = m_keyframes.Length;
+// if (m_mode == PlayMode.PingPong && m_keyframes.Length > 1)
+// end = m_keyframes.Length - 1;
+
+ if (direction < 0)
+ {
+ start = m_keyframes.Length - 1;
+ end = -1;
+// if (m_mode == PlayMode.PingPong && m_keyframes.Length > 1)
+// end = 0;
+ }
+
+ for (int i = start; i != end ; i += direction)
+ {
+ Keyframe k = m_keyframes[i];
+
+ if (k.Position.HasValue)
+ k.Position = (k.Position * direction) + pos;
+ else
+ k.Position = pos;
+
+ k.StartRotation = rot;
+ if (k.Rotation.HasValue)
+ {
+ if (direction == -1)
+ k.Rotation = Quaternion.Conjugate((Quaternion)k.Rotation);
+ k.Rotation = rot * k.Rotation;
+ }
+ else
+ {
+ k.Rotation = rot;
+ }
+
+ float angle = 0;
+
+ float aa = k.StartRotation.X * k.StartRotation.X + k.StartRotation.Y * k.StartRotation.Y + k.StartRotation.Z * k.StartRotation.Z + k.StartRotation.W * k.StartRotation.W;
+ float bb = ((Quaternion)k.Rotation).X * ((Quaternion)k.Rotation).X + ((Quaternion)k.Rotation).Y * ((Quaternion)k.Rotation).Y + ((Quaternion)k.Rotation).Z * ((Quaternion)k.Rotation).Z + ((Quaternion)k.Rotation).W * ((Quaternion)k.Rotation).W;
+ float aa_bb = aa * bb;
+
+ if (aa_bb == 0)
+ {
+ angle = 0;
+ }
+ else
+ {
+ float ab = k.StartRotation.X * ((Quaternion)k.Rotation).X +
+ k.StartRotation.Y * ((Quaternion)k.Rotation).Y +
+ k.StartRotation.Z * ((Quaternion)k.Rotation).Z +
+ k.StartRotation.W * ((Quaternion)k.Rotation).W;
+ float q = (ab * ab) / aa_bb;
+
+ if (q > 1.0f)
+ {
+ angle = 0;
+ }
+ else
+ {
+ angle = (float)Math.Acos(2 * q - 1);
+ }
+ }
+
+ m_log.DebugFormat("[KEYFRAME]: Angle {0} aabb {1}", angle, aa_bb);
+ k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000));
+ k.TimeTotal = k.TimeMS;
+
+ m_frames.Add(k);
+
+ pos = (Vector3)k.Position;
+ rot = (Quaternion)k.Rotation;
+ }
+
+ m_basePosition = pos;
+ m_baseRotation = rot;
+
+ m_iterations++;
+ }
+ }
+
+ private void OnTimer(object sender, ElapsedEventArgs e)
+ {
+ if (m_frames.Count == 0)
+ {
+ GetNextList();
+
+ if (m_frames.Count == 0)
+ {
+ Stop();
+ return;
+ }
+
+ m_currentFrame = m_frames[0];
+ }
+
+ // Do the frame processing
+ double steps = (double)m_currentFrame.TimeMS / timerInterval;
+ float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
+
+ if (steps <= 1.0)
+ {
+ m_currentFrame.TimeMS = 0;
+
+ m_group.AbsolutePosition = (Vector3)m_currentFrame.Position;
+ m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
+ }
+ else
+ {
+ Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
+ Vector3 motionThisFrame = v / (float)steps;
+ v = v * 1000 / m_currentFrame.TimeMS;
+
+ bool update = false;
+
+ if (Vector3.Mag(motionThisFrame) >= 0.05f)
+ {
+ m_group.AbsolutePosition += motionThisFrame;
+ m_group.RootPart.Velocity = v;
+ update = true;
+ }
+
+ if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation)
+ {
+ Quaternion current = m_group.GroupRotation;
+
+ Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete);
+
+ float angle = 0;
+
+ float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W;
+ float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W;
+ float aa_bb = aa * bb;
+
+ if (aa_bb == 0)
+ {
+ angle = 0;
+ }
+ else
+ {
+ float ab = current.X * step.X +
+ current.Y * step.Y +
+ current.Z * step.Z +
+ current.W * step.W;
+ float q = (ab * ab) / aa_bb;
+
+ if (q > 1.0f)
+ {
+ angle = 0;
+ }
+ else
+ {
+ angle = (float)Math.Acos(2 * q - 1);
+ }
+ }
+
+ if (angle > 0.01f)
+ {
+ m_group.UpdateGroupRotationR(step);
+ //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
+ update = true;
+ }
+ }
+
+ if (update)
+ m_group.SendGroupRootTerseUpdate();
+ }
+
+ m_currentFrame.TimeMS -= (int)timerInterval;
+
+ if (m_currentFrame.TimeMS <= 0)
+ {
+ m_group.RootPart.Velocity = Vector3.Zero;
+ m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
+ m_group.SendGroupRootTerseUpdate();
+
+ m_frames.RemoveAt(0);
+ if (m_frames.Count > 0)
+ m_currentFrame = m_frames[0];
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 248d4c6..5ccea13 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -114,6 +114,12 @@ namespace OpenSim.Region.Framework.Scenes
private Random m_rand;
private bool m_suspendUpdates;
private List m_linkedAvatars = new List();
+ private KeyframeMotion m_keyframeMotion = null;
+
+ public KeyframeMotion KeyframeMotion
+ {
+ get; set;
+ }
public bool areUpdatesSuspended
{
@@ -1982,6 +1988,12 @@ namespace OpenSim.Region.Framework.Scenes
public void ScriptSetPhysicsStatus(bool usePhysics)
{
+ if (usePhysics)
+ {
+ if (KeyframeMotion != null)
+ KeyframeMotion.Stop();
+ KeyframeMotion = null;
+ }
UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dd9431b..b6d5c4b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1855,6 +1855,9 @@ namespace OpenSim.Region.Framework.Scenes
{
if (UsePhysics)
{
+ if (ParentGroup.KeyframeMotion != null)
+ ParentGroup.KeyframeMotion.Stop();
+ ParentGroup.KeyframeMotion = null;
ParentGroup.Scene.AddPhysicalPrim(1);
PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
--
cgit v1.1
From aa552d0526349f0db6911dbd867c847cf4e810f6 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 12:29:35 +0100
Subject: Serialize Keyframe motion for region crossings
---
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 71 +++++++++++++++++++++-
OpenSim/Region/Framework/Scenes/Scene.cs | 2 +
.../Region/Framework/Scenes/SceneObjectGroup.cs | 5 ++
.../Scenes/Serialization/SceneObjectSerializer.cs | 22 ++++++-
4 files changed, 96 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 239f7ca..73db25b 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -4,6 +4,7 @@
using System;
using System.Timers;
+using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Diagnostics;
@@ -14,11 +15,14 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.Framework.Scenes.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization;
using Timer = System.Timers.Timer;
using log4net;
namespace OpenSim.Region.Framework.Scenes
{
+ [Serializable]
public class KeyframeMotion
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -38,6 +42,7 @@ namespace OpenSim.Region.Framework.Scenes
Rotation = 2
}
+ [Serializable]
public struct Keyframe
{
public Vector3? Position;
@@ -50,19 +55,24 @@ namespace OpenSim.Region.Framework.Scenes
private Vector3 m_basePosition;
private Quaternion m_baseRotation;
+ private Vector3 m_serializedPosition;
private Keyframe m_currentFrame;
private List m_frames = new List();
private Keyframe[] m_keyframes;
- private Timer m_timer = new Timer();
+ [NonSerialized()]
+ protected Timer m_timer = new Timer();
- private readonly SceneObjectGroup m_group;
+ [NonSerialized()]
+ private SceneObjectGroup m_group;
private PlayMode m_mode = PlayMode.Forward;
private DataFormat m_data = DataFormat.Translation | DataFormat.Rotation;
+ private bool m_running = false;
+
private int m_iterations = 0;
private const double timerInterval = 50.0;
@@ -72,6 +82,41 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_data; }
}
+ public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data)
+ {
+ MemoryStream ms = new MemoryStream(data);
+
+ BinaryFormatter fmt = new BinaryFormatter();
+
+ KeyframeMotion newMotion = (KeyframeMotion)fmt.Deserialize(ms);
+
+ // This will be started when position is updated
+ newMotion.m_timer = new Timer();
+ newMotion.m_timer.Interval = (int)timerInterval;
+ newMotion.m_timer.AutoReset = true;
+ newMotion.m_timer.Elapsed += newMotion.OnTimer;
+
+ return newMotion;
+ }
+
+ public void UpdateSceneObject(SceneObjectGroup grp)
+ {
+ m_group = grp;
+ Vector3 offset = grp.AbsolutePosition - m_serializedPosition;
+
+ m_basePosition += offset;
+ m_currentFrame.Position += offset;
+ for (int i = 0 ; i < m_frames.Count ; i++)
+ {
+ Keyframe k = m_frames[i];
+ k.Position += offset;
+ m_frames[i] = k;
+ }
+
+ if (m_running)
+ Start();
+ }
+
public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data)
{
m_mode = mode;
@@ -95,10 +140,14 @@ namespace OpenSim.Region.Framework.Scenes
{
if (m_keyframes.Length > 0)
m_timer.Start();
+ m_running = true;
}
public void Stop()
{
+ // Failed object creation
+ if (m_timer == null)
+ return;
m_timer.Stop();
m_basePosition = m_group.AbsolutePosition;
@@ -109,6 +158,7 @@ namespace OpenSim.Region.Framework.Scenes
m_group.SendGroupRootTerseUpdate();
m_frames.Clear();
+ m_running = false;
}
public void Pause()
@@ -118,6 +168,7 @@ namespace OpenSim.Region.Framework.Scenes
m_group.SendGroupRootTerseUpdate();
m_timer.Stop();
+ m_running = false;
}
private void GetNextList()
@@ -211,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- private void OnTimer(object sender, ElapsedEventArgs e)
+ protected void OnTimer(object sender, ElapsedEventArgs e)
{
if (m_frames.Count == 0)
{
@@ -311,5 +362,19 @@ namespace OpenSim.Region.Framework.Scenes
m_currentFrame = m_frames[0];
}
}
+
+ public Byte[] Serialize()
+ {
+ MemoryStream ms = new MemoryStream();
+ m_timer.Stop();
+
+ BinaryFormatter fmt = new BinaryFormatter();
+ SceneObjectGroup tmp = m_group;
+ m_group = null;
+ m_serializedPosition = tmp.AbsolutePosition;
+ fmt.Serialize(ms, this);
+ m_group = tmp;
+ return ms.ToArray();
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fcbed9f..c20da4b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2421,6 +2421,8 @@ namespace OpenSim.Region.Framework.Scenes
if (newPosition != Vector3.Zero)
newObject.RootPart.GroupPosition = newPosition;
+ if (newObject.KeyframeMotion != null)
+ newObject.KeyframeMotion.UpdateSceneObject(newObject);
if (!AddSceneObject(newObject))
{
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9898681..d488189 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1823,6 +1823,11 @@ namespace OpenSim.Region.Framework.Scenes
// Name, UUID, m_scene.RegionInfo.RegionName);
SceneObjectGroup backup_group = Copy(false);
+ if (KeyframeMotion != null)
+ {
+ backup_group.KeyframeMotion = KeyframeMotion.FromData(backup_group, KeyframeMotion.Serialize());
+ KeyframeMotion.UpdateSceneObject(this);
+ }
backup_group.RootPart.Velocity = RootPart.Velocity;
backup_group.RootPart.Acceleration = RootPart.Acceleration;
backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index ed761da..a9f3e84 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -244,6 +244,17 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
sr.Close();
}
+ XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
+ if (keymotion.Count > 0)
+ {
+ m_log.DebugFormat("[SERIALIZER]: Deserialized KeyframeMotion");
+ sceneObject.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
+ }
+ else
+ {
+ sceneObject.KeyframeMotion = null;
+ }
+
// Script state may, or may not, exist. Not having any, is NOT
// ever a problem.
sceneObject.LoadScriptState(doc);
@@ -597,7 +608,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
obj.sopVehicle = _vehicle;
}
-
private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
{
List errorNodeNames;
@@ -1168,6 +1178,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
});
writer.WriteEndElement();
+
+ if (sog.KeyframeMotion != null)
+ {
+ Byte[] data = sog.KeyframeMotion.Serialize();
+
+ writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
+ writer.WriteBase64(data, 0, data.Length);
+ writer.WriteEndElement();
+ }
+
writer.WriteEndElement();
}
--
cgit v1.1
From 9a15bba99bad2861813660c1c1da236d154809e5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 13:22:17 +0100
Subject: Fix an infinite recursion caused by checking the wrong values for
Buoyancy, Force and Torque
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 51 ++++++++++++----------
1 file changed, 27 insertions(+), 24 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 825f2a3..3ab7e5a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1306,19 +1306,20 @@ namespace OpenSim.Region.Framework.Scenes
{
get
{
- if (ParentID != 0 && ParentGroup != null)
- m_buoyancy = ParentGroup.RootPart.Buoyancy;
- return m_buoyancy;
+ if (ParentGroup.RootPart == this)
+ return m_buoyancy;
+
+ return ParentGroup.RootPart.Buoyancy;
}
set
{
- m_buoyancy = value;
- if (ParentID != 0)
+ if (ParentGroup.RootPart != this)
{
- if (ParentGroup != null)
- ParentGroup.RootPart.Buoyancy = value;
+ ParentGroup.RootPart.Buoyancy = value;
+ return;
}
- else if (PhysActor != null)
+ m_buoyancy = value;
+ if (PhysActor != null)
PhysActor.Buoyancy = value;
}
}
@@ -1327,20 +1328,21 @@ namespace OpenSim.Region.Framework.Scenes
{
get
{
- if (ParentID != 0 && ParentGroup != null)
- m_force = ParentGroup.RootPart.Force;
- return m_force;
+ if (ParentGroup.RootPart == this)
+ return m_force;
+
+ return ParentGroup.RootPart.Force;
}
set
{
- m_force = value;
- if (ParentID != 0)
+ if (ParentGroup.RootPart != this)
{
- if (ParentGroup != null)
- ParentGroup.RootPart.Force = value;
+ ParentGroup.RootPart.Force = value;
+ return;
}
- else if (PhysActor != null)
+ m_force = value;
+ if (PhysActor != null)
PhysActor.Force = value;
}
}
@@ -1349,20 +1351,21 @@ namespace OpenSim.Region.Framework.Scenes
{
get
{
- if (ParentID != 0 && ParentGroup != null)
- m_torque = ParentGroup.RootPart.Torque;
- return m_torque;
+ if (ParentGroup.RootPart == this)
+ return m_torque;
+
+ return ParentGroup.RootPart.Torque;
}
set
{
- m_torque = value;
- if (ParentID != 0)
+ if (ParentGroup.RootPart != this)
{
- if (ParentGroup != null)
- ParentGroup.RootPart.Torque = value;
+ ParentGroup.RootPart.Torque = value;
+ return;
}
- else if (PhysActor != null)
+ m_torque = value;
+ if (PhysActor != null)
PhysActor.Torque = value;
}
}
--
cgit v1.1
From 8cdc115c91bd074539c5fbae719313d4dc616355 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 14:30:24 +0100
Subject: Fix deserialization of Buoyancy, Force and Torque. Remove debug from
the new code.
---
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 1 -
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 ++++
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++---
.../Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 5 -----
4 files changed, 7 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 73db25b..7f651aa 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -245,7 +245,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- m_log.DebugFormat("[KEYFRAME]: Angle {0} aabb {1}", angle, aa_bb);
k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000));
k.TimeTotal = k.TimeMS;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index d488189..ac2fe82 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -896,6 +896,10 @@ namespace OpenSim.Region.Framework.Scenes
ApplyPhysics();
if (RootPart.PhysActor != null)
+ RootPart.Force = RootPart.Force;
+ if (RootPart.PhysActor != null)
+ RootPart.Torque = RootPart.Torque;
+ if (RootPart.PhysActor != null)
RootPart.Buoyancy = RootPart.Buoyancy;
// Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3ab7e5a..0728042 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1313,7 +1313,7 @@ namespace OpenSim.Region.Framework.Scenes
}
set
{
- if (ParentGroup.RootPart != this)
+ if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
{
ParentGroup.RootPart.Buoyancy = value;
return;
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.Framework.Scenes
set
{
- if (ParentGroup.RootPart != this)
+ if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
{
ParentGroup.RootPart.Force = value;
return;
@@ -1359,7 +1359,7 @@ namespace OpenSim.Region.Framework.Scenes
set
{
- if (ParentGroup.RootPart != this)
+ if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
{
ParentGroup.RootPart.Torque = value;
return;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index a9f3e84..118a63a 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -246,14 +246,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
if (keymotion.Count > 0)
- {
- m_log.DebugFormat("[SERIALIZER]: Deserialized KeyframeMotion");
sceneObject.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
- }
else
- {
sceneObject.KeyframeMotion = null;
- }
// Script state may, or may not, exist. Not having any, is NOT
// ever a problem.
--
cgit v1.1
From ac1e30156a7ec8e461b3378149a082b3b5d57884 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 15:09:00 +0100
Subject: Implement proper selection behavior
---
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 31 ++++++++++++++++++++++
.../Framework/Scenes/Scene.PacketHandlers.cs | 6 +++--
.../Region/Framework/Scenes/SceneObjectGroup.cs | 2 ++
3 files changed, 37 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 7f651aa..bf18f4d 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -72,6 +72,8 @@ namespace OpenSim.Region.Framework.Scenes
private DataFormat m_data = DataFormat.Translation | DataFormat.Rotation;
private bool m_running = false;
+ [NonSerialized()]
+ private bool m_selected = false;
private int m_iterations = 0;
@@ -82,6 +84,25 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_data; }
}
+ public bool Selected
+ {
+ set
+ {
+ if (value)
+ {
+ // Once we're let go, recompute positions
+ if (m_selected)
+ UpdateSceneObject(m_group);
+ }
+ else
+ {
+ // Save selection position in case we get moved
+ if (!m_selected)
+ m_serializedPosition = m_group.AbsolutePosition;
+ }
+ m_selected = value; }
+ }
+
public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data)
{
MemoryStream ms = new MemoryStream(data);
@@ -276,6 +297,16 @@ namespace OpenSim.Region.Framework.Scenes
m_currentFrame = m_frames[0];
}
+ if (m_selected)
+ {
+ if (m_group.RootPart.Velocity != Vector3.Zero)
+ {
+ m_group.RootPart.Velocity = Vector3.Zero;
+ m_group.SendGroupRootTerseUpdate();
+ }
+ return;
+ }
+
// Do the frame processing
double steps = (double)m_currentFrame.TimeMS / timerInterval;
float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index bf2e775..b006045 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -138,12 +138,12 @@ namespace OpenSim.Region.Framework.Scenes
{
SceneObjectGroup sog = part.ParentGroup;
sog.SendPropertiesToClient(remoteClient);
- sog.IsSelected = true;
// A prim is only tainted if it's allowed to be edited by the person clicking it.
if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
|| Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
{
+ sog.IsSelected = true;
EventManager.TriggerParcelPrimCountTainted();
}
}
@@ -215,7 +215,9 @@ namespace OpenSim.Region.Framework.Scenes
// handled by group, but by prim. Legacy cruft.
// TODO: Make selection flagging per prim!
//
- part.ParentGroup.IsSelected = false;
+ if (Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId)
+ || Permissions.CanMoveObject(part.ParentGroup.UUID, remoteClient.AgentId))
+ part.ParentGroup.IsSelected = false;
if (part.ParentGroup.IsAttachment)
isAttachment = true;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ac2fe82..e509d4e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -726,6 +726,8 @@ namespace OpenSim.Region.Framework.Scenes
child.PhysActor.Selected = value;
}
}
+ if (KeyframeMotion != null)
+ KeyframeMotion.Selected = value;
}
}
--
cgit v1.1
From fca8c82232a42191270cb8d18dba6b54d382a2c2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 18:11:38 +0100
Subject: Move KeyframeMotion from SOG to SOP because we can't persist it any
other way because SOG doesn't technically exist in the DB
---
OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++--
OpenSim/Region/Framework/Scenes/SceneGraph.cs | 11 +++++++++
.../Region/Framework/Scenes/SceneObjectGroup.cs | 26 +++++++++-------------
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 +++++++++---
.../Scenes/Serialization/SceneObjectSerializer.cs | 8 +++----
5 files changed, 38 insertions(+), 25 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c20da4b..11a41aa 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2421,8 +2421,8 @@ namespace OpenSim.Region.Framework.Scenes
if (newPosition != Vector3.Zero)
newObject.RootPart.GroupPosition = newPosition;
- if (newObject.KeyframeMotion != null)
- newObject.KeyframeMotion.UpdateSceneObject(newObject);
+ if (newObject.RootPart.KeyframeMotion != null)
+ newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
if (!AddSceneObject(newObject))
{
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 5a7f124..a320601 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1731,6 +1731,12 @@ namespace OpenSim.Region.Framework.Scenes
///
protected internal void LinkObjects(SceneObjectPart root, List children)
{
+ if (root.KeyframeMotion != null)
+ {
+ root.KeyframeMotion.Stop();
+ root.KeyframeMotion = null;
+ }
+
SceneObjectGroup parentGroup = root.ParentGroup;
if (parentGroup == null) return;
@@ -1823,6 +1829,11 @@ namespace OpenSim.Region.Framework.Scenes
{
if (part != null)
{
+ if (part.KeyframeMotion != null)
+ {
+ part.KeyframeMotion.Stop();
+ part.KeyframeMotion = null;
+ }
if (part.ParentGroup.PrimCount != 1) // Skip single
{
if (part.LinkNum < 2) // Root
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e509d4e..fefae9d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -114,12 +114,6 @@ namespace OpenSim.Region.Framework.Scenes
private Random m_rand;
private bool m_suspendUpdates;
private List m_linkedAvatars = new List();
- private KeyframeMotion m_keyframeMotion = null;
-
- public KeyframeMotion KeyframeMotion
- {
- get; set;
- }
public bool areUpdatesSuspended
{
@@ -726,8 +720,8 @@ namespace OpenSim.Region.Framework.Scenes
child.PhysActor.Selected = value;
}
}
- if (KeyframeMotion != null)
- KeyframeMotion.Selected = value;
+ if (RootPart.KeyframeMotion != null)
+ RootPart.KeyframeMotion.Selected = value;
}
}
@@ -1829,11 +1823,6 @@ namespace OpenSim.Region.Framework.Scenes
// Name, UUID, m_scene.RegionInfo.RegionName);
SceneObjectGroup backup_group = Copy(false);
- if (KeyframeMotion != null)
- {
- backup_group.KeyframeMotion = KeyframeMotion.FromData(backup_group, KeyframeMotion.Serialize());
- KeyframeMotion.UpdateSceneObject(this);
- }
backup_group.RootPart.Velocity = RootPart.Velocity;
backup_group.RootPart.Acceleration = RootPart.Acceleration;
backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity;
@@ -1846,6 +1835,11 @@ namespace OpenSim.Region.Framework.Scenes
backup_group.ForEachPart(delegate(SceneObjectPart part)
{
+ if (part.KeyframeMotion != null)
+ {
+ part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
+ part.KeyframeMotion.UpdateSceneObject(this);
+ }
part.Inventory.ProcessInventoryBackup(datastore);
});
@@ -2001,9 +1995,9 @@ namespace OpenSim.Region.Framework.Scenes
{
if (usePhysics)
{
- if (KeyframeMotion != null)
- KeyframeMotion.Stop();
- KeyframeMotion = null;
+ if (RootPart.KeyframeMotion != null)
+ RootPart.KeyframeMotion.Stop();
+ RootPart.KeyframeMotion = null;
}
UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0728042..ea3d716 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -315,6 +315,14 @@ namespace OpenSim.Region.Framework.Scenes
private SOPVehicle m_vehicle = null;
+ private KeyframeMotion m_keyframeMotion = null;
+
+ public KeyframeMotion KeyframeMotion
+ {
+ get; set;
+ }
+
+
#endregion Fields
// ~SceneObjectPart()
@@ -1924,9 +1932,9 @@ namespace OpenSim.Region.Framework.Scenes
{
if (UsePhysics)
{
- if (ParentGroup.KeyframeMotion != null)
- ParentGroup.KeyframeMotion.Stop();
- ParentGroup.KeyframeMotion = null;
+ if (ParentGroup.RootPart.KeyframeMotion != null)
+ ParentGroup.RootPart.KeyframeMotion.Stop();
+ ParentGroup.RootPart.KeyframeMotion = null;
ParentGroup.Scene.AddPhysicalPrim(1);
PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 118a63a..51a3320 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -246,9 +246,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
if (keymotion.Count > 0)
- sceneObject.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
+ sceneObject.RootPart.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
else
- sceneObject.KeyframeMotion = null;
+ sceneObject.RootPart.KeyframeMotion = null;
// Script state may, or may not, exist. Not having any, is NOT
// ever a problem.
@@ -1174,9 +1174,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteEndElement();
- if (sog.KeyframeMotion != null)
+ if (sog.RootPart.KeyframeMotion != null)
{
- Byte[] data = sog.KeyframeMotion.Serialize();
+ Byte[] data = sog.RootPart.KeyframeMotion.Serialize();
writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
writer.WriteBase64(data, 0, data.Length);
--
cgit v1.1
From e5e5b94cbe6076f74d5ad2358d020f7d4f7ac18f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Feb 2012 21:16:24 +0100
Subject: Make llSetKeyframedMotion prims waut at the borders of down sims and
try again periodically.
---
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 12 ++++++++++++
1 file changed, 12 insertions(+)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index bf18f4d..b7b0d27 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -406,5 +406,17 @@ namespace OpenSim.Region.Framework.Scenes
m_group = tmp;
return ms.ToArray();
}
+
+ public void CrossingFailure()
+ {
+ // The serialization has stopped the timer, so let's wait a moment
+ // then retry the crossing. We'll get back here if it fails.
+ Util.FireAndForget(delegate (object x)
+ {
+ Thread.Sleep(60000);
+ if (m_running)
+ m_timer.Start();
+ });
+ }
}
}
--
cgit v1.1
From aee4ca2f1cfa2aaee88ebbf72513d6a06cefeb65 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 27 Feb 2012 08:50:19 +0100
Subject: Fix vehicles going physical stopping llTargetOmega parts (boat radar)
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ea3d716..1c72b10 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -916,7 +916,7 @@ namespace OpenSim.Region.Framework.Scenes
get
{
PhysicsActor actor = PhysActor;
- if ((actor != null) && actor.IsPhysical)
+ if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this)
{
m_angularVelocity = actor.RotationalVelocity;
}
@@ -1893,7 +1893,8 @@ namespace OpenSim.Region.Framework.Scenes
Velocity = new Vector3(0, 0, 0);
Acceleration = new Vector3(0, 0, 0);
- AngularVelocity = new Vector3(0, 0, 0);
+ if (ParentGroup.RootPart == this)
+ AngularVelocity = new Vector3(0, 0, 0);
PhysActor.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
PhysActor.OnOutOfBounds -= PhysicsOutOfBounds;
@@ -1917,7 +1918,8 @@ namespace OpenSim.Region.Framework.Scenes
// velocity-vector.
Velocity = new Vector3(0, 0, 0);
Acceleration = new Vector3(0, 0, 0);
- AngularVelocity = new Vector3(0, 0, 0);
+ if (ParentGroup.RootPart == this)
+ AngularVelocity = new Vector3(0, 0, 0);
//RotationalVelocity = new Vector3(0, 0, 0);
}
--
cgit v1.1
From 6dc4a6dfb1af79ea116d1b5ca8dcd82307349c64 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 4 Mar 2012 00:06:07 +0100
Subject: Zero velocity when drag-copying
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index fefae9d..c9ea8e4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1989,6 +1989,8 @@ namespace OpenSim.Region.Framework.Scenes
public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
{
SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed));
+ if (userExposed)
+ RootPart.Velocity = Vector3.Zero; // In case source is moving
}
public void ScriptSetPhysicsStatus(bool usePhysics)
--
cgit v1.1