From cc149a95e7304bf8475385714f99ef8166ea6845 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 29 Jul 2014 03:13:10 +0100 Subject: [PATCH] Make it possible to change avatar position update, rotation and velocity tolerances on the fly. This is done via "debug scene set client-pos-upd, client-rot-upd, client-vel-upd". For testing purposes. --- OpenSim/Region/Framework/Scenes/Scene.cs | 20 ++++- .../Region/Framework/Scenes/ScenePresence.cs | 10 +-- .../SceneCommands/SceneCommandsModule.cs | 78 ++++++++++++++----- 3 files changed, 79 insertions(+), 29 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7b060968ad..a695fec614 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -230,7 +230,22 @@ namespace OpenSim.Region.Framework.Scenes /// /// Temporarily setting to trigger appearance resends at 60 second intervals. /// - public bool SendPeriodicAppearanceUpdates { get; set; } + public bool SendPeriodicAppearanceUpdates { get; set; } + + /// + /// How much a client has to change position before updates are sent to viewers. + /// + public float ClientPositionUpdateTolerance { get; set; } + + /// + /// How much a client has to rotate before updates are sent to viewers. + /// + public float ClientRotationUpdateTolerance { get; set; } + + /// + /// How much a client has to change velocity before updates are sent to viewers. + /// + public float ClientVelocityUpdateTolerance { get; set; } protected float m_defaultDrawDistance = 255.0f; public float DefaultDrawDistance @@ -1046,6 +1061,9 @@ namespace OpenSim.Region.Framework.Scenes PeriodicBackup = true; UseBackup = true; + ClientRotationUpdateTolerance = 0.01f; + ClientVelocityUpdateTolerance = 0.001f; + ClientPositionUpdateTolerance = 0.05f; ChildReprioritizationDistance = 20.0; m_eventManager = new EventManager(); diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e478322a68..0f6d2cf283 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3181,10 +3181,6 @@ namespace OpenSim.Region.Framework.Scenes public override void Update() { - const float ROTATION_TOLERANCE = 0.01f; - const float VELOCITY_TOLERANCE = 0.001f; - const float POSITION_TOLERANCE = 0.05f; - if (IsChildAgent == false) { // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to @@ -3201,9 +3197,9 @@ namespace OpenSim.Region.Framework.Scenes if (!updateClients) updateClients - = !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) - || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) - || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE); + = !Rotation.ApproxEquals(m_lastRotation, Scene.ClientRotationUpdateTolerance) + || !Velocity.ApproxEquals(m_lastVelocity, Scene.ClientVelocityUpdateTolerance) + || !m_pos.ApproxEquals(m_lastPosition, Scene.ClientPositionUpdateTolerance); if (updateClients) { diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs index 51aad6fae4..90f8cb4025 100644 --- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs @@ -93,30 +93,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments "Debug", this, "debug scene get", "debug scene get", "List current scene options.", - "active - if false then main scene update and maintenance loops are suspended.\n" - + "animations - if true then extra animations debug information is logged.\n" - + "child-repri - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n" - + "collisions - if false then collisions with other objects are turned off.\n" - + "pbackup - if false then periodic scene backup is turned off.\n" - + "physics - if false then all physics objects are non-physical.\n" - + "scripting - if false then no scripting operations happen.\n" - + "teleport - if true then some extra teleport debug information is logged.\n" - + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", + "active - if false then main scene update and maintenance loops are suspended.\n" + + "animations - if true then extra animations debug information is logged.\n" + + "child-repri - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n" + + "client-pos-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" + + "collisions - if false then collisions with other objects are turned off.\n" + + "pbackup - if false then periodic scene backup is turned off.\n" + + "physics - if false then all physics objects are non-physical.\n" + + "scripting - if false then no scripting operations happen.\n" + + "teleport - if true then some extra teleport debug information is logged.\n" + + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", HandleDebugSceneGetCommand); scene.AddCommand( "Debug", this, "debug scene set", "debug scene set active|collisions|pbackup|physics|scripting|teleport|updates true|false", "Turn on scene debugging options.", - "active - if false then main scene update and maintenance loops are suspended.\n" - + "animations - if true then extra animations debug information is logged.\n" - + "child-repri - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n" - + "collisions - if false then collisions with other objects are turned off.\n" - + "pbackup - if false then periodic scene backup is turned off.\n" - + "physics - if false then all physics objects are non-physical.\n" - + "scripting - if false then no scripting operations happen.\n" - + "teleport - if true then some extra teleport debug information is logged.\n" - + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", + "active - if false then main scene update and maintenance loops are suspended.\n" + + "animations - if true then extra animations debug information is logged.\n" + + "child-repri - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n" + + "client-pos-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" + + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" + + "collisions - if false then collisions with other objects are turned off.\n" + + "pbackup - if false then periodic scene backup is turned off.\n" + + "physics - if false then all physics objects are non-physical.\n" + + "scripting - if false then no scripting operations happen.\n" + + "teleport - if true then some extra teleport debug information is logged.\n" + + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", HandleDebugSceneSetCommand); } @@ -141,6 +147,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments cdl.AddRow("active", m_scene.Active); cdl.AddRow("animations", m_scene.DebugAnimations); cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance); + cdl.AddRow("client-pos-upd", m_scene.ClientPositionUpdateTolerance); + cdl.AddRow("client-rot-upd", m_scene.ClientRotationUpdateTolerance); + cdl.AddRow("client-vel-upd", m_scene.ClientVelocityUpdateTolerance); cdl.AddRow("pbackup", m_scene.PeriodicBackup); cdl.AddRow("physics", m_scene.PhysicsEnabled); cdl.AddRow("scripting", m_scene.ScriptsEnabled); @@ -190,11 +199,38 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments if (options.ContainsKey("child-repri")) { - double childRepriDistance; + double newValue; // FIXME: This can only come from the console at the moment but might not always be true. - if (ConsoleUtil.TryParseConsoleDouble(MainConsole.Instance, options["child-repri"], out childRepriDistance)) - m_scene.ChildReprioritizationDistance = childRepriDistance; + if (ConsoleUtil.TryParseConsoleDouble(MainConsole.Instance, options["child-repri"], out newValue)) + m_scene.ChildReprioritizationDistance = newValue; + } + + if (options.ContainsKey("client-pos-upd")) + { + float newValue; + + // FIXME: This can only come from the console at the moment but might not always be true. + if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue)) + m_scene.ClientPositionUpdateTolerance = newValue; + } + + if (options.ContainsKey("client-rot-upd")) + { + float newValue; + + // FIXME: This can only come from the console at the moment but might not always be true. + if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue)) + m_scene.ClientRotationUpdateTolerance = newValue; + } + + if (options.ContainsKey("client-vel-upd")) + { + float newValue; + + // FIXME: This can only come from the console at the moment but might not always be true. + if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue)) + m_scene.ClientVelocityUpdateTolerance = newValue; } if (options.ContainsKey("pbackup"))