ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'opensim:master' into master

Browse Source
This commit is contained in:
AdilElFarissi
2024-03-29 03:52:41 +00:00
committed by GitHub
parent 88704a641f e918888e30
commit 7ddf60ad9f
11 changed files with 98 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -648,6 +648,9 @@ namespace OpenSim.Framework
{
Vector3 StartPos { get; set; }
float StartFar { get; set; }
float FOV { get; set; }
int viewHeight { get; set; }
int viewWidth { get; set; }
UUID AgentId { get; }

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

@@ -385,7 +385,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected Dictionary<UUID, ulong> m_groupPowers = new();
protected int m_terrainCheckerCount;
protected uint m_agentFOVCounter;
protected IAssetService m_assetService;
protected bool m_supportViewerCache = false;
@@ -405,6 +405,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
set { m_startpos = value; }
}
public float StartFar { get; set; }
public float FOV { get; set; } = 1.25f;
public int viewHeight { get; set; } = 480;
public int viewWidth { get; set; } = 640;
public UUID AgentId { get { return m_agentId; } }
public UUID ScopeId { get { return m_scopeId; } }
@@ -11595,7 +11599,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (genCounter == 0 || genCounter > m_agentFOVCounter)
{
m_agentFOVCounter = genCounter;
OnAgentFOV?.Invoke(this, fovPacket.FOVBlock.VerticalAngle);
FOV = fovPacket.FOVBlock.VerticalAngle;
OnAgentFOV?.Invoke(this, FOV);
}
}
@@ -11751,6 +11756,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void HandleAgentHeightWidth(Packet Pack)
{
AgentHeightWidthPacket hwPacket = (AgentHeightWidthPacket)Pack;
if (hwPacket.AgentData.AgentID.NotEqual(m_agentId) || hwPacket.AgentData.SessionID.NotEqual(m_sessionId))
return;
viewHeight = hwPacket.HeightWidthBlock.Height;
viewWidth = hwPacket.HeightWidthBlock.Width;
}

