mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 12:25:42 +08:00
Very Preliminary local teleporting added (currently only can teleport within the current region).
Now need to add teleporting between regions and use of the dynamic texture for the terrain.
This commit is contained in:
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
|
||||
public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
|
||||
public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
|
||||
|
||||
public interface IRegionCommsHost
|
||||
public interface IRegionCommsListener
|
||||
{
|
||||
event ExpectUserDelegate OnExpectUser;
|
||||
event GenericCall2 OnExpectChildAgent;
|
||||
@@ -41,12 +41,16 @@ namespace OpenSim.Framework.Interfaces
|
||||
public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
|
||||
public delegate void StartAnim(LLUUID animID, int seq);
|
||||
public delegate void LinkObjects(uint parent, List<uint> children);
|
||||
public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
|
||||
public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
|
||||
|
||||
public delegate void GenericCall(IClientAPI remoteClient);
|
||||
public delegate void GenericCall2();
|
||||
public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
|
||||
public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
|
||||
public delegate void GenericCall5(IClientAPI remoteClient, bool status);
|
||||
public delegate void GenericCall6(LLUUID uid);
|
||||
|
||||
public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
|
||||
public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
|
||||
public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
|
||||
@@ -72,6 +76,9 @@ namespace OpenSim.Framework.Interfaces
|
||||
event SetAppearance OnSetAppearance;
|
||||
event StartAnim OnStartAnim;
|
||||
event LinkObjects OnLinkObjects;
|
||||
event RequestMapBlocks OnRequestMapBlocks;
|
||||
event TeleportLocationRequest OnTeleportLocationRequest;
|
||||
|
||||
event GenericCall4 OnDeRezObject;
|
||||
event GenericCall OnRegionHandShakeReply;
|
||||
event GenericCall OnRequestWearables;
|
||||
@@ -79,6 +86,7 @@ namespace OpenSim.Framework.Interfaces
|
||||
event UpdateAgent OnAgentUpdate;
|
||||
event GenericCall OnRequestAvatarsData;
|
||||
event GenericCall4 OnAddPrim;
|
||||
|
||||
event UpdateShape OnUpdatePrimShape;
|
||||
event ObjectSelect OnObjectSelect;
|
||||
event UpdatePrimFlags OnUpdatePrimFlags;
|
||||
@@ -125,10 +133,15 @@ namespace OpenSim.Framework.Interfaces
|
||||
void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
|
||||
void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
|
||||
void SendLayerData(float[] map);
|
||||
void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos);
|
||||
void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
|
||||
void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
|
||||
AgentCircuitData RequestClientInfo();
|
||||
void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort);
|
||||
void SendMapBlock(List<MapBlockData> mapBlocks);
|
||||
void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
|
||||
void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags);
|
||||
void SendTeleportCancel();
|
||||
void SendTeleportLocationStart();
|
||||
|
||||
void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);
|
||||
void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
|
||||
|
||||
@@ -99,13 +99,13 @@
|
||||
<Compile Include="BlockingQueue.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="IRegionCommsHost.cs">
|
||||
<Compile Include="IRegionCommsListener.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LoginService.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="RegionCommsHostBase.cs">
|
||||
<Compile Include="RegionCommsListener.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Remoting.cs">
|
||||
@@ -183,6 +183,9 @@
|
||||
<Compile Include="Types\Login.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Types\MapBlockData.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Types\NeighbourInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
<include name="AgentInventory.cs" />
|
||||
<include name="AuthenticateSessionBase.cs" />
|
||||
<include name="BlockingQueue.cs" />
|
||||
<include name="IRegionCommsHost.cs" />
|
||||
<include name="IRegionCommsListener.cs" />
|
||||
<include name="LoginService.cs" />
|
||||
<include name="RegionCommsHostBase.cs" />
|
||||
<include name="RegionCommsListener.cs" />
|
||||
<include name="Remoting.cs" />
|
||||
<include name="SimProfile.cs" />
|
||||
<include name="UserProfile.cs" />
|
||||
@@ -42,6 +42,7 @@
|
||||
<include name="Types/AssetStorage.cs" />
|
||||
<include name="Types/EstateSettings.cs" />
|
||||
<include name="Types/Login.cs" />
|
||||
<include name="Types/MapBlockData.cs" />
|
||||
<include name="Types/NeighbourInfo.cs" />
|
||||
<include name="Types/NetworkServersInfo.cs" />
|
||||
<include name="Types/ParcelData.cs" />
|
||||
|
||||
@@ -33,7 +33,7 @@ using OpenSim.Framework.Types;
|
||||
|
||||
namespace OpenSim.Framework
|
||||
{
|
||||
public class RegionCommsHostBase :IRegionCommsHost
|
||||
public class RegionCommsListener :IRegionCommsListener
|
||||
{
|
||||
public event ExpectUserDelegate OnExpectUser;
|
||||
public event GenericCall2 OnExpectChildAgent;
|
||||
25
Common/OpenSim.Framework/Types/MapBlockData.cs
Normal file
25
Common/OpenSim.Framework/Types/MapBlockData.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Framework.Types
|
||||
{
|
||||
public class MapBlockData
|
||||
{
|
||||
public uint Flags;
|
||||
public ushort X;
|
||||
public ushort Y;
|
||||
public byte Agents;
|
||||
public byte Access;
|
||||
public byte WaterHeight;
|
||||
public LLUUID MapImageId;
|
||||
public String Name;
|
||||
public uint RegionFlags;
|
||||
|
||||
public MapBlockData()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user