From feef1dd73243cfdd5322632fb67e64cabc1ad4bc Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 3 Dec 2011 02:05:11 +0000 Subject: [PATCH 1/5] Stop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpdate(). There's no point doing this if it's being called via PhysicsCollisionUpdate --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 663c9aeaad..8865b3d9a6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1582,8 +1582,8 @@ namespace OpenSim.Region.Framework.Scenes // } // } - if (update_movementflag && ParentID == 0) - Animator.UpdateMovementAnimations(); +// if (update_movementflag && ParentID == 0) +// Animator.UpdateMovementAnimations(); } m_scene.EventManager.TriggerOnClientMovement(this); From a009871827c250cc677bd42aed2351a3c2cec021 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 3 Dec 2011 02:39:21 +0000 Subject: [PATCH 2/5] Add basic TestFlyingAnimation() regression test --- .../Region/Framework/Scenes/ScenePresence.cs | 7 +- .../Tests/ScenePresenceAnimationTests.cs | 70 +++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8865b3d9a6..05331066dc 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3279,8 +3279,11 @@ namespace OpenSim.Region.Framework.Scenes ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); } - // Event called by the physics plugin to tell the avatar about a collision. - private void PhysicsCollisionUpdate(EventArgs e) + /// + /// Event called by the physics plugin to tell the avatar about a collision. + /// + /// + public void PhysicsCollisionUpdate(EventArgs e) { if (IsChildAgent) return; diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs new file mode 100644 index 0000000000..4a0533c44a --- /dev/null +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs @@ -0,0 +1,70 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Text; +using System.Threading; +using System.Timers; +using Nini.Config; +using NUnit.Framework; +using OpenMetaverse; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.CoreModules.Framework.EntityTransfer; +using OpenSim.Region.CoreModules.World.Serialiser; +using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; +using OpenSim.Region.Physics.Manager; +using OpenSim.Tests.Common; +using OpenSim.Tests.Common.Mock; + +namespace OpenSim.Region.Framework.Scenes.Tests +{ + /// + /// Scene presence animation tests + /// + [TestFixture] + public class ScenePresenceAnimationTests + { + [Test] + public void TestFlyingAnimation() + { + TestHelpers.InMethod(); +// log4net.Config.XmlConfigurator.Configure(); + + TestScene scene = SceneHelpers.SetupScene(); + ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1)); + sp.PhysicsActor.Flying = true; + sp.PhysicsCollisionUpdate(new CollisionEventUpdate()); + + Assert.That(sp.Animator.CurrentMovementAnimation, Is.EqualTo("HOVER")); + } + } +} \ No newline at end of file From b66fe3e9ffd968c2c8aaa0fba108e86b8c4f04d9 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 3 Dec 2011 02:45:02 +0000 Subject: [PATCH 3/5] Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's called continuously even where there are no collisions --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 05331066dc..1fe8048a8f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3282,6 +3282,10 @@ namespace OpenSim.Region.Framework.Scenes /// /// Event called by the physics plugin to tell the avatar about a collision. /// + /// + /// This function is called continuously, even when there are no collisions which might be very inefficient. + /// However, we can't avoid this yet since some of this method might currently rely on being called every frame. + /// /// public void PhysicsCollisionUpdate(EventArgs e) { From e26ef8aeca6fbdf4b355e6fcdb66f09d79d05915 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 3 Dec 2011 02:48:16 +0000 Subject: [PATCH 4/5] change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust.ini.example to 8002 --- bin/Robust.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index beef1c30fe..90f7b5c0ac 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -260,7 +260,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; See http://opensimulator.org/wiki/GridInfo ; login uri: for grid this is the login server URI - login = http://127.0.0.1:9000/ + login = http://127.0.0.1:8002/ ; long grid name: the long name of your grid gridname = "the lost continent of hippo" From 585fc5e79d4b87a5375fa3c2986b5f91d0de1f4e Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 3 Dec 2011 02:51:17 +0000 Subject: [PATCH 5/5] Update SP.PhysicsCollisionUpdate() doc. It might be inefficient, but there are collisions every frame if the avatar is walking/standing on the ground or a prim surface --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1fe8048a8f..5b9438b9e6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3283,8 +3283,11 @@ namespace OpenSim.Region.Framework.Scenes /// Event called by the physics plugin to tell the avatar about a collision. /// /// - /// This function is called continuously, even when there are no collisions which might be very inefficient. - /// However, we can't avoid this yet since some of this method might currently rely on being called every frame. + /// This function is called continuously, even when there are no collisions. If the avatar is walking on the + /// ground or a prim then there will be collision information between the avatar and the surface. + /// + /// FIXME: However, we can't safely avoid calling this yet where there are no collisions without analyzing whether + /// any part of this method is relying on an every-frame call. /// /// public void PhysicsCollisionUpdate(EventArgs e)