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

* Added a CircularQueue to OpenMetaverseTypes

Browse Source 
[Simian]
* Fixed a regression with ViewerEffect packet handling
* Added undo and redo support
* Changed ISceneProvider interfaces to be more consistent and avoid duplicate lookups
* Attempting to unify avatar and prim handling by storing agents as both a SimulationObject and an Agent in the scene
* Comment out noisy resend logging and catch broken packets in the resend queue
* Improved the README
* Avoid generating two meshes when a world-transformed mesh is generated (are these even necessary?)

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2456 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-02-25 20:32:48 +00:00
parent 940b02f36a
commit 939d120059
9 changed files with 369 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Programs/Simian/Extensions/ObjectManager.cs
View File

@@ -12,7 +12,6 @@ namespace Simian.Extensions
{
Simian server;
public ObjectManager()
{
}
@@ -31,6 +30,8 @@ namespace Simian.Extensions
server.UDP.RegisterPacketCallback(PacketType.ObjectFlagUpdate, new PacketCallback(ObjectFlagUpdateHandler));
server.UDP.RegisterPacketCallback(PacketType.ObjectExtraParams, new PacketCallback(ObjectExtraParamsHandler));
server.UDP.RegisterPacketCallback(PacketType.ObjectImage, new PacketCallback(ObjectImageHandler));
server.UDP.RegisterPacketCallback(PacketType.Undo, new PacketCallback(UndoHandler));
server.UDP.RegisterPacketCallback(PacketType.Redo, new PacketCallback(RedoHandler));
server.UDP.RegisterPacketCallback(PacketType.DeRezObject, new PacketCallback(DeRezObjectHandler));
server.UDP.RegisterPacketCallback(PacketType.MultipleObjectUpdate, new PacketCallback(MultipleObjectUpdateHandler));
server.UDP.RegisterPacketCallback(PacketType.RequestObjectPropertiesFamily, new PacketCallback(RequestObjectPropertiesFamilyHandler));
@@ -465,7 +466,7 @@ namespace Simian.Extensions
data.ProfileEnd = Primitive.UnpackEndCut(block.ProfileEnd);
data.ProfileHollow = Primitive.UnpackProfileHollow(block.ProfileHollow);
server.Scene.ObjectModify(this, obj.Prim.LocalID, data);
server.Scene.ObjectModify(this, obj, data);
}
else
{
@@ -544,6 +545,30 @@ namespace Simian.Extensions
}
}
void UndoHandler(Packet packet, Agent agent)
{
UndoPacket undo = (UndoPacket)packet;
for (int i = 0; i < undo.ObjectData.Length; i++)
{
SimulationObject obj;
if (server.Scene.TryGetObject(undo.ObjectData[i].ObjectID, out obj))
server.Scene.ObjectUndo(this, obj);
}
}
void RedoHandler(Packet packet, Agent agent)
{
RedoPacket redo = (RedoPacket)packet;
for (int i = 0; i < redo.ObjectData.Length; i++)
{
SimulationObject obj;
if (server.Scene.TryGetObject(redo.ObjectData[i].ObjectID, out obj))
server.Scene.ObjectRedo(this, obj);
}
}
void DeRezObjectHandler(Packet packet, Agent agent)
{
DeRezObjectPacket derez = (DeRezObjectPacket)packet;
@@ -674,7 +699,7 @@ namespace Simian.Extensions
}
else
{
server.Scene.ObjectTransform(this, obj.Prim.LocalID, position, rotation,
server.Scene.ObjectTransform(this, obj, position, rotation,
obj.Prim.Velocity, obj.Prim.Acceleration, obj.Prim.AngularVelocity);
}
}