Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Client.Self.Position now does acceleration/velocity interpolation

Browse Source 
* Added LLVector3 * float operator
* Adding Oven.cs to Baker (will be moved in to libsecondlife later) that does the first baby steps of baking
* Added the missing Helpers.GetResourceStream() function
* Changed readonly Settings values to const


git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1110 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2007-04-09 08:03:12 +00:00
parent 3c81807d8b
commit f44c012f60
14 changed files with 176 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libsecondlife/ObjectManager.cs
View File

@@ -451,12 +451,18 @@ namespace libsecondlife
#endregion
private const float HAVOK_TIMESTEP = 1.0f / 45.0f;
/// <summary>
/// Reference to the SecondLife client
/// </summary>
protected SecondLife Client;
private System.Timers.Timer InterpolationTimer;
/// <summary>
/// Instantiates a new ObjectManager class. This class should only be accessed
/// through SecondLife.Objects, client applications should never create their own
@@ -495,6 +501,12 @@ namespace libsecondlife
Client.Network.RegisterCallback(PacketType.ObjectUpdateCached, new NetworkManager.PacketCallback(CachedUpdateHandler));
Client.Network.RegisterCallback(PacketType.KillObject, new NetworkManager.PacketCallback(KillObjectHandler));
Client.Network.RegisterCallback(PacketType.ObjectPropertiesFamily, new NetworkManager.PacketCallback(ObjectPropertiesFamilyHandler));
// If the callbacks aren't registered there's not point in doing client-side path prediction,
// so we set it up here
InterpolationTimer = new System.Timers.Timer(Settings.INTERPOLATION_UPDATE);
InterpolationTimer.Elapsed += new System.Timers.ElapsedEventHandler(InterpolationTimer_Elapsed);
InterpolationTimer.Start();
}
#region Action Methods
@@ -1962,7 +1974,6 @@ namespace libsecondlife
#endregion
#region Utility Functions
protected void SetAvatarSelfSittingOn(uint localid)
@@ -1980,8 +1991,30 @@ namespace libsecondlife
s.Dilation = (float)dilation / 65535.0f;
}
#endregion
protected void InterpolationTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
if (Client.Network.Connected)
{
// For now we only update Client.Self since there is no object tracking
// built in to the library
// Only do movement interpolation (extrapolation) when there is a non-zero velocity but
// no acceleration
if (Client.Self.Velocity != LLVector3.Zero || Client.Self.Acceleration != LLVector3.Zero)
{
TimeSpan interval = DateTime.Now - Client.Self.lastInterpolation;
float adjSeconds = (float)interval.TotalSeconds * Client.Network.CurrentSim.Dilation;
Client.Self.Position += (Client.Self.Velocity + (0.5f * (adjSeconds - HAVOK_TIMESTEP)) *
Client.Self.Acceleration) * adjSeconds;
}
}
// Make sure the last interpolated time is always updated
Client.Self.lastInterpolation = DateTime.Now;
}
#endregion
#region Event Notification
@@ -2068,7 +2101,6 @@ namespace libsecondlife
#endregion
#region Subclass Indirection
/// <summary>