OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: Rename recent new Client*UpdateTolerance to Root*UpdateTolerance for better accuracy and consistency with other similar parameters

bullet-2.82
Justin Clark-Casey (justincc) 2014-08-06 00:34:09 +01:00
parent dc2471fedd
commit 961cb9cc77
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -233,19 +233,19 @@ namespace OpenSim.Region.Framework.Scenes
public bool SendPeriodicAppearanceUpdates { get; set; } public bool SendPeriodicAppearanceUpdates { get; set; }
/// <summary> /// <summary>
/// How much a client has to change position before updates are sent to viewers. /// How much a root agent has to change position before updates are sent to viewers.
/// </summary> /// </summary>
public float ClientPositionUpdateTolerance { get; set; } public float RootPositionUpdateTolerance { get; set; }
/// <summary> /// <summary>
/// How much a client has to rotate before updates are sent to viewers. /// How much a root agent has to rotate before updates are sent to viewers.
/// </summary> /// </summary>
public float ClientRotationUpdateTolerance { get; set; } public float RootRotationUpdateTolerance { get; set; }
/// <summary> /// <summary>
/// How much a client has to change velocity before updates are sent to viewers. /// How much a root agent has to change velocity before updates are sent to viewers.
/// </summary> /// </summary>
public float ClientVelocityUpdateTolerance { get; set; } public float RootVelocityUpdateTolerance { get; set; }
/// <summary> /// <summary>
/// If greater than 1, we only send terse updates to other root agents on every n updates. /// If greater than 1, we only send terse updates to other root agents on every n updates.
@ -1071,9 +1071,9 @@ namespace OpenSim.Region.Framework.Scenes
PeriodicBackup = true; PeriodicBackup = true;
UseBackup = true; UseBackup = true;
ClientRotationUpdateTolerance = 0.01f; RootRotationUpdateTolerance = 0.01f;
ClientVelocityUpdateTolerance = 0.001f; RootVelocityUpdateTolerance = 0.001f;
ClientPositionUpdateTolerance = 0.05f; RootPositionUpdateTolerance = 0.05f;
ChildReprioritizationDistance = 20.0; ChildReprioritizationDistance = 20.0;
m_eventManager = new EventManager(); m_eventManager = new EventManager();

8
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3200,12 +3200,12 @@ namespace OpenSim.Region.Framework.Scenes
// checks on all updates but the ramifications of this would need careful consideration. // checks on all updates but the ramifications of this would need careful consideration.
bool updateClients bool updateClients
= IsSatOnObject && (Rotation != m_lastRotation || Velocity != m_lastVelocity || m_pos != m_lastPosition); = IsSatOnObject && (Rotation != m_lastRotation || Velocity != m_lastVelocity || m_pos != m_lastPosition);
if (!updateClients) if (!updateClients)
updateClients updateClients
= !Rotation.ApproxEquals(m_lastRotation, Scene.ClientRotationUpdateTolerance) = !Rotation.ApproxEquals(m_lastRotation, Scene.RootRotationUpdateTolerance)
|| !Velocity.ApproxEquals(m_lastVelocity, Scene.ClientVelocityUpdateTolerance) || !Velocity.ApproxEquals(m_lastVelocity, Scene.RootVelocityUpdateTolerance)
|| !m_pos.ApproxEquals(m_lastPosition, Scene.ClientPositionUpdateTolerance); || !m_pos.ApproxEquals(m_lastPosition, Scene.RootPositionUpdateTolerance);
if (updateClients) if (updateClients)
{ {

12
OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
View File

@ -154,9 +154,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
cdl.AddRow("animations", m_scene.DebugAnimations); cdl.AddRow("animations", m_scene.DebugAnimations);
cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates); cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates);
cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance); cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance);
cdl.AddRow("client-pos-upd", m_scene.ClientPositionUpdateTolerance); cdl.AddRow("client-pos-upd", m_scene.RootPositionUpdateTolerance);
cdl.AddRow("client-rot-upd", m_scene.ClientRotationUpdateTolerance); cdl.AddRow("client-rot-upd", m_scene.RootRotationUpdateTolerance);
cdl.AddRow("client-vel-upd", m_scene.ClientVelocityUpdateTolerance); cdl.AddRow("client-vel-upd", m_scene.RootVelocityUpdateTolerance);
cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod); cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod);
cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod); cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod);
cdl.AddRow("pbackup", m_scene.PeriodicBackup); cdl.AddRow("pbackup", m_scene.PeriodicBackup);
@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
// FIXME: This can only come from the console at the moment but might not always be true. // 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)) if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue))
m_scene.ClientPositionUpdateTolerance = newValue; m_scene.RootPositionUpdateTolerance = newValue;
} }
if (options.ContainsKey("client-rot-upd")) if (options.ContainsKey("client-rot-upd"))
@ -239,7 +239,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
// FIXME: This can only come from the console at the moment but might not always be true. // 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)) if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue))
m_scene.ClientRotationUpdateTolerance = newValue; m_scene.RootRotationUpdateTolerance = newValue;
} }
if (options.ContainsKey("client-vel-upd")) if (options.ContainsKey("client-vel-upd"))
@ -248,7 +248,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
// FIXME: This can only come from the console at the moment but might not always be true. // 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)) if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue))
m_scene.ClientVelocityUpdateTolerance = newValue; m_scene.RootVelocityUpdateTolerance = newValue;
} }
if (options.ContainsKey("root-upd-per")) if (options.ContainsKey("root-upd-per"))