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

direct encode lludp terse object update, let contain texture entry

0.9.1.0-post-fixes
UbitUmarov 2019-03-02 18:23:29 +00:00
parent 9da1ca2b44
commit ca1993c72d
3 changed files with 78 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/IClientAPI.cs
View File

@ -671,7 +671,6 @@ namespace OpenSim.Framework
Particles = 1 << 19, Particles = 1 << 19,
ExtraData = 1 << 20, ExtraData = 1 << 20,
Sound = 1 << 21, Sound = 1 << 21,
Joint = 1 << 22,
TerseUpdate = Position | Rotation | Velocity | Acceleration | AngularVelocity, TerseUpdate = Position | Rotation | Velocity | Acceleration | AngularVelocity,
FullUpdate = 0x00ffffff, FullUpdate = 0x00ffffff,

81
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -4120,10 +4120,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
float cullingrange = 64.0f; float cullingrange = 64.0f;
Vector3 mypos = Vector3.Zero; Vector3 mypos = Vector3.Zero;
bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance; //bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance;
bool orderedDequeue = false; // temporary off
HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>(); HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>();
if (doCulling) if (doCulling)
{ {
cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f; cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f;
@ -4304,7 +4306,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
PrimUpdateFlags.Velocity | PrimUpdateFlags.Velocity |
PrimUpdateFlags.Acceleration | PrimUpdateFlags.Acceleration |
PrimUpdateFlags.AngularVelocity | PrimUpdateFlags.AngularVelocity |
PrimUpdateFlags.CollisionPlane PrimUpdateFlags.CollisionPlane |
PrimUpdateFlags.Textures
); );
#endregion UpdateFlags to packet type conversion #endregion UpdateFlags to packet type conversion
@ -4347,7 +4350,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
maxUpdatesBytes -= 18; maxUpdatesBytes -= 18;
} }
terseUpdates.Add(update); terseUpdates.Add(update);
maxUpdatesBytes -= 47; // no texture entry maxUpdatesBytes -= 47;
if ((updateFlags & PrimUpdateFlags.Textures) != 0)
maxUpdatesBytes -= 100; // aprox
} }
} }
else else
@ -4390,7 +4395,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
//setup header and regioninfo block //setup header and regioninfo block
Array.Copy(terseUpdateHeader, buf.Data, 7); Buffer.BlockCopy(terseUpdateHeader, 0, buf.Data, 0, 7);
Utils.UInt64ToBytesSafepos(m_scene.RegionInfo.RegionHandle, buf.Data, 7); Utils.UInt64ToBytesSafepos(m_scene.RegionInfo.RegionHandle, buf.Data, 7);
Utils.UInt16ToBytes(timeDilation, buf.Data, 15); Utils.UInt16ToBytes(timeDilation, buf.Data, 15);
buf.Data[17] = (byte)curNBlocks; buf.Data[17] = (byte)curNBlocks;
@ -4399,7 +4404,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
int count = 0; int count = 0;
foreach (EntityUpdate eu in terseAgentUpdates) foreach (EntityUpdate eu in terseAgentUpdates)
{ {
CreateImprovedTerseBlock(eu.Entity, buf.Data, ref pos); CreateImprovedTerseBlock(eu.Entity, buf.Data, ref pos, false);
tau.Add(eu); tau.Add(eu);
++count; ++count;
--blocks; --blocks;
@ -4407,7 +4412,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// we need more packets // we need more packets
UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
Array.Copy(buf.Data, newbuf.Data, 17); // start is the same Buffer.BlockCopy(buf.Data, 0, newbuf.Data, 0, 17); // start is the same
buf.DataLength = pos; buf.DataLength = pos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Unknown, m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Unknown,
@ -4455,49 +4460,57 @@ namespace OpenSim.Region.ClientStack.LindenUDP
*/ */
if (terseUpdates != null) if (terseUpdates != null)
{ {
const int maxNBlocks = (LLUDPServer.MTU - 18) / 47; // no texture entry
int blocks = terseUpdates.Count; int blocks = terseUpdates.Count;
int curNBlocks = blocks > maxNBlocks ? maxNBlocks : blocks; List<EntityUpdate> tau = new List<EntityUpdate>(30);
List<EntityUpdate> tau = new List<EntityUpdate>(curNBlocks);
UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
//setup header and regioninfo block //setup header and regioninfo block
Array.Copy(terseUpdateHeader, buf.Data, 7); Buffer.BlockCopy(terseUpdateHeader, 0, buf.Data, 0, 7);
Utils.UInt64ToBytesSafepos(m_scene.RegionInfo.RegionHandle, buf.Data, 7); Utils.UInt64ToBytesSafepos(m_scene.RegionInfo.RegionHandle, buf.Data, 7);
Utils.UInt16ToBytes(timeDilation, buf.Data, 15); Utils.UInt16ToBytes(timeDilation, buf.Data, 15);
buf.Data[17] = (byte)curNBlocks;
int pos = 18; int pos = 18;
int lastpos = 0;
int count = 0; int count = 0;
foreach (EntityUpdate eu in terseUpdates) foreach (EntityUpdate eu in terseUpdates)
{ {
CreateImprovedTerseBlock(eu.Entity, buf.Data, ref pos); lastpos = pos;
CreateImprovedTerseBlock(eu.Entity, buf.Data, ref pos, (eu.Flags & PrimUpdateFlags.Textures) != 0);
if (pos <= LLUDPServer.MTU)
{
tau.Add(eu); tau.Add(eu);
++count; ++count;
--blocks; --blocks;
if (count == curNBlocks && blocks > 0) }
else if (blocks > 0)
{ {
// we need more packets // we need more packets
UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint);
Array.Copy(buf.Data, newbuf.Data, 17); // start is the same Buffer.BlockCopy(buf.Data, 0, newbuf.Data, 0, 17); // start is the same
// copy what we done in excess
int extralen = pos - lastpos;
if(extralen > 0)
Buffer.BlockCopy(newbuf.Data, 18, buf.Data, lastpos, extralen);
buf.DataLength = pos; pos = 18 + extralen;
buf.Data[17] = (byte)count;
buf.DataLength = lastpos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false); delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false);
curNBlocks = blocks > maxNBlocks ? maxNBlocks : blocks; tau = new List<EntityUpdate>(30);
tau = new List<EntityUpdate>(curNBlocks); tau.Add(eu);
count = 0; count = 1;
--blocks;
buf = newbuf; buf = newbuf;
buf.Data[17] = (byte)curNBlocks;
pos = 18;
} }
} }
if (count > 0) if (count > 0)
{ {
buf.Data[17] = (byte)count;
buf.DataLength = pos; buf.DataLength = pos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false); delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false);
@ -5720,7 +5733,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
protected void CreateImprovedTerseBlock(ISceneEntity entity, byte[] data, ref int pos) protected void CreateImprovedTerseBlock(ISceneEntity entity, byte[] data, ref int pos, bool includeTexture)
{ {
#region ScenePresence/SOP Handling #region ScenePresence/SOP Handling
@ -5731,6 +5744,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Vector3 position, velocity, acceleration, angularVelocity; Vector3 position, velocity, acceleration, angularVelocity;
Quaternion rotation; Quaternion rotation;
byte datasize; byte datasize;
byte[] te = null;
if (avatar) if (avatar)
{ {
@ -5775,6 +5789,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
rotation = part.RotationOffset; rotation = part.RotationOffset;
datasize = 44; datasize = 44;
if(includeTexture)
te = part.Shape.TextureEntry;
} }
#endregion ScenePresence/SOP Handling #endregion ScenePresence/SOP Handling
@ -5785,8 +5801,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Utils.UIntToBytes(localID, data, pos); Utils.UIntToBytes(localID, data, pos);
pos += 4; pos += 4;
// Avatar/CollisionPlane
data[pos++] = (byte)attachPoint; data[pos++] = (byte)attachPoint;
// Avatar/CollisionPlane
if (avatar) if (avatar)
{ {
data[pos++] = 1; data[pos++] = 1;
@ -5831,9 +5848,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Utils.FloatToUInt16Bytes(angularVelocity.Z, 64.0f, data, pos); pos += 2; Utils.FloatToUInt16Bytes(angularVelocity.Z, 64.0f, data, pos); pos += 2;
// texture entry block size // texture entry block size
if(te == null)
{
data[pos++] = 0; data[pos++] = 0;
data[pos++] = 0; data[pos++] = 0;
// total size 63 or 47 }
else
{
int len = te.Length & 0x7fff;
int totlen = len + 4;
data[pos++] = (byte)totlen;
data[pos++] = (byte)(totlen >> 8);
data[pos++] = (byte)len; // wtf ???
data[pos++] = (byte)(len >> 8);
data[pos++] = 0;
data[pos++] = 0;
Buffer.BlockCopy(te, 0, data, pos, len);
pos += len;
}
// total size 63 or 47 + (texture size + 4)
} }
protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)

23
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -3242,8 +3242,6 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentGroup.Scene.GetNumberOfClients() == 0) if (ParentGroup.Scene.GetNumberOfClients() == 0)
return; return;
ParentGroup.QueueForUpdateCheck();
bool isfull = false; bool isfull = false;
if (ParentGroup.IsAttachment) if (ParentGroup.IsAttachment)
{ {
@ -3254,6 +3252,8 @@ namespace OpenSim.Region.Framework.Scenes
lock (UpdateFlagLock) lock (UpdateFlagLock)
UpdateFlag |= update; UpdateFlag |= update;
ParentGroup.QueueForUpdateCheck();
ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, isfull); ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, isfull);
} }
@ -5133,8 +5133,7 @@ namespace OpenSim.Region.Framework.Scenes
m_shape.TextureEntry = newTex.GetBytes(); m_shape.TextureEntry = newTex.GetBytes();
TriggerScriptChangedEvent(changeFlags); TriggerScriptChangedEvent(changeFlags);
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
ScheduleFullUpdate(); ScheduleUpdate(PrimUpdateFlags.Textures);
} }
/// <summary> /// <summary>
@ -5163,7 +5162,7 @@ namespace OpenSim.Region.Framework.Scenes
m_shape.TextureEntry = newTex.GetBytes(); m_shape.TextureEntry = newTex.GetBytes();
TriggerScriptChangedEvent(changeFlags); TriggerScriptChangedEvent(changeFlags);
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
ScheduleFullUpdate(); ScheduleUpdate(PrimUpdateFlags.Textures);
} }
internal void UpdatePhysicsSubscribedEvents() internal void UpdatePhysicsSubscribedEvents()
@ -5575,16 +5574,22 @@ namespace OpenSim.Region.Framework.Scenes
// handle osVolumeDetect // handle osVolumeDetect
public void ScriptSetVolumeDetect(bool makeVolumeDetect) public void ScriptSetVolumeDetect(bool makeVolumeDetect)
{ {
if(ParentGroup.IsDeleted)
return;
if(_parentID == 0) if(_parentID == 0)
{ {
// if root prim do it via SOG // if root prim do it is like llVolumeDetect
ParentGroup.ScriptSetVolumeDetect(makeVolumeDetect); ParentGroup.ScriptSetVolumeDetect(makeVolumeDetect);
return; return;
} }
bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0); if(ParentGroup.IsVolumeDetect)
bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0); return; // entire linkset is phantom already
bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
bool wasUsingPhysics = ParentGroup.UsesPhysics;
bool wasTemporary = ParentGroup.IsTemporary;
bool wasPhantom = ParentGroup.IsPhantom;
if(PhysActor != null) if(PhysActor != null)
PhysActor.Building = true; PhysActor.Building = true;