ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

on ubodeMesher no need for Coord and Quat. Those are just Vector3 and Quaternion

Browse Source
This commit is contained in:
UbitUmarov
2025-06-19 17:48:14 +01:00
parent 628ddc1821
commit 7cf0f73cef
5 changed files with 175 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@@ -45,6 +45,7 @@ using System.Reflection;
using System.IO;
using Mono.Addins;
using System.Buffers;
namespace OpenSim.Region.PhysicsModule.ubODEMeshing
{
@@ -172,7 +173,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
/// <param name="size">Size of entire object</param>
/// <param name="coords"></param>
/// <param name="faces"></param>
private unsafe void AddSubMesh(OSDMap subMeshData, List<Coord> coords, List<Face> faces)
private unsafe void AddSubMesh(OSDMap subMeshData, List<Vector3> coords, List<Face> faces)
{
// Console.WriteLine("subMeshMap for {0} - {1}", primName, Util.GetFormattedXml((OSD)subMeshMap));
@@ -220,7 +221,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
ushort uZ = Utils.BytesToUInt16(ptr);
ptr += 2;
coords.Add(new Coord(
coords.Add(new Vector3(
uX * posRange.X + posMin.X,
uY * posRange.Y + posMin.Y,
uZ * posRange.Z + posMin.Z)
@@ -260,7 +261,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
// "[MESH]: Creating physics proxy for {0}, shape {1}",
// primName, (OpenMetaverse.SculptType)primShape.SculptType);
List<Coord> coords;
List<Vector3> coords;
List<Face> faces;
bool needsConvexProcessing = convex;
@@ -323,7 +324,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if(needsConvexProcessing)
{
if(CreateBoundingHull(coords, out List<Coord> convexcoords, out List<Face> convexfaces) && convexcoords != null && convexfaces != null)
if(CreateBoundingHull(coords, out List<Vector3> convexcoords, out List<Face> convexfaces) && convexcoords != null && convexfaces != null)
{
coords.Clear();
coords = convexcoords;
@@ -370,7 +371,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
/// <param name="faces">Faces are added to this list by the method.</param>
/// <returns>true if coords and faces were successfully generated, false if not</returns>
private unsafe bool GenerateCoordsAndFacesFromPrimMeshData(
string primName, PrimitiveBaseShape primShape, out List<Coord> coords, out List<Face> faces, bool convex)
string primName, PrimitiveBaseShape primShape, out List<Vector3> coords, out List<Face> faces, bool convex)
{
// m_log.DebugFormat("[MESH]: experimental mesh proxy generation for {0}", primName);
@@ -380,8 +381,8 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
// SL does the oposite
bool usemesh = false;
coords = new List<Coord>();
faces = new List<Face>();
coords = [];
faces = [];
if (primShape.SculptData == null || primShape.SculptData.Length <= 0)
{
@@ -444,17 +445,15 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
{
using (MemoryStream outMs = new(4 * physSize))
{
using (MemoryStream inMs = new(primShape.SculptData, physOffset, physSize))
using (MemoryStream inMs = new(primShape.SculptData, physOffset + 2 , physSize - 2)) // skip first 2 bytes in header
{
using (DeflateStream decompressionStream = new(inMs, CompressionMode.Decompress))
{
byte[] readBuffer = new byte[8192];
inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
int readLen = 0;
using DeflateStream decompressionStream = new(inMs, CompressionMode.Decompress);
byte[] readBuffer = ArrayPool<byte>.Shared.Rent(8192);
int readLen = 0;
while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
outMs.Write(readBuffer, 0, readLen);
}
while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
outMs.Write(readBuffer, 0, readLen);
ArrayPool<byte>.Shared.Return(readBuffer);
}
outMs.Seek(0, SeekOrigin.Begin);
decodedMeshOsd = OSDParser.DeserializeLLSDBinary(outMs);
@@ -484,13 +483,11 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
{
byte[] data;
List<float3> vs = new();
List<float3> vs = [];
PHullResult hullr = new();
float3 f3;
Vector3 range;
Vector3 min;
const float invMaxU16 = 1.0f / 65535f;
const float invMaxU16 = 1.0f / ushort.MaxValue;
int t1;
int t2;
int t3;
@@ -498,14 +495,10 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
int nverts;
int nindexs;
if (cmap.ContainsKey("Max"))
range = cmap["Max"].AsVector3();
else
if (!cmap.TryGetVector3("Max", out Vector3 range))
range = new Vector3(0.5f, 0.5f, 0.5f);
if (cmap.ContainsKey("Min"))
min = cmap["Min"].AsVector3();
else
if (!cmap.TryGetVector3("Min", out Vector3 min))
min = new Vector3(-0.5f, -0.5f, -0.5f);
range -= min;
@@ -516,7 +509,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
// if mesh data not present and not convex then we need convex decomposition data
if (cmap.ContainsKey("HullList") && cmap.ContainsKey("Positions"))
{
List<int> hsizes = new();
List<int> hsizes = [];
int totalpoints = 0;
data = cmap["HullList"].AsBinary();
for (i = 0; i < data.Length; i++)
@@ -553,12 +546,11 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
t2 = Utils.BytesToUInt16(ptr); ptr += 2;
t3 = Utils.BytesToUInt16(ptr); ptr += 2;
coords.Add(new Coord(
coords.Add(new Vector3(
t1 * range.X + min.X,
t2 * range.Y + min.Y,
t3 * range.Z + min.Z)
);
}
faces.Add(new Face(vertsoffset, vertsoffset + 1, vertsoffset + 2));
@@ -595,7 +587,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
}
for (i = 0; i < vs.Count; i++)
coords.Add(new Coord(vs[i].x, vs[i].y, vs[i].z));
coords.Add(new Vector3(vs[i].x, vs[i].y, vs[i].z));
for (i = 0; i < indices.Count; i += 3)
{
@@ -657,7 +649,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if (nverts < 4)
{
for (i = 0; i < vs.Count; i++)
coords.Add(new Coord(vs[i].x, vs[i].y, vs[i].z));
coords.Add(new Vector3(vs[i].x, vs[i].y, vs[i].z));
faces.Add(new Face(0, 1, 2));
@@ -674,7 +666,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
return false;
for (i = 0; i < vs.Count; i++)
coords.Add(new Coord(vs[i].x, vs[i].y, vs[i].z));
coords.Add(new Vector3(vs[i].x, vs[i].y, vs[i].z));
for (i = 0; i < indices.Count; i += 3)
{
@@ -709,7 +701,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
/// <param name="faces">Faces are added to this list by the method.</param>
/// <returns>true if coords and faces were successfully generated, false if not</returns>
private static bool GenerateCoordsAndFacesFromPrimSculptData(
string primName, PrimitiveBaseShape primShape, float lod, out List<Coord> coords, out List<Face> faces)
string primName, PrimitiveBaseShape primShape, float lod, out List<Vector3> coords, out List<Face> faces)
{
coords = new List<Coord>();
faces = new List<Face>();
@@ -784,10 +776,10 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
/// <returns>true if coords and faces were successfully generated, false if not</returns>
private bool GenerateCoordsAndFacesFromPrimShapeData(
string primName, PrimitiveBaseShape primShape, float lod, bool convex,
out List<Coord> coords, out List<Face> faces)
out List<Vector3> coords, out List<Face> faces)
{
PrimMesh primMesh;
coords = new List<Coord>();
coords = new List<Vector3>();
faces = new List<Face>();
float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
@@ -1286,7 +1278,6 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
{
using(FileStream stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read))
{
// BinaryFormatter bformatter = new BinaryFormatter();
mesh = Mesh.FromStream(stream,key);
}
@@ -1501,7 +1492,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
}
}
public static bool CreateBoundingHull(List<Coord> inputVertices, out List<Coord> convexcoords, out List<Face> newfaces)
public static bool CreateBoundingHull(List<Vector3> inputVertices, out List<Vector3> convexcoords, out List<Face> newfaces)
{
convexcoords = null;
newfaces = null;
@@ -1537,13 +1528,13 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
if(nindx % 3 != 0)
return false;
convexcoords = new List<Coord>(nverts);
Coord c;
convexcoords = new List<Vector3>(nverts);
Vector3 c;
vs = result.OutputVertices;
for(i = 0 ; i < nverts; i++)
{
c = new Coord(vs[i].x, vs[i].y, vs[i].z);
c = new Vector3(vs[i].x, vs[i].y, vs[i].z);
convexcoords.Add(c);
}

468
OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
View File

@@ -27,225 +27,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
using System.Xml.XPath;
using OpenMetaverse;
namespace PrimMesher
{
public struct Quat
{
/// <summary>X value</summary>
public float X;
/// <summary>Y value</summary>
public float Y;
/// <summary>Z value</summary>
public float Z;
/// <summary>W value</summary>
public float W;
public enum MainAxis : int
{
X = 0,
Y = 1,
Z = 2
}
public Quat(float x, float y, float z, float w)
{
X = x;
Y = y;
Z = z;
W = w;
}
public Quat(MainAxis BaseAxis, float angle)
{
switch (BaseAxis)
{
case MainAxis.X:
W = MathF.Cos(0.5f * angle);
X = MathF.Sqrt(1.0f - W * W);
Y = 0;
Z = 0;
break;
case MainAxis.Y:
W = MathF.Cos(0.5f * angle);
Y = MathF.Sqrt(1.0f - W * W);
X = 0;
Z = 0;
break;
case MainAxis.Z:
W = MathF.Cos(0.5f * angle);
Z = MathF.Sqrt(1.0f - W * W);
X = 0;
Y = 0;
break;
default: //error
X = 0;
Y = 0;
Z = 0;
W = 1;
break;
}
}
public float Length()
{
return MathF.Sqrt(X * X + Y * Y + Z * Z + W * W);
}
public Quat Normalize()
{
const float MAG_THRESHOLD = 0.0000001f;
float mag = (X * X + Y * Y + Z * Z + W * W);
// Catch very small rounding errors when normalizing
if (mag > MAG_THRESHOLD)
{
float oomag = 1f / MathF.Sqrt(mag);
X *= oomag;
Y *= oomag;
Z *= oomag;
W *= oomag;
}
else
{
X = 0f;
Y = 0f;
Z = 0f;
W = 1f;
}
return this;
}
public static Quat operator *(Quat q1, Quat q2)
{
float x = q1.W * q2.X + q1.X * q2.W + q1.Y * q2.Z - q1.Z * q2.Y;
float y = q1.W * q2.Y - q1.X * q2.Z + q1.Y * q2.W + q1.Z * q2.X;
float z = q1.W * q2.Z + q1.X * q2.Y - q1.Y * q2.X + q1.Z * q2.W;
float w = q1.W * q2.W - q1.X * q2.X - q1.Y * q2.Y - q1.Z * q2.Z;
return new Quat(x, y, z, w);
}
public override string ToString()
{
return "< X: " + X.ToString() + ", Y: " + Y.ToString() + ", Z: " + Z.ToString() + ", W: " + W.ToString() + ">";
}
}
public struct Coord
{
public float X;
public float Y;
public float Z;
public Coord(float x, float y, float z)
{
X = x;
Y = y;
Z = z;
}
public float Length()
{
return MathF.Sqrt(X * X + Y * Y + Z * Z);
}
public Coord Invert()
{
X = -X;
Y = -Y;
Z = -Z;
return this;
}
public Coord Normalize()
{
const float MAG_THRESHOLD = 0.0000001f;
float mag = Length();
// Catch very small rounding errors when normalizing
if (mag > MAG_THRESHOLD)
{
float oomag = 1.0f / mag;
X *= oomag;
Y *= oomag;
Z *= oomag;
}
else
{
X = 0.0f;
Y = 0.0f;
Z = 0.0f;
}
return this;
}
public override string ToString()
{
return "<"+X.ToString() + "," + Y.ToString() + "," + Z.ToString()+ ">";
}
public static Coord Cross(Coord c1, Coord c2)
{
return new Coord(
c1.Y * c2.Z - c2.Y * c1.Z,
c1.Z * c2.X - c2.Z * c1.X,
c1.X * c2.Y - c2.X * c1.Y
);
}
public static Coord operator +(Coord v, Coord a)
{
return new Coord(v.X + a.X, v.Y + a.Y, v.Z + a.Z);
}
public static Coord operator *(Coord v, Coord m)
{
return new Coord(v.X * m.X, v.Y * m.Y, v.Z * m.Z);
}
public static Coord operator *(Coord v, Quat q)
{
float x = q.X;
float y = q.Y;
float x2 = x + x;
float z = q.Z;
float y2 = y + y;
float w = q.W;
float z2 = z + z;
float zz2 = z * z2;
float xx2 = x * x2;
float xy2 = x * y2;
float xz2 = x * z2;
z = v.Z;
float yy2 = y * y2;
float yz2 = y * z2;
x = v.X;
float wx2 = w * x2;
float wy2 = w * y2;
float wz2 = w * z2;
y = v.Y;
return new Coord(
x * (1.0f - yy2 - zz2) + y * (xy2 - wz2) + z * (xz2 + wy2),
x * (xy2 + wz2) + y * (1.0f - xx2 - zz2) + z * (yz2 - wx2),
x * (xz2 - wy2) + y * (yz2 + wx2) + z * (1.0f - xx2 - yy2));
}
}
public struct Face
{
public int primFace;
// vertices
public int v1;
public int v2;
@@ -253,8 +43,6 @@ namespace PrimMesher
public Face(int _v1, int _v2, int _v3)
{
primFace = 0;
v1 = _v1;
v2 = _v2;
v3 = _v3;
@@ -273,6 +61,12 @@ namespace PrimMesher
X = x; // cos
Y = y; // sin
}
internal Angle(float _angle)
{
angle = _angle; // 1 is 2pi
X = MathF.Cos(angle); // cos
Y = MathF.Sin(angle); // sin
}
}
internal class AngleList
@@ -281,76 +75,76 @@ namespace PrimMesher
private static readonly Angle[] angles3 =
{
new Angle(0.0f, 1.0f, 0.0f),
new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new Angle(1.0f, 1.0f, 0.0f)
new(0.0f, 1.0f, 0.0f),
new(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new(1.0f, 1.0f, 0.0f)
};
private static readonly Angle[] angles4 =
{
new Angle(0.0f, 1.0f, 0.0f),
new Angle(0.25f, 0.0f, 1.0f),
new Angle(0.5f, -1.0f, 0.0f),
new Angle(0.75f, 0.0f, -1.0f),
new Angle(1.0f, 1.0f, 0.0f)
new(0.0f, 1.0f, 0.0f),
new(0.25f, 0.0f, 1.0f),
new(0.5f, -1.0f, 0.0f),
new(0.75f, 0.0f, -1.0f),
new(1.0f, 1.0f, 0.0f)
};
private static readonly Angle[] angles6 =
{
new Angle(0.0f, 1.0f, 0.0f),
new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),
new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new Angle(0.5f, -1.0f, 0.0f),
new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),
new Angle(1.0f, 1.0f, 0.0f)
new(0.0f, 1.0f, 0.0f),
new(0.16666666666666667f, 0.5f, 0.8660254037844386f),
new(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new(0.5f, -1.0f, 0.0f),
new(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new(0.83333333333333326f, 0.5f, -0.86602540378443904f),
new(1.0f, 1.0f, 0.0f)
};
private static readonly Angle[] angles12 =
{
new Angle(0.0f, 1.0f, 0.0f),
new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f),
new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),
new Angle(0.25f, 0.0f, 1.0f),
new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f),
new Angle(0.5f, -1.0f, 0.0f),
new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f),
new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new Angle(0.75f, 0.0f, -1.0f),
new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),
new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f),
new Angle(1.0f, 1.0f, 0.0f)
new(0.0f, 1.0f, 0.0f),
new(0.083333333333333329f, 0.86602540378443871f, 0.5f),
new(0.16666666666666667f, 0.5f, 0.8660254037844386f),
new(0.25f, 0.0f, 1.0f),
new(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new(0.41666666666666663f, -0.86602540378443849f, 0.5f),
new(0.5f, -1.0f, 0.0f),
new(0.58333333333333326f, -0.86602540378443882f, -0.5f),
new(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new(0.75f, 0.0f, -1.0f),
new(0.83333333333333326f, 0.5f, -0.86602540378443904f),
new(0.91666666666666663f, 0.86602540378443837f, -0.5f),
new(1.0f, 1.0f, 0.0f)
};
private static readonly Angle[] angles24 =
{
new Angle(0.0f, 1.0f, 0.0f),
new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f),
new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f),
new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f),
new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),
new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f),
new Angle(0.25f, 0.0f, 1.0f),
new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f),
new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f),
new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f),
new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f),
new Angle(0.5f, -1.0f, 0.0f),
new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f),
new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f),
new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f),
new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f),
new Angle(0.75f, 0.0f, -1.0f),
new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f),
new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),
new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f),
new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f),
new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f),
new Angle(1.0f, 1.0f, 0.0f)
new(0.0f, 1.0f, 0.0f),
new(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f),
new(0.083333333333333329f, 0.86602540378443871f, 0.5f),
new(0.125f, 0.70710678118654757f, 0.70710678118654746f),
new(0.16666666666666667f, 0.5f, 0.8660254037844386f),
new(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f),
new(0.25f, 0.0f, 1.0f),
new(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f),
new(0.33333333333333333f, -0.5f, 0.86602540378443871f),
new(0.375f, -0.70710678118654746f, 0.70710678118654757f),
new(0.41666666666666663f, -0.86602540378443849f, 0.5f),
new(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f),
new(0.5f, -1.0f, 0.0f),
new(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f),
new(0.58333333333333326f, -0.86602540378443882f, -0.5f),
new(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f),
new(0.66666666666666667f, -0.5f, -0.86602540378443837f),
new(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f),
new(0.75f, 0.0f, -1.0f),
new(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f),
new(0.83333333333333326f, 0.5f, -0.86602540378443904f),
new(0.875f, 0.70710678118654735f, -0.70710678118654768f),
new(0.91666666666666663f, 0.86602540378443837f, -0.5f),
new(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f),
new(1.0f, 1.0f, 0.0f)
};
private static Angle interpolatePoints(float newPoint, Angle p1, Angle p2)
@@ -447,10 +241,7 @@ namespace PrimMesher
while (angle <= stopAngleTest)
{
Angle newAngle;
newAngle.angle = angle;
newAngle.X = MathF.Cos(angle);
newAngle.Y = MathF.Sin(angle);
Angle newAngle = new(angle);
angles.Add(newAngle);
step += 1;
angle = (float)(stepSize * step);
@@ -458,22 +249,16 @@ namespace PrimMesher
if (startAngle > angles[0].angle)
{
Angle newAngle;
intersection(angles[0].X, angles[0].Y, angles[1].X, angles[1].Y, 0.0f, 0.0f, MathF.Cos(startAngle), MathF.Sin(startAngle));
newAngle.angle = startAngle;
newAngle.X = iX;
newAngle.Y = iY;
Angle newAngle = new(startAngle, iX, iY);
angles[0] = newAngle;
}
int index = angles.Count - 1;
if (stopAngle < angles[index].angle)
{
Angle newAngle;
intersection(angles[index - 1].X, angles[index - 1].Y, angles[index].X, angles[index].Y, 0.0f, 0.0f, MathF.Cos(stopAngle), MathF.Sin(stopAngle));
newAngle.angle = stopAngle;
newAngle.X = iX;
newAngle.Y = iY;
Angle newAngle = new(stopAngle, iX, iY);
angles[index] = newAngle;
}
}
@@ -489,7 +274,7 @@ namespace PrimMesher
public string errorMessage = null;
public List<Coord> coords;
public List<Vector3> coords;
public List<Face> faces;
// use these for making individual meshes for each prim face
@@ -507,18 +292,30 @@ namespace PrimMesher
public Profile()
{
coords = new List<Coord>();
faces = new List<Face>();
coords = [];
faces = [];
}
public Profile(List<Vector3> _coords)
{
coords = _coords;
faces = [];
}
public Profile(List<Vector3> _coords, List<Face> _faces)
{
coords = _coords;
faces = _faces;
}
public Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool hasProfileCut, bool createFaces)
{
const float halfSqr2 = 0.7071067811866f;
coords = new List<Coord>();
coords = new List<Vector3>();
faces = new List<Face>();
List<Coord> hollowCoords = new();
List<Vector3> hollowCoords = new();
bool hasHollow = (hollow > 0.0f);
@@ -548,7 +345,7 @@ namespace PrimMesher
numOuterVerts = angles.angles.Count;
Angle angle;
Coord newVert = new();
Vector3 newVert = new();
// flag to create as few triangles as possible for 3 or 4 side profile
bool simpleFace = (sides < 5 && !hasHollow && !hasProfileCut);
@@ -583,8 +380,7 @@ namespace PrimMesher
}
else if (!simpleFace)
{
Coord center = new(0.0f, 0.0f, 0.0f);
this.coords.Add(center);
coords.Add(Vector3.Zero);
}
int numAngles = angles.angles.Count;
@@ -809,12 +605,9 @@ namespace PrimMesher
public Profile Copy(bool needFaces)
{
Profile copy = new();
copy.coords.AddRange(coords);
if (needFaces)
copy.faces.AddRange(faces);
Profile copy = needFaces ?
new(new List<Vector3>(coords), new List<Face>(faces)) :
new(new List<Vector3>(coords));
copy.numOuterVerts = numOuterVerts;
copy.numHollowVerts = numHollowVerts;
@@ -822,28 +615,21 @@ namespace PrimMesher
return copy;
}
public void AddPos(Coord v)
public void AddPos(Vector3 v)
{
this.AddPos(v.X, v.Y, v.Z);
for (int i = 0; i < coords.Count; i++)
{
coords[i].Add(v);
}
}
public void AddPos(float x, float y, float z)
{
int i;
int numVerts = coords.Count;
Coord vert;
for (i = 0; i < numVerts; i++)
{
vert = coords[i];
vert.X += x;
vert.Y += y;
vert.Z += z;
coords[i] = vert;
}
Vector3 v = new(x,y,z);
AddPos(v);
}
public void AddRot(Quat q)
public void AddRot(Quaternion q)
{
int i;
int numVerts = coords.Count;
@@ -854,11 +640,8 @@ namespace PrimMesher
public void Scale(float x, float y)
{
int i;
int numVerts = coords.Count;
Coord vert;
for (i = 0; i < numVerts; i++)
Vector3 vert;
for (int i = 0; i < coords.Count; i++)
{
vert = coords[i];
vert.X *= x;
@@ -877,15 +660,13 @@ namespace PrimMesher
/// </summary>
public void FlipNormals()
{
int numFaces = faces.Count;
if(numFaces == 0)
if(coords.Count == 0)
return;
int i;
Face tmpFace;
int tmp;
for (i = 0; i < numFaces; i++)
for (int i = 0; i < faces.Count; i++)
{
tmpFace = faces[i];
tmp = tmpFace.v3;
@@ -897,13 +678,11 @@ namespace PrimMesher
public void AddValue2FaceVertexIndices(int num)
{
int numFaces = faces.Count;
if(numFaces == 0)
if(faces.Count == 0)
return;
Face tmpFace;
for (int i = 0; i < numFaces; i++)
for (int i = 0; i < faces.Count; i++)
{
tmpFace = faces[i];
tmpFace.v1 += num;
@@ -932,8 +711,8 @@ namespace PrimMesher
public struct PathNode
{
public Coord position;
public Quat rotation;
public Vector3 position;
public Quaternion rotation;
public float xScale;
public float yScale;
public float percentOfPath;
@@ -1019,8 +798,8 @@ namespace PrimMesher
float twist = twistBegin + twistTotal * percentOfPath;
newNode.rotation = new Quat(Quat.MainAxis.Z, twist);
newNode.position = new Coord(xOffset, yOffset, zOffset);
newNode.rotation = new Quaternion(Quaternion.MainAxis.Z, twist);
newNode.position = new Vector3(xOffset, yOffset, zOffset);
newNode.percentOfPath = percentOfPath;
pathNodes.Add(newNode);
@@ -1116,16 +895,16 @@ namespace PrimMesher
float zOffset = MathF.Sin(angle + topShearY) * (0.5f - yPathScale) * radiusScale;
newNode.position = new Coord(xOffset, yOffset, zOffset);
newNode.position = new Vector3(xOffset, yOffset, zOffset);
// now orient the rotation of the profile layer relative to it's position on the path
// adding taperY to the angle used to generate the quat appears to approximate the viewer
newNode.rotation = new Quat(Quat.MainAxis.X, angle + topShearY);
newNode.rotation = new Quaternion(Quaternion.MainAxis.X, angle + topShearY);
// next apply twist rotation to the profile layer
if (twistTotal != 0.0f || twistBegin != 0.0f)
newNode.rotation *= new Quat(Quat.MainAxis.Z, twist);
newNode.rotation *= new Quaternion(Quaternion.MainAxis.Z, twist);
newNode.percentOfPath = percentOfPath;
@@ -1151,8 +930,7 @@ namespace PrimMesher
public class PrimMesh
{
public string errorMessage = "";
public List<Coord> coords;
// public List<Coord> normals;
public List<Vector3> coords;
public List<Face> faces;
private int sides = 4;
@@ -1238,7 +1016,7 @@ namespace PrimMesher
/// <param name="sphereMode"></param>
public PrimMesh(int _sides, float _profileStart, float _profileEnd, float _hollow, int _hollowSides)
{
coords = new List<Coord>();
coords = new List<Vector3>();
faces = new List<Face>();
sides = _sides;
@@ -1272,7 +1050,7 @@ namespace PrimMesher
{
bool needEndFaces;
coords = new List<Coord>();
coords = new List<Vector3>();
faces = new List<Face>();
int steps = 1;
@@ -1366,7 +1144,7 @@ namespace PrimMesher
if (initialProfileRot != 0.0f)
{
profile.AddRot(new Quat(Quat.MainAxis.Z, initialProfileRot));
profile.AddRot(new Quaternion(Quaternion.MainAxis.Z, initialProfileRot));
}
Path path = new()
@@ -1515,19 +1293,19 @@ namespace PrimMesher
// more cleanup will be done at Meshmerizer.cs
}
private static Coord SurfaceNormal(Coord c1, Coord c2, Coord c3)
private static Vector3 SurfaceNormal(Vector3 c1, Vector3 c2, Vector3 c3)
{
Coord edge1 = new(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
Coord edge2 = new(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
Vector3 edge1 = new(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
Vector3 edge2 = new(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
Coord normal = Coord.Cross(edge1, edge2);
Vector3 normal = Vector3.Cross(edge1, edge2);
normal.Normalize();
return normal;
}
private Coord SurfaceNormal(Face face)
private Vector3 SurfaceNormal(Face face)
{
return SurfaceNormal(coords[face.v1], coords[face.v2], coords[face.v3]);
}
@@ -1537,7 +1315,7 @@ namespace PrimMesher
/// </summary>
/// <param name="faceIndex"></param>
/// <returns></returns>
public Coord SurfaceNormal(int faceIndex)
public Vector3 SurfaceNormal(int faceIndex)
{
int numFaces = faces.Count;
if (faceIndex < 0 || faceIndex >= numFaces)
@@ -1574,7 +1352,7 @@ namespace PrimMesher
numPrimFaces = numPrimFaces,
errorMessage = errorMessage,
coords = new List<Coord>(coords),
coords = new List<Vector3>(coords),
faces = new List<Face>(faces)
};
@@ -1591,7 +1369,7 @@ namespace PrimMesher
{
int i;
int numVerts = coords.Count;
Coord vert;
Vector3 vert;
for (i = 0; i < numVerts; i++)
{
@@ -1607,7 +1385,7 @@ namespace PrimMesher
/// Rotates the mesh
/// </summary>
/// <param name="q"></param>
public void AddRot(Quat q)
public void AddRot(Quaternion q)
{
int i;
int numVerts = coords.Count;
@@ -1628,7 +1406,7 @@ namespace PrimMesher
int numVerts = this.coords.Count;
//Coord vert;
Coord m = new(x, y, z);
Vector3 m = new(x, y, z);
for (i = 0; i < numVerts; i++)
coords[i] *= m;
}

9
OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
View File

@@ -27,11 +27,12 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Drawing;
using System.Drawing.Imaging;
using OpenMetaverse;
namespace PrimMesher
{
public class SculptMap
@@ -146,14 +147,14 @@ namespace PrimMesher
for (rowNdx = 0; rowNdx < numRows; rowNdx++)
{
List<Coord> row = new List<Coord>(numCols);
List<Vector3> row = new List<Vector3>(numCols);
for (colNdx = 0; colNdx < numCols; colNdx++)
{
if (mirror)
row.Add(new Coord(-((float)redBytes[smNdx] * pixScale - 0.5f), ((float)greenBytes[smNdx] * pixScale - 0.5f), (float)blueBytes[smNdx] * pixScale - 0.5f));
row.Add(new Vector3(-((float)redBytes[smNdx] * pixScale - 0.5f), ((float)greenBytes[smNdx] * pixScale - 0.5f), (float)blueBytes[smNdx] * pixScale - 0.5f));
else
row.Add(new Coord((float)redBytes[smNdx] * pixScale - 0.5f, (float)greenBytes[smNdx] * pixScale - 0.5f, (float)blueBytes[smNdx] * pixScale - 0.5f));
row.Add(new Vector3((float)redBytes[smNdx] * pixScale - 0.5f, (float)greenBytes[smNdx] * pixScale - 0.5f, (float)blueBytes[smNdx] * pixScale - 0.5f));
++smNdx;
}

26
OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMesh.cs
View File

@@ -27,11 +27,11 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
using System.Drawing;
using System.Drawing.Imaging;
using OpenMetaverse;
namespace PrimMesher
{
@@ -51,14 +51,14 @@ namespace PrimMesher
SculptMap smap = new SculptMap(sculptBitmap, lod);
List<List<Coord>> rows = smap.ToRows(mirror);
List<List<Vector3>> rows = smap.ToRows(mirror);
_SculptMesh(rows, sculptType, invert);
}
private void _SculptMesh(List<List<Coord>> rows, SculptType sculptType, bool invert)
private void _SculptMesh(List<List<Vector3>> rows, SculptType sculptType, bool invert)
{
coords = new List<Coord>();
coords = new List<Vector3>();
faces = new List<Face>();
sculptType = (SculptType)(((int)sculptType) & 0x07);
@@ -85,16 +85,16 @@ namespace PrimMesher
}
}
Coord topPole = rows[0][width / 2];
Coord bottomPole = rows[rows.Count - 1][width / 2];
Vector3 topPole = rows[0][width / 2];
Vector3 bottomPole = rows[rows.Count - 1][width / 2];
if (sculptType == SculptType.sphere)
{
if (rows.Count % 2 == 0)
{
int count = rows[0].Count;
List<Coord> topPoleRow = new List<Coord>(count);
List<Coord> bottomPoleRow = new List<Coord>(count);
List<Vector3> topPoleRow = new List<Vector3>(count);
List<Vector3> bottomPoleRow = new List<Vector3>(count);
for (int i = 0; i < count; i++)
{
@@ -108,8 +108,8 @@ namespace PrimMesher
{
int count = rows[0].Count;
List<Coord> topPoleRow = rows[0];
List<Coord> bottomPoleRow = rows[rows.Count - 1];
List<Vector3> topPoleRow = rows[0];
List<Vector3> bottomPoleRow = rows[rows.Count - 1];
for (int i = 0; i < count; i++)
{
@@ -183,7 +183,7 @@ namespace PrimMesher
public SculptMesh(SculptMesh sm)
{
coords = new List<Coord>(sm.coords);
coords = new List<Vector3>(sm.coords);
faces = new List<Face>(sm.faces);
}
@@ -192,7 +192,7 @@ namespace PrimMesher
int i;
int numVerts = this.coords.Count;
Coord m = new Coord(x, y, z);
Vector3 m = new Vector3(x, y, z);
for (i = 0; i < numVerts; i++)
this.coords[i] *= m;
}