4
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@@ -525,7 +525,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public float StartFar { get; set; }
public float FOV { get; set; } = 1.25f;
public int viewHeight { get; set; } = 480;
public int viewWidth { get; set; } = 640;
public bool TryGet<T>(out T iface)
{
iface = default(T);

3
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@@ -567,6 +567,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
}
public float StartFar { get; set; }
public float FOV { get; set; } = 1.25f;
public int viewHeight { get; set; } = 480;
public int viewWidth { get; set; } = 640;
public virtual UUID AgentId
{

39
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -13339,6 +13339,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return LSL_Rotation.Identity;
}
public LSL_Float llGetCameraFOV()
{
if (m_item.PermsGranter.IsZero())
return LSL_Float.Zero;
if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
{
Error("llGetCameraAspect", "No permissions to track the camera");
return LSL_Float.Zero;
}
ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence is not null && presence.ControllingClient is not null)
{
return new LSL_Float(presence.ControllingClient.FOV);
}
return 1.4f;
}
public LSL_Float llGetCameraAspect()
{
if (m_item.PermsGranter.IsZero())
return 1f;
if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
{
Error("llGetCameraAspect", "No permissions to track the camera");
return 1f;
}
ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence is not null && presence.ControllingClient is not null)
{
int h = presence.ControllingClient.viewHeight;
return new LSL_Float(h > 0 ? (float)presence.ControllingClient.viewWidth / h : 1.0f);
}
return 1f;
}
public void llSetPrimURL(string url)
{
Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead");

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@@ -129,6 +129,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Integer llGetAttached();
LSL_List llGetAttachedList(LSL_Key id);
LSL_List llGetBoundingBox(string obj);
LSL_Float llGetCameraAspect();
LSL_Float llGetCameraFOV();
LSL_Vector llGetCameraPos();
LSL_Rotation llGetCameraRot();
LSL_Vector llGetCenterOfMass();

12
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@@ -512,6 +512,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llGetBoundingBox(obj);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public LSL_Float llGetCameraAspect()
{
return m_LSL_Functions.llGetCameraAspect();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public LSL_Float llGetCameraFOV()
{
return m_LSL_Functions.llGetCameraFOV();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public LSL_Vector llGetCameraPos()
{

22
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@@ -1398,6 +1398,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
LSLString r = (LSLString)right;
ret = string.CompareOrdinal(lsl.m_string, r.m_string);
}
else if (left is string ssl)
{
ret = string.CompareOrdinal(ssl, right as string);
}
else if (left is LSLFloat fl)
{
LSLFloat r = (LSLFloat)right;
@@ -1418,10 +1422,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
return 0;
}
if (ascending)
return ret;
return -ret;
return ascending ? ret : -ret;
}
class HomogeneousComparer : IComparer
@@ -1449,6 +1450,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
LSLString r = (LSLString)right;
ret = string.CompareOrdinal(lsl.m_string, r.m_string);
}
else if (left is string ssl)
{
ret = string.CompareOrdinal(ssl, right as string);
}
else if (left is LSLFloat fl)
{
LSLFloat r = (LSLFloat)right;
@@ -1491,6 +1496,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
LSLString r = (LSLString)right;
return string.CompareOrdinal(lsl.m_string, r.m_string) > 0;
}
else if (left is string ssl)
{
return string.CompareOrdinal(ssl, right as string) > 0;
}
if (left is LSLFloat lf)
{
LSLFloat r = (LSLFloat)right;
@@ -1524,6 +1533,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
LSLString r = (LSLString)right;
return string.CompareOrdinal(lsl.m_string, r.m_string) < 0;
}
else if (left is string ssl)
{
string sr = right as string;
return string.CompareOrdinal(ssl, sr) < 0;
}
if (left is LSLFloat lf)
{
LSLFloat r = (LSLFloat)right;

2
OpenSim/Region/ScriptEngine/YEngine/MMRDelegateCommon.cs
View File

@@ -97,7 +97,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
{
Name = "CustomDelegateAssembly"
};
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assembly, AssemblyBuilderAccess.Run);
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assembly, AssemblyBuilderAccess.RunAndCollect);
delegateModuleBuilder = assemblyBuilder.DefineDynamicModule("CustomDelegateModule");
}

3
OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs
View File

@@ -163,8 +163,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
finally
{
if(objectTokens != null)
objectTokens.Close();
objectTokens?.Close();
}
// We enter all script event handler methods in the ScriptEventHandler table.

13
OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjWriter.cs
View File

@@ -64,11 +64,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
private static readonly Dictionary<string, Type> string2Type = PopulateS2T();
private static readonly Dictionary<Type, string> type2String = PopulateT2S();
private static readonly MethodInfo monoGetCurrentOffset = typeof(ILGenerator).GetMethod("Mono_GetCurrentOffset",
BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic, null,
new Type[] { typeof(ILGenerator) }, null);
private static readonly OpCode[] opCodesLdcI4M1P8 = new OpCode[] {
private static readonly OpCode[] opCodesLdcI4M1P8 = new OpCode[]
{
OpCodes.Ldc_I4_M1, OpCodes.Ldc_I4_0, OpCodes.Ldc_I4_1, OpCodes.Ldc_I4_2, OpCodes.Ldc_I4_3,
OpCodes.Ldc_I4_4, OpCodes.Ldc_I4_5, OpCodes.Ldc_I4_6, OpCodes.Ldc_I4_7, OpCodes.Ldc_I4_8
};
@@ -394,11 +391,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
while(true)
{
// Get IL instruction offset at beginning of instruction.
offset = 0;
if((ilGen != null) && (monoGetCurrentOffset != null))
{
offset = (int)monoGetCurrentOffset.Invoke(null, ilGenArg);
}
offset = ilGen is null ? 0 : ilGen.ILOffset;
// Read and decode next internal format code from input file (.xmrobj file).
ScriptObjWriterCode code = (ScriptObjWriterCode)objReader.ReadByte();