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

revert introduction of some in arguments

Browse Source
This commit is contained in:
UbitUmarov
2022-10-23 21:00:56 +01:00
parent 37844d22ea
commit f5883d8ce6
22 changed files with 125 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Console/RemoteConsole.cs
View File

@@ -610,7 +610,7 @@ namespace OpenSim.Framework.Console
// Check if there is anything to send. Return true if this client has
// lines pending.
protected bool HasEvents(in UUID RequestID, in UUID sessionID)
protected bool HasEvents(UUID RequestID, UUID sessionID)
{
ConsoleConnection c = null;
@@ -627,7 +627,7 @@ namespace OpenSim.Framework.Console
}
// Send all pending output to the client.
protected Hashtable GetEvents(in UUID RequestID, in UUID sessionID)
protected Hashtable GetEvents(UUID RequestID, UUID sessionID)
{
// Find the connection that goes with this client.
ConsoleConnection c = null;
@@ -716,7 +716,7 @@ namespace OpenSim.Framework.Console
// This is really just a no-op. It generates what is sent
// to the client if the poll times out without any events.
protected Hashtable NoEvents(in UUID RequestID, in UUID id)
protected Hashtable NoEvents(UUID RequestID, UUID id)
{
Hashtable result = new Hashtable();

2
OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpRequestParser.cs
View File

@@ -433,7 +433,7 @@ namespace OSHttpServer.Parser
return handledBytes;
}
static int GetLineBreakSize(in byte[] buffer, int offset)
static int GetLineBreakSize(byte[] buffer, int offset)
{
byte c = buffer[offset];
if (c == '\r')

11
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
View File

@@ -31,13 +31,12 @@ using OpenMetaverse;
namespace OpenSim.Framework.Servers.HttpServer
{
public delegate OSHttpResponse RequestMethod(in UUID ID, OSHttpRequest request);
public delegate bool HasEventsMethod(in UUID requestID, in UUID pId);
public delegate OSHttpResponse RequestMethod(UUID ID, OSHttpRequest request);
public delegate bool HasEventsMethod(UUID requestID, UUID pId);
public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
public delegate Hashtable GetEventsMethod(in UUID requestID, in UUID pId);
public delegate Hashtable NoEventsMethod(in UUID requestID, in UUID pId);
public delegate void DropMethod(in UUID requestID, in UUID pId);
public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
public delegate void DropMethod(UUID requestID, UUID pId);
public class PollServiceEventArgs : EventArgs
{

8
OpenSim/Framework/Util.cs
View File

@@ -1281,14 +1281,6 @@ namespace OpenSim.Framework
*dst++ = LowNibbleToHexByteCharLowcaps(b);
}
}
/*
for (int i = 0, j = 0; i < bytes.Length; ++i)
{
byte b = bytes[i];
chars[j++] = HighNibbleToHexByteCharLowcaps(b);
chars[j++] = LowNibbleToHexByteCharLowcaps(b);
}
*/
});
}

8
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.Linden
new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, Drop, agentID, VIEWERKEEPALIVE));
}
public bool HasEvents(in UUID _, in UUID agentID)
public bool HasEvents(UUID _, UUID agentID)
{
Queue<byte[]> queue = GetQueue(agentID);
if (queue != null)
@@ -451,14 +451,14 @@ namespace OpenSim.Region.ClientStack.Linden
}
}
public void Drop(in UUID requestID, in UUID pAgentId)
public void Drop(UUID requestID, UUID pAgentId)
{
// do nothing, in last case http server will do it
}
private static readonly byte[] EventHeader = osUTF8.GetASCIIBytes("<llsd><map><key>events</key><array>");
public Hashtable GetEvents(in UUID requestID, in UUID pAgentId)
public Hashtable GetEvents(UUID requestID, UUID pAgentId)
{
if (DebugLevel >= 2)
m_log.Warn($"POLLED FOR EQ MESSAGES BY {pAgentId} in {m_scene.Name}");
@@ -551,7 +551,7 @@ namespace OpenSim.Region.ClientStack.Linden
return responsedata;
}
public Hashtable NoEvents(in UUID _, in UUID agentID)
public Hashtable NoEvents(UUID _, UUID agentID)
{
return new Hashtable()
{

10
OpenSim/Region/ClientStack/Linden/Caps/FetchLibDescModule.cs
View File

@@ -190,13 +190,13 @@ namespace OpenSim.Region.ClientStack.Linden
{
m_module = module;
HasEvents = delegate (in UUID requestID, in UUID _)
HasEvents = delegate (UUID requestID, UUID _)
{
lock (responses)
return responses.ContainsKey(requestID);
};
Drop = delegate (in UUID requestID, in UUID _)
Drop = delegate (UUID requestID, UUID _)
{
lock (responses)
{
@@ -206,7 +206,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
GetEvents = delegate (in UUID requestID, in UUID _)
GetEvents = delegate (UUID requestID, UUID _)
{
lock (responses)
{
@@ -221,7 +221,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
Request = delegate(in UUID requestID, OSHttpRequest request)
Request = delegate(UUID requestID, OSHttpRequest request)
{
APollRequest reqinfo = new APollRequest();
reqinfo.thepoll = this;
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ClientStack.Linden
return null;
};
NoEvents = delegate (in UUID _, in UUID _)
NoEvents = delegate (UUID _, UUID _)
{
Hashtable response = new Hashtable();
response["int_response_code"] = 500;

10
OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
View File

@@ -199,7 +199,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_scene = scene;
m_hgassets = HGAssetSVC;
HasEvents = delegate(in UUID requestID, in UUID _)
HasEvents = delegate(UUID requestID, UUID _)
{
lock (responses)
{
@@ -207,7 +207,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
Drop = delegate(in UUID requestID, in UUID _)
Drop = delegate(UUID requestID, UUID _)
{
lock (responses)
{
@@ -217,7 +217,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
GetEvents = delegate(in UUID requestID, in UUID _)
GetEvents = delegate(UUID requestID, UUID _)
{
lock (responses)
{
@@ -237,7 +237,7 @@ namespace OpenSim.Region.ClientStack.Linden
return new Hashtable();
};
Request = delegate (in UUID requestID, OSHttpRequest request)
Request = delegate (UUID requestID, OSHttpRequest request)
{
APollRequest reqinfo = new()
{
@@ -251,7 +251,7 @@ namespace OpenSim.Region.ClientStack.Linden
};
// this should never happen except possible on shutdown
NoEvents = delegate (in UUID _, in UUID _)
NoEvents = delegate (UUID _, UUID _)
{
/*
lock (requests)

10
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@@ -241,13 +241,13 @@ namespace OpenSim.Region.ClientStack.Linden
{
m_module = module;
HasEvents = delegate (in UUID requestID, in UUID _)
HasEvents = delegate (UUID requestID, UUID _)
{
lock (responses)
return responses.ContainsKey(requestID);
};
Drop = delegate (in UUID requestID, in UUID _)
Drop = delegate (UUID requestID, UUID _)
{
lock (responses)
{
@@ -257,7 +257,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
GetEvents = delegate (in UUID requestID, in UUID _)
GetEvents = delegate (UUID requestID, UUID _)
{
lock (responses)
{
@@ -272,7 +272,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
Request = delegate (in UUID requestID, OSHttpRequest request)
Request = delegate (UUID requestID, OSHttpRequest request)
{
APollRequest reqinfo = new APollRequest();
reqinfo.thepoll = this;
@@ -282,7 +282,7 @@ namespace OpenSim.Region.ClientStack.Linden
return null;
};
NoEvents = delegate (in UUID _, in UUID _)
NoEvents = delegate (UUID _, UUID _)
{
Hashtable response = new Hashtable();
response["int_response_code"] = 500;

10
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@@ -537,7 +537,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
}
}
protected Hashtable NoEvents(in UUID requestID, in UUID sessionID)
protected Hashtable NoEvents(UUID requestID, UUID sessionID)
{
Hashtable response = new Hashtable();
UrlData url;
@@ -569,7 +569,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
return response;
}
protected bool HasEvents(in UUID requestID, in UUID sessionID)
protected bool HasEvents(UUID requestID, UUID sessionID)
{
UrlData url=null;
@@ -591,7 +591,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
}
}
protected void Drop(in UUID requestID, in UUID _)
protected void Drop(UUID requestID, UUID _)
{
UrlData url = null;
lock (m_RequestMap)
@@ -608,7 +608,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
}
}
protected Hashtable GetEvents(in UUID requestID, in UUID sessionID)
protected Hashtable GetEvents(UUID requestID, UUID sessionID)
{
UrlData url = null;
@@ -689,7 +689,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
return resp;
}
public OSHttpResponse HttpRequestHandler(in UUID requestID, OSHttpRequest request)
public OSHttpResponse HttpRequestHandler(UUID requestID, OSHttpRequest request)
{
lock (request)
{

6
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@@ -817,13 +817,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private static warp_Vector ConvertVector(in Vector3 vector)
private static warp_Vector ConvertVector(Vector3 vector)
{
return new warp_Vector(vector.X, vector.Z, vector.Y);
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private static warp_Quaternion ConvertQuaternion(in Quaternion quat)
private static warp_Quaternion ConvertQuaternion(Quaternion quat)
{
return new warp_Quaternion(quat.X, quat.Z, quat.Y, -quat.W);
}
@@ -835,7 +835,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
return c;
}
private static Vector3 SurfaceNormal(in Vector3 c1, in Vector3 c2, in Vector3 c3)
private static Vector3 SurfaceNormal(Vector3 c1, Vector3 c2, Vector3 c3)
{
Vector3 normal = Vector3.Cross(c2 - c1, c3 - c1);
normal.Normalize();

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -5370,7 +5370,7 @@ Label_GroupsDone:
/// <param name="fullID"></param>
/// <param name="sop"></param>
/// <returns></returns>
public bool TryGetSceneObjectPart(in UUID fullID, out SceneObjectPart sop)
public bool TryGetSceneObjectPart(UUID fullID, out SceneObjectPart sop)
{
return m_sceneGraph.TryGetSceneObjectPart(fullID, out sop);
}

20
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -952,7 +952,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
/// <param name="agentID"></param>
/// <returns>null if the presence was not found</returns>
protected internal ScenePresence GetScenePresence(in UUID agentID)
protected internal ScenePresence GetScenePresence(UUID agentID)
{
bool entered = false;
try
@@ -984,7 +984,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="firstName"></param>
/// <param name="lastName"></param>
/// <returns>null if the presence was not found</returns>
protected internal ScenePresence GetScenePresence(in string firstName, in string lastName)
protected internal ScenePresence GetScenePresence(string firstName, string lastName)
{
List<ScenePresence> presences = GetScenePresences();
foreach (ScenePresence presence in CollectionsMarshal.AsSpan(presences))
@@ -1023,7 +1023,7 @@ namespace OpenSim.Region.Framework.Scenes
return null;
}
protected internal bool TryGetScenePresence(in UUID agentID, out ScenePresence avatar)
protected internal bool TryGetScenePresence(UUID agentID, out ScenePresence avatar)
{
bool entered = false;
try
@@ -1048,7 +1048,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
protected internal bool TryGetAvatarByName(in string name, out ScenePresence avatar)
protected internal bool TryGetAvatarByName(string name, out ScenePresence avatar)
{
List<ScenePresence> presences = GetScenePresences();
foreach (ScenePresence presence in CollectionsMarshal.AsSpan(presences))
@@ -1095,7 +1095,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
/// <param name="fullID"></param>
/// <returns>null if no scene object group containing that prim is found</returns>
public SceneObjectGroup GetGroupByPrim(in UUID fullID)
public SceneObjectGroup GetGroupByPrim(UUID fullID)
{
bool entered = false;
try
@@ -1162,7 +1162,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
/// <param name="fullID">UUID of the group</param>
/// <returns>null if no such group was found</returns>
protected internal SceneObjectGroup GetSceneObjectGroup(in UUID fullID)
protected internal SceneObjectGroup GetSceneObjectGroup(UUID fullID)
{
if (Entities.TryGetValue(fullID, out EntityBase entity) && (entity is SceneObjectGroup sog))
return sog;
@@ -1186,7 +1186,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
/// <param name="name"></param>
/// <returns>null if the part was not found</returns>
protected internal SceneObjectGroup GetSceneObjectGroup(in string name)
protected internal SceneObjectGroup GetSceneObjectGroup(string name)
{
foreach(EntityBase entity in Entities.GetEntities().AsSpan())
{
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
/// <param name="fullID"></param>
/// <returns>null if the part was not found</returns>
protected internal SceneObjectPart GetSceneObjectPart(in UUID fullID)
protected internal SceneObjectPart GetSceneObjectPart(UUID fullID)
{
bool entered = false;
try
@@ -1257,7 +1257,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
protected internal bool TryGetSceneObjectPart(in UUID fullID, out SceneObjectPart sop)
protected internal bool TryGetSceneObjectPart(UUID fullID, out SceneObjectPart sop)
{
bool entered = false;
try
@@ -1292,7 +1292,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
/// <param name="name"></param>
/// <returns>null if the part was not found</returns>
protected internal SceneObjectPart GetSceneObjectPart(in string name)
protected internal SceneObjectPart GetSceneObjectPart(string name)
{
SceneObjectPart[] parts = GetPartsArray();
foreach (SceneObjectPart sop in parts)

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -4426,7 +4426,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Move this scene object
/// </summary>
/// <param name="pos"></param>
public void UpdateGroupPosition(in Vector3 pos)
public void UpdateGroupPosition(Vector3 pos)
{
if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
{

12
OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
View File

@@ -448,11 +448,13 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
public virtual PhysicsInertiaData GetInertiaData()
{
PhysicsInertiaData data = new PhysicsInertiaData();
data.TotalMass = this.Mass;
data.CenterOfMass = CenterOfMass - Position;
data.Inertia = Vector3.Zero;
data.InertiaRotation = Vector4.Zero;
PhysicsInertiaData data = new()
{
TotalMass = Mass,
CenterOfMass = CenterOfMass - Position,
Inertia = Vector3.Zero,
InertiaRotation = Vector4.Zero
};
return data;
}

41
OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
View File

@@ -1629,7 +1629,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void round(ref Vector3 v, int digits)
public static void round(ref Vector3 v, int digits)
{
v.X = MathF.Round(v.X, digits);
v.Y = MathF.Round(v.Y, digits);
@@ -1880,10 +1880,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
changePhysicsStatus(false);
}
/*
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void changeShape(PrimitiveBaseShape arg)
{
}
*/
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void changeAvatarSize(strAvatarSize st)
@@ -2036,7 +2038,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (Body != IntPtr.Zero)
SafeNativeMethods.BodyEnable(Body);
}
/*
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void changeSetTorque(Vector3 newTorque)
{
@@ -2081,6 +2083,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
private void changeBuilding(bool arg)
{
}
*/
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void setFreeMove()
@@ -2174,7 +2177,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
return false;
}
// nasty switch
switch (what)
{
case changes.Add:
@@ -2192,6 +2194,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
changeOrientation((Quaternion)arg);
break;
/*
case changes.PosOffset:
donullchange();
break;
@@ -2199,7 +2202,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
case changes.OriOffset:
donullchange();
break;
*/
case changes.Velocity:
changeVelocity((Vector3)arg);
break;
@@ -2208,17 +2211,19 @@ namespace OpenSim.Region.PhysicsModule.ubOde
changeTargetVelocity((Vector3)arg);
break;
//case changes.Acceleration:
// changeacceleration((Vector3)arg);
// break;
//case changes.AngVelocity:
// changeangvelocity((Vector3)arg);
// break;
/*
case changes.Acceleration:
changeacceleration((Vector3)arg);
break;
case changes.AngVelocity:
changeangvelocity((Vector3)arg);
break;
*/
case changes.Force:
changeForce((Vector3)arg);
break;
/*
case changes.Torque:
changeSetTorque((Vector3)arg);
break;
@@ -2234,7 +2239,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
case changes.AngLock:
changeAngularLock((byte)arg);
break;
*/
case changes.Size:
changeSize((Vector3)arg);
break;
@@ -2263,7 +2268,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
changePIDHoverActive((bool)arg);
break;
/* not in use for now
/*
case changes.Shape:
changeShape((PrimitiveBaseShape)arg);
break;
@@ -2275,11 +2280,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
case changes.VolumeDtc:
changeVolumedetetion((bool)arg);
break;
*/
case changes.Physical:
changePhysicsStatus((bool)arg);
break;
/*
case changes.Selected:
changeSelectedStatus((bool)arg);
break;
@@ -2292,12 +2297,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
changeBuilding((bool)arg);
break;
*/
case changes.Null:
donullchange();
break;
//case changes.Null:
default:
donullchange();
break;
}
return false;

8
OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
View File

@@ -666,7 +666,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
m_ffactor = 1f;
}
public static Vector3 Xrot(in Quaternion rot)
public static Vector3 Xrot(Quaternion rot)
{
Vector3 vec;
rot.Normalize(); // just in case
@@ -676,7 +676,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
return vec;
}
public static Vector3 Zrot(in Quaternion rot)
public static Vector3 Zrot(Quaternion rot)
{
Vector3 vec;
rot.Normalize(); // just in case
@@ -690,7 +690,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
private const float pi = MathF.PI;
private const float halfpi = 0.5f * MathF.PI;
public static Vector3 ubRot2Euler(in Quaternion rot)
public static Vector3 ubRot2Euler(Quaternion rot)
{
// returns roll in X
// pitch in Y
@@ -732,7 +732,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
return vec;
}
public static void GetRollPitch(in Quaternion rot, out float roll, out float pitch)
public static void GetRollPitch(Quaternion rot, out float roll, out float pitch)
{
// assuming rot is normalised
// rot.Normalize();

97
OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
View File

@@ -100,7 +100,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
public unsafe Mesh Scale(Vector3 scale)
{
Mesh result = new Mesh(false);
Mesh result = new(false);
float x = scale.X;
float y = scale.Y;
@@ -154,7 +154,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
public Mesh Clone()
{
Mesh result = new Mesh(false);
Mesh result = new(false);
if (m_bdata != null)
{
@@ -209,7 +209,6 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
throw new NotSupportedException("Attempt to Add to a pinned Mesh");
triangle.v1.X = (float)Math.Round(triangle.v1.X, 6);
triangle.v1.Y = (float)Math.Round(triangle.v1.Y, 6);
triangle.v1.Z = (float)Math.Round(triangle.v1.Z, 6);
@@ -294,7 +293,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
public List<Vector3> getVertexList()
{
List<Vector3> result = new List<Vector3>();
List<Vector3> result = new(m_bdata.m_vertices.Count);
foreach (Vertex v in m_bdata.m_vertices.Keys)
{
result.Add(new Vector3(v.X, v.Y, v.Z));
@@ -307,7 +306,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if (m_bdata.m_vertices == null)
throw new NotSupportedException();
float[] result = new float[m_bdata.m_vertices.Count * 3];
int k = 0;
int k;
foreach (KeyValuePair<Vertex, int> kvp in m_bdata.m_vertices)
{
Vertex v = kvp.Key;
@@ -432,10 +431,10 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
throw new NotSupportedException("Attempt to Append to a pinned Mesh");
if (!(newMesh is Mesh))
if (newMesh is not Mesh nmesh)
return;
foreach (Triangle t in ((Mesh)newMesh).m_bdata.m_triangles)
foreach (Triangle t in nmesh.m_bdata.m_triangles)
Add(t);
}
@@ -461,20 +460,18 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
public void DumpRaw(String path, String name, String title)
{
if (path == null)
if (path is null)
return;
if (m_bdata == null)
if (m_bdata is null)
return;
String fileName = name + "_" + title + ".raw";
String completePath = System.IO.Path.Combine(path, fileName);
StreamWriter sw = new StreamWriter(completePath);
string completePath = System.IO.Path.Combine(path, $"{name}_{title}.raw");
using StreamWriter sw = new(completePath);
foreach (Triangle t in m_bdata.m_triangles)
{
String s = t.ToStringRaw();
sw.WriteLine(s);
sw.WriteLine(t.ToStringRaw());
}
sw.Close();
}
}
public void TrimExcess()
{
@@ -543,24 +540,22 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
try
{
using(BinaryWriter bw = new BinaryWriter(st))
{
bw.Write(m_vertexCount);
bw.Write(m_indexCount);
using BinaryWriter bw = new(st);
bw.Write(m_vertexCount);
bw.Write(m_indexCount);
for (int i = 0; i < 3 * m_vertexCount; i++)
bw.Write(vertices[i]);
for (int i = 0; i < m_indexCount; i++)
bw.Write(indexes[i]);
bw.Write(m_obb.X);
bw.Write(m_obb.Y);
bw.Write(m_obb.Z);
bw.Write(m_obboffset.X);
bw.Write(m_obboffset.Y);
bw.Write(m_obboffset.Z);
bw.Flush();
bw.Close();
}
for (int i = 0; i < 3 * m_vertexCount; i++)
bw.Write(vertices[i]);
for (int i = 0; i < m_indexCount; i++)
bw.Write(indexes[i]);
bw.Write(m_obb.X);
bw.Write(m_obb.Y);
bw.Write(m_obb.Z);
bw.Write(m_obboffset.X);
bw.Write(m_obboffset.Y);
bw.Write(m_obboffset.Z);
bw.Flush();
bw.Close();
}
catch
{
@@ -572,33 +567,31 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
public static Mesh FromStream(Stream st, AMeshKey key)
{
Mesh mesh = new Mesh(false);
Mesh mesh = new(false);
bool ok = true;
try
{
using(BinaryReader br = new BinaryReader(st))
{
mesh.m_vertexCount = br.ReadInt32();
mesh.m_indexCount = br.ReadInt32();
using BinaryReader br = new(st);
mesh.m_vertexCount = br.ReadInt32();
mesh.m_indexCount = br.ReadInt32();
int n = 3 * mesh.m_vertexCount;
mesh.vertices = new float[n];
for (int i = 0; i < n; i++)
mesh.vertices[i] = br.ReadSingle();
int n = 3 * mesh.m_vertexCount;
mesh.vertices = new float[n];
for (int i = 0; i < n; i++)
mesh.vertices[i] = br.ReadSingle();
mesh.indexes = new int[mesh.m_indexCount];
for (int i = 0; i < mesh.m_indexCount; i++)
mesh.indexes[i] = br.ReadInt32();
mesh.indexes = new int[mesh.m_indexCount];
for (int i = 0; i < mesh.m_indexCount; i++)
mesh.indexes[i] = br.ReadInt32();
mesh.m_obb.X = br.ReadSingle();
mesh.m_obb.Y = br.ReadSingle();
mesh.m_obb.Z = br.ReadSingle();
mesh.m_obb.X = br.ReadSingle();
mesh.m_obb.Y = br.ReadSingle();
mesh.m_obb.Z = br.ReadSingle();
mesh.m_obboffset.X = br.ReadSingle();
mesh.m_obboffset.Y = br.ReadSingle();
mesh.m_obboffset.Z = br.ReadSingle();
}
mesh.m_obboffset.X = br.ReadSingle();
mesh.m_obboffset.Y = br.ReadSingle();
mesh.m_obboffset.Z = br.ReadSingle();
}
catch
{