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

* removed PrimitiveOld and CreatePrimFromObjectAdd

afrisby
lbsa71 2007-07-13 15:20:18 +00:00
parent 170b648d4d
commit 878289ef88
3 changed files with 5 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -1166,51 +1166,19 @@ namespace OpenSim.Region.ClientStack
objdata.ObjectData[64] = 189;
}
/// <summary>
///
/// </summary>
/// <param name="addPacket"></param>
/// <returns></returns>
protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)
{
PrimData PData = new PrimData();
PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
PData.PCode = addPacket.ObjectData.PCode;
PData.PathBegin = addPacket.ObjectData.PathBegin;
PData.PathEnd = addPacket.ObjectData.PathEnd;
PData.PathScaleX = addPacket.ObjectData.PathScaleX;
PData.PathScaleY = addPacket.ObjectData.PathScaleY;
PData.PathShearX = addPacket.ObjectData.PathShearX;
PData.PathShearY = addPacket.ObjectData.PathShearY;
PData.PathSkew = addPacket.ObjectData.PathSkew;
PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
PData.Scale = addPacket.ObjectData.Scale;
PData.PathCurve = addPacket.ObjectData.PathCurve;
PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
PData.ParentID = 0;
PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
PData.PathTaperX = addPacket.ObjectData.PathTaperX;
PData.PathTaperY = addPacket.ObjectData.PathTaperY;
PData.PathTwist = addPacket.ObjectData.PathTwist;
PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
return PData;
}
#endregion
public void SendNameReply(LLUUID profileId, string firstname, string lastname)
{
Encoding enc = Encoding.ASCII;
UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
packet.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[1];
packet.UUIDNameBlock[0] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
packet.UUIDNameBlock[0].ID = profileId;
packet.UUIDNameBlock[0].FirstName = enc.GetBytes(firstname + "\0");
packet.UUIDNameBlock[0].LastName = enc.GetBytes(lastname + "\0");
OutPacket((Packet)packet);
packet.UUIDNameBlock[0].FirstName = Helpers.StringToField( firstname );
packet.UUIDNameBlock[0].LastName = Helpers.StringToField( lastname );
OutPacket( packet );
}
}
}

583
OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
View File

@ -1,583 +0,0 @@
/*
* Copyright (c) Contributors, http://www.openmetaverse.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System;
using System.Collections.Generic;
using System.Text;
using Axiom.Math;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
using OpenSim.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
public class PrimitiveOld : Entity
{
internal PrimData primData;
private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
// private ClientManager m_clientThreads;
private ulong m_regionHandle;
private const uint FULL_MASK_PERMISSIONS = 2147483647;
private bool physicsEnabled = false;
private byte updateFlag = 0;
private uint flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
private Dictionary<LLUUID, InventoryItem> inventoryItems;
#region Properties
public LLVector3 Scale
{
set
{
this.primData.Scale = value;
//this.dirtyFlag = true;
}
get
{
return this.primData.Scale;
}
}
public PhysicsActor PhysActor
{
set
{
this._physActor = value;
}
}
public override LLVector3 Pos
{
get
{
return base.Pos;
}
set
{
base.Pos = value;
}
}
#endregion
/// <summary>
///
/// </summary>
/// <param name="clientThreads"></param>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
public PrimitiveOld( ulong regionHandle, Scene world)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
m_world = world;
inventoryItems = new Dictionary<LLUUID, InventoryItem>();
}
/// <summary>
///
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
/// <param name="addPacket"></param>
/// <param name="ownerID"></param>
/// <param name="localID"></param>
public PrimitiveOld(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
m_world = world;
inventoryItems = new Dictionary<LLUUID, InventoryItem>();
this.CreateFromPacket(addPacket, ownerID, localID);
}
/// <summary>
///
/// </summary>
/// <param name="clientThreads"></param>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
/// <param name="owner"></param>
/// <param name="fullID"></param>
/// <param name="localID"></param>
public PrimitiveOld( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
m_world = world;
inventoryItems = new Dictionary<LLUUID, InventoryItem>();
this.primData = new PrimData();
this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
this.primData.OwnerID = owner;
this.primData.FullID = this.uuid = fullID;
this.primData.LocalID = m_localId = localID;
}
/// <summary>
/// Constructor to create a default cube
/// </summary>
/// <param name="clientThreads"></param>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
/// <param name="owner"></param>
/// <param name="localID"></param>
/// <param name="position"></param>
public PrimitiveOld( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
{
//m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
m_world = world;
inventoryItems = new Dictionary<LLUUID, InventoryItem>();
this.primData = PrimData.DefaultCube();
this.primData.OwnerID = owner;
this.primData.LocalID = m_localId = localID;
this.Pos = this.primData.Position = position;
this.updateFlag = 1;
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public byte[] GetByteArray()
{
byte[] result = null;
List<byte[]> dataArrays = new List<byte[]>();
dataArrays.Add(primData.ToBytes());
foreach (Entity child in children)
{
if (child is PrimitiveOld)
{
dataArrays.Add(((PrimitiveOld)child).GetByteArray());
}
}
byte[] primstart = Helpers.StringToField("<Prim>");
byte[] primend = Helpers.StringToField("</Prim>");
int totalLength = primstart.Length + primend.Length;
for (int i = 0; i < dataArrays.Count; i++)
{
totalLength += dataArrays[i].Length;
}
result = new byte[totalLength];
int arraypos = 0;
Array.Copy(primstart, 0, result, 0, primstart.Length);
arraypos += primstart.Length;
for (int i = 0; i < dataArrays.Count; i++)
{
Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
arraypos += dataArrays[i].Length;
}
Array.Copy(primend, 0, result, arraypos, primend.Length);
return result;
}
#region Overridden Methods
/// <summary>
///
/// </summary>
public override void update()
{
if (this.updateFlag == 1) // is a new prim just been created/reloaded
{
this.SendFullUpdateToAllClients();
this.updateFlag = 0;
}
if (this.updateFlag == 2) //some change has been made so update the clients
{
this.SendTerseUpdateToALLClients();
this.updateFlag = 0;
}
}
/// <summary>
///
/// </summary>
public override void BackUp()
{
}
#endregion
#region Packet handlers
/// <summary>
///
/// </summary>
/// <param name="pos"></param>
public void UpdatePosition(LLVector3 pos)
{
this.Pos = new LLVector3(pos.X, pos.Y, pos.Z);
this.updateFlag = 2;
}
/// <summary>
///
/// </summary>
/// <param name="addPacket"></param>
public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
{
this.primData.PathBegin = updatePacket.PathBegin;
this.primData.PathEnd = updatePacket.PathEnd;
this.primData.PathScaleX = updatePacket.PathScaleX;
this.primData.PathScaleY = updatePacket.PathScaleY;
this.primData.PathShearX = updatePacket.PathShearX;
this.primData.PathShearY = updatePacket.PathShearY;
this.primData.PathSkew = updatePacket.PathSkew;
this.primData.ProfileBegin = updatePacket.ProfileBegin;
this.primData.ProfileEnd = updatePacket.ProfileEnd;
this.primData.PathCurve = updatePacket.PathCurve;
this.primData.ProfileCurve = updatePacket.ProfileCurve;
this.primData.ProfileHollow = updatePacket.ProfileHollow;
this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
this.primData.PathRevolutions = updatePacket.PathRevolutions;
this.primData.PathTaperX = updatePacket.PathTaperX;
this.primData.PathTaperY = updatePacket.PathTaperY;
this.primData.PathTwist = updatePacket.PathTwist;
this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
}
/// <summary>
///
/// </summary>
/// <param name="tex"></param>
public void UpdateTexture(byte[] tex)
{
this.primData.TextureEntry = tex;
}
/// <summary>
///
/// </summary>
/// <param name="pack"></param>
public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
{
}
/// <summary>
///
/// </summary>
/// <param name="prim"></param>
public void AssignToParent(PrimitiveOld prim)
{
}
#endregion
# region Inventory Methods
/// <summary>
///
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool AddToInventory(InventoryItem item)
{
return false;
}
/// <summary>
///
/// </summary>
/// <param name="itemID"></param>
/// <returns></returns>
public InventoryItem RemoveFromInventory(LLUUID itemID)
{
return null;
}
/// <summary>
///
/// </summary>
/// <param name="simClient"></param>
/// <param name="packet"></param>
public void RequestInventoryInfo(IClientAPI simClient, RequestTaskInventoryPacket packet)
{
}
/// <summary>
///
/// </summary>
/// <param name="simClient"></param>
/// <param name="xferID"></param>
public void RequestXferInventory(IClientAPI simClient, ulong xferID)
{
//will only currently work if the total size of the inventory data array is under about 1000 bytes
SendXferPacketPacket send = new SendXferPacketPacket();
send.XferID.ID = xferID;
send.XferID.Packet = 1 + 2147483648;
send.DataPacket.Data = this.ConvertInventoryToBytes();
simClient.OutPacket(send);
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public byte[] ConvertInventoryToBytes()
{
Encoding enc = Encoding.ASCII;
byte[] result = new byte[0];
List<byte[]> inventoryData = new List<byte[]>();
int totallength = 0;
foreach (InventoryItem invItem in inventoryItems.Values)
{
byte[] data = enc.GetBytes(invItem.ExportString());
inventoryData.Add(data);
totallength += data.Length;
}
//TODO: copy arrays into the single result array
return result;
}
/// <summary>
///
/// </summary>
/// <param name="data"></param>
public void CreateInventoryFromBytes(byte[] data)
{
}
#endregion
#region Update viewers Methods
/// <summary>
///
/// </summary>
/// <param name="remoteClient"></param>
public void SendFullUpdateForAllChildren(IClientAPI remoteClient)
{
this.SendFullUpdateToClient(remoteClient);
for (int i = 0; i < this.children.Count; i++)
{
if (this.children[i] is PrimitiveOld)
{
((PrimitiveOld)this.children[i]).SendFullUpdateForAllChildren(remoteClient);
}
}
}
/// <summary>
///
/// </summary>
/// <param name="remoteClient"></param>
public void SendFullUpdateToClient(IClientAPI remoteClient)
{
LLVector3 lPos;
if (this._physActor != null && this.physicsEnabled)
{
PhysicsVector pPos = this._physActor.Position;
lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
}
else
{
lPos = this.Pos;
}
remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-0000-9999-000000000005"), this.flags);
}
/// <summary>
///
/// </summary>
public void SendFullUpdateToAllClients()
{
List<ScenePresence> avatars = this.m_world.RequestAvatarList();
for (int i = 0; i < avatars.Count; i++)
{
this.SendFullUpdateToClient(avatars[i].ControllingClient);
}
}
/// <summary>
///
/// </summary>
/// <param name="RemoteClient"></param>
public void SendTerseUpdateToClient(IClientAPI RemoteClient)
{
LLVector3 lPos;
Quaternion lRot;
if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?
{
PhysicsVector pPos = this._physActor.Position;
lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
lRot = this._physActor.Orientation;
}
else
{
lPos = this.Pos;
lRot = this.Rotation;
}
LLQuaternion mRot = new LLQuaternion(lRot.x, lRot.y, lRot.z, lRot.w);
RemoteClient.SendPrimTerseUpdate(this.m_regionHandle, 64096, this.LocalId, lPos, mRot);
}
/// <summary>
///
/// </summary>
public void SendTerseUpdateToALLClients()
{
List<ScenePresence> avatars = this.m_world.RequestAvatarList();
for (int i = 0; i < avatars.Count; i++)
{
this.SendTerseUpdateToClient(avatars[i].ControllingClient);
}
}
#endregion
#region Create Methods
/// <summary>
///
/// </summary>
/// <param name="addPacket"></param>
/// <param name="ownerID"></param>
/// <param name="localID"></param>
public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
{
PrimData PData = new PrimData();
this.primData = PData;
this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
PData.OwnerID = ownerID;
PData.PCode = addPacket.ObjectData.PCode;
PData.PathBegin = addPacket.ObjectData.PathBegin;
PData.PathEnd = addPacket.ObjectData.PathEnd;
PData.PathScaleX = addPacket.ObjectData.PathScaleX;
PData.PathScaleY = addPacket.ObjectData.PathScaleY;
PData.PathShearX = addPacket.ObjectData.PathShearX;
PData.PathShearY = addPacket.ObjectData.PathShearY;
PData.PathSkew = addPacket.ObjectData.PathSkew;
PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
PData.Scale = addPacket.ObjectData.Scale;
PData.PathCurve = addPacket.ObjectData.PathCurve;
PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
PData.ParentID = 0;
PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
PData.PathTaperX = addPacket.ObjectData.PathTaperX;
PData.PathTaperY = addPacket.ObjectData.PathTaperY;
PData.PathTwist = addPacket.ObjectData.PathTwist;
PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
LLVector3 pos1 = addPacket.ObjectData.RayEnd;
this.primData.FullID = this.uuid = LLUUID.Random();
this.primData.LocalID = m_localId = (uint)(localID);
this.primData.Position = this.Pos = pos1;
this.updateFlag = 1;
}
/// <summary>
///
/// </summary>
/// <param name="data"></param>
public void CreateFromBytes(byte[] data)
{
}
/// <summary>
///
/// </summary>
/// <param name="primData"></param>
public void CreateFromPrimData(PrimData primData)
{
this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
}
/// <summary>
///
/// </summary>
/// <param name="primData"></param>
/// <param name="posi"></param>
/// <param name="localID"></param>
/// <param name="newprim"></param>
public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
{
}
public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
{
// Console.WriteLine("moving prim to new location " + pos.X + " , " + pos.Y + " , " + pos.Z);
this.Pos = pos;
this.SendTerseUpdateToALLClients();
}
public void GetProperites(IClientAPI client)
{
//needs changing
ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
proper.ObjectData[0].ItemID = LLUUID.Zero;
proper.ObjectData[0].CreationDate = (ulong)primData.CreationDate;
proper.ObjectData[0].CreatorID = primData.OwnerID;
proper.ObjectData[0].FolderID = LLUUID.Zero;
proper.ObjectData[0].FromTaskID = LLUUID.Zero;
proper.ObjectData[0].GroupID = LLUUID.Zero;
proper.ObjectData[0].InventorySerial = 0;
proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
proper.ObjectData[0].ObjectID = this.uuid;
proper.ObjectData[0].OwnerID = primData.OwnerID;
proper.ObjectData[0].TouchName = new byte[0];
proper.ObjectData[0].TextureID = new byte[0];
proper.ObjectData[0].SitName = new byte[0];
proper.ObjectData[0].Name = new byte[0];
proper.ObjectData[0].Description = new byte[0];
proper.ObjectData[0].OwnerMask = primData.OwnerMask;
proper.ObjectData[0].NextOwnerMask = primData.NextOwnerMask;
proper.ObjectData[0].GroupMask = primData.GroupMask;
proper.ObjectData[0].EveryoneMask = primData.EveryoneMask;
proper.ObjectData[0].BaseMask = primData.BaseMask;
client.OutPacket(proper);
}
#endregion
}
}

9
OpenSim/Region/Environment/Scenes/SceneEvents.cs
View File

@ -13,9 +13,6 @@ namespace OpenSim.Region.Environment.Scenes
public delegate void OnNewPresenceDelegate(ScenePresence presence);
public event OnNewPresenceDelegate OnNewPresence;
public delegate void OnNewPrimitiveDelegate(PrimitiveOld prim);
public event OnNewPrimitiveDelegate OnNewPrimitive;
public delegate void OnRemovePresenceDelegate(LLUUID uuid);
public event OnRemovePresenceDelegate OnRemovePresence;
@ -27,12 +24,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public void TriggerOnNewPrimitive(PrimitiveOld prim)
{
if (OnNewPrimitive != null)
OnNewPrimitive(prim);
}
public void TriggerOnNewPresence(ScenePresence presence)
{
if (OnNewPresence != null)