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

Patch llCastRay fully simplified to V3.

fsassets
Magnuz Binder 2015-05-10 20:01:50 +02:00 committed by dahlia
parent d52f58a733
commit d348f87161
2 changed files with 243 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,15 +221,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected float m_primSafetyCoeffX = 2.414214f; protected float m_primSafetyCoeffX = 2.414214f;
protected float m_primSafetyCoeffY = 2.414214f; protected float m_primSafetyCoeffY = 2.414214f;
protected float m_primSafetyCoeffZ = 1.618034f; protected float m_primSafetyCoeffZ = 1.618034f;
protected bool m_useCastRayV3 = false;
protected float m_floatToleranceInCastRay = 0.000001f; protected float m_floatToleranceInCastRay = 0.000001f;
protected float m_floatTolerance2InCastRay = 0.0001f; protected float m_floatTolerance2InCastRay = 0.0001f;
protected DetailLevel m_primLodInCastRay = DetailLevel.Medium;
protected DetailLevel m_sculptLodInCastRay = DetailLevel.Medium;
protected DetailLevel m_meshLodInCastRay = DetailLevel.Highest;
protected DetailLevel m_avatarLodInCastRay = DetailLevel.Medium;
protected int m_maxHitsInCastRay = 16; protected int m_maxHitsInCastRay = 16;
protected int m_maxHitsPerPrimInCastRay = 16; protected int m_maxHitsPerPrimInCastRay = 16;
protected int m_maxHitsPerObjectInCastRay = 16; protected int m_maxHitsPerObjectInCastRay = 16;
protected bool m_detectExitsInCastRay = false; protected bool m_detectExitsInCastRay = false;
protected bool m_filterPartsInCastRay = false; protected bool m_filterPartsInCastRay = false;
protected bool m_doAttachmentsInCastRay = false; protected bool m_doAttachmentsInCastRay = false;
protected bool m_useCastRayV1 = true;
//An array of HTTP/1.1 headers that are not allowed to be used //An array of HTTP/1.1 headers that are not allowed to be used
//as custom headers by llHTTPRequest. //as custom headers by llHTTPRequest.
@ -336,15 +340,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_primSafetyCoeffX = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientX", m_primSafetyCoeffX); m_primSafetyCoeffX = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientX", m_primSafetyCoeffX);
m_primSafetyCoeffY = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientY", m_primSafetyCoeffY); m_primSafetyCoeffY = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientY", m_primSafetyCoeffY);
m_primSafetyCoeffZ = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientZ", m_primSafetyCoeffZ); m_primSafetyCoeffZ = lslConfig.GetFloat("PrimBoundingBoxSafetyCoefficientZ", m_primSafetyCoeffZ);
m_useCastRayV3 = lslConfig.GetBoolean("UseLlCastRayV3", m_useCastRayV3);
m_floatToleranceInCastRay = lslConfig.GetFloat("FloatToleranceInLlCastRay", m_floatToleranceInCastRay); m_floatToleranceInCastRay = lslConfig.GetFloat("FloatToleranceInLlCastRay", m_floatToleranceInCastRay);
m_floatTolerance2InCastRay = lslConfig.GetFloat("FloatTolerance2InLlCastRay", m_floatTolerance2InCastRay); m_floatTolerance2InCastRay = lslConfig.GetFloat("FloatTolerance2InLlCastRay", m_floatTolerance2InCastRay);
m_primLodInCastRay = (DetailLevel)lslConfig.GetInt("PrimDetailLevelInLlCastRay", (int)m_primLodInCastRay);
m_sculptLodInCastRay = (DetailLevel)lslConfig.GetInt("SculptDetailLevelInLlCastRay", (int)m_sculptLodInCastRay);
m_meshLodInCastRay = (DetailLevel)lslConfig.GetInt("MeshDetailLevelInLlCastRay", (int)m_meshLodInCastRay);
m_avatarLodInCastRay = (DetailLevel)lslConfig.GetInt("AvatarDetailLevelInLlCastRay", (int)m_avatarLodInCastRay);
m_maxHitsInCastRay = lslConfig.GetInt("MaxHitsInLlCastRay", m_maxHitsInCastRay); m_maxHitsInCastRay = lslConfig.GetInt("MaxHitsInLlCastRay", m_maxHitsInCastRay);
m_maxHitsPerPrimInCastRay = lslConfig.GetInt("MaxHitsPerPrimInLlCastRay", m_maxHitsPerPrimInCastRay); m_maxHitsPerPrimInCastRay = lslConfig.GetInt("MaxHitsPerPrimInLlCastRay", m_maxHitsPerPrimInCastRay);
m_maxHitsPerObjectInCastRay = lslConfig.GetInt("MaxHitsPerObjectInLlCastRay", m_maxHitsPerObjectInCastRay); m_maxHitsPerObjectInCastRay = lslConfig.GetInt("MaxHitsPerObjectInLlCastRay", m_maxHitsPerObjectInCastRay);
m_detectExitsInCastRay = lslConfig.GetBoolean("DetectExitHitsInLlCastRay", m_detectExitsInCastRay); m_detectExitsInCastRay = lslConfig.GetBoolean("DetectExitHitsInLlCastRay", m_detectExitsInCastRay);
m_filterPartsInCastRay = lslConfig.GetBoolean("FilterPartsInLlCastRay", m_filterPartsInCastRay); m_filterPartsInCastRay = lslConfig.GetBoolean("FilterPartsInLlCastRay", m_filterPartsInCastRay);
m_doAttachmentsInCastRay = lslConfig.GetBoolean("DoAttachmentsInLlCastRay", m_doAttachmentsInCastRay); m_doAttachmentsInCastRay = lslConfig.GetBoolean("DoAttachmentsInLlCastRay", m_doAttachmentsInCastRay);
m_useCastRayV1 = lslConfig.GetBoolean("UseLlCastRayV1", m_useCastRayV1);
} }
IConfig smtpConfig = seConfigSource.Configs["SMTP"]; IConfig smtpConfig = seConfigSource.Configs["SMTP"];
@ -13811,8 +13819,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return contacts[0]; return contacts[0];
} }
public LSL_List llCastRayV1(LSL_Vector start, LSL_Vector end, LSL_List options) public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
{ {
// Use llCastRay V3 if configured
if (m_useCastRayV3)
return llCastRayV3(start, end, options);
LSL_List list = new LSL_List(); LSL_List list = new LSL_List();
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -14003,29 +14015,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
/// <summary> /// <summary>
/// Full implementation of llCastRay similar to SL 2015-04-21. /// Implementation of llCastRay similar to SL 2015-04-21.
/// http://wiki.secondlife.com/wiki/LlCastRay /// http://wiki.secondlife.com/wiki/LlCastRay
/// Uses pure geometry, bounding shapes, meshing and no physics /// Uses pure geometry, bounding shapes, meshing and no physics
/// for prims, sculpts, meshes, avatars and terrain. /// for prims, sculpts, meshes, avatars and terrain.
/// Implements all flags, reject types and data flags. /// Implements all flags, reject types and data flags.
/// Can handle both objects/groups and prims/parts, by config. /// Can handle both objects/groups and prims/parts, by config.
/// May give poor results with multi-part meshes where "root" /// May sometimes be inaccurate owing to calculation precision,
/// part doesn't dominate, owing to "guessed" bounding boxes. /// meshing detail level and a bug in libopenmetaverse PrimMesher.
/// May sometimes be inaccurate owing to calculation precision
/// and a bug in libopenmetaverse PrimMesher.
/// </summary> /// </summary>
public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) public LSL_List llCastRayV3(LSL_Vector start, LSL_Vector end, LSL_List options)
{ {
// Use llCastRay v1 if configured
if (m_useCastRayV1)
return llCastRayV1(start, end, options);
// Initialize // Initialize
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
List<RayHit> rayHits = new List<RayHit>(); List<RayHit> rayHits = new List<RayHit>();
LSL_List result = new LSL_List(); LSL_List result = new LSL_List();
float tol = m_floatToleranceInCastRay; float tol = m_floatToleranceInCastRay;
float tol2 = m_floatTolerance2InCastRay; Vector3 pos1Ray = start;
Vector3 pos2Ray = end;
// Get input options // Get input options
int rejectTypes = 0; int rejectTypes = 0;
@ -14054,25 +14061,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bool getLinkNum = ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) != 0); bool getLinkNum = ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) != 0);
// Calculate some basic parameters // Calculate some basic parameters
Vector3 ray = end - start; Vector3 vecRay = pos2Ray - pos1Ray;
float rayLength = ray.Length(); float rayLength = vecRay.Length();
// Try to get a mesher and return failure if none or degenerate ray // Try to get a mesher and return failure if none, degenerate ray, or max 0 hits
IRendering primMesher = null; IRendering primMesher = null;
List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory()); List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
if (renderers.Count < 1 || rayLength < tol) if (renderers.Count < 1 || rayLength < tol || m_maxHitsInCastRay < 1)
{ {
result.Add(new LSL_Integer(ScriptBaseClass.RCERR_UNKNOWN)); result.Add(new LSL_Integer(ScriptBaseClass.RCERR_UNKNOWN));
return result; return result;
} }
primMesher = RenderingLoader.LoadRenderer(renderers[0]); primMesher = RenderingLoader.LoadRenderer(renderers[0]);
// Used to translate and rotate world so ray is along negative Z axis from origo and
// calculations mostly simplified to a 2D projecttion on the X-Y plane
Vector3 posProj = new Vector3(-start);
Quaternion rotProj = Vector3.RotationBetween(ray, new Vector3(0.0f, 0.0f, -1.0f));
Quaternion rotBack = Quaternion.Inverse(rotProj);
// Iterate over all objects/groups and prims/parts in region // Iterate over all objects/groups and prims/parts in region
World.ForEachSOG( World.ForEachSOG(
delegate(SceneObjectGroup group) delegate(SceneObjectGroup group)
@ -14115,51 +14116,51 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!doPart) if (!doPart)
continue; continue;
} }
// Parse prim/part if passed filters
// Estimate bounding box from size box // Parse prim/part and project ray if passed filters
Vector3 scaleSafe = part.Scale; Vector3 scalePart = part.Scale;
Vector3 posPart = part.GetWorldPosition();
Quaternion rotPart = part.GetWorldRotation();
Quaternion rotPartInv = Quaternion.Inverse(rotPart);
Vector3 pos1RayProj = ((pos1Ray - posPart) * rotPartInv) / scalePart;
Vector3 pos2RayProj = ((pos2Ray - posPart) * rotPartInv) / scalePart;
// Filter parts by shape bounding boxes
Vector3 shapeBoxMax = new Vector3(0.5f, 0.5f, 0.5f);
if (!part.Shape.SculptEntry) if (!part.Shape.SculptEntry)
scaleSafe = scaleSafe * (new Vector3(m_primSafetyCoeffX, m_primSafetyCoeffY, m_primSafetyCoeffZ)); shapeBoxMax = shapeBoxMax * (new Vector3(m_primSafetyCoeffX, m_primSafetyCoeffY, m_primSafetyCoeffZ));
shapeBoxMax = shapeBoxMax + (new Vector3(tol, tol, tol));
// Filter parts by bounding shapes if (RayIntersectsShapeBox(pos1RayProj, pos2RayProj, shapeBoxMax))
Vector3 posPartRel = part.GetWorldPosition() + posProj;
Vector3 posPartProj = posPartRel * rotProj;
if (InBoundingShapes(ray, rayLength, scaleSafe, posPartRel, posPartProj, rotProj))
{ {
// Prepare data needed to check for ray hits // Prepare data needed to check for ray hits
RayTrans rayTrans = new RayTrans(); RayTrans rayTrans = new RayTrans();
rayTrans.PartId = part.UUID; rayTrans.PartId = part.UUID;
rayTrans.GroupId = part.ParentGroup.UUID; rayTrans.GroupId = part.ParentGroup.UUID;
rayTrans.Link = group.PrimCount > 1 ? part.LinkNum : 0; rayTrans.Link = group.PrimCount > 1 ? part.LinkNum : 0;
rayTrans.Scale = part.Scale; rayTrans.ScalePart = scalePart;
rayTrans.PositionPartProj = posPartProj; rayTrans.PositionPart = posPart;
rayTrans.PositionProj = posProj; rayTrans.RotationPart = rotPart;
rayTrans.RotationPartProj = rotProj * part.GetWorldRotation(); rayTrans.ShapeNeedsEnds = true;
rayTrans.RotationBack = rotBack; rayTrans.Position1Ray = pos1Ray;
rayTrans.NeedsEnds = true; rayTrans.Position1RayProj = pos1RayProj;
rayTrans.RayLength = rayLength; rayTrans.VectorRayProj = pos2RayProj - pos1RayProj;
rayTrans.Tolerance = tol;
rayTrans.Tolerance2 = tol2;
// Make an OMV prim to be able to mesh part // Make an OMV prim to be able to mesh part
Primitive omvPrim = part.Shape.ToOmvPrimitive(posPartProj, rayTrans.RotationPartProj); Primitive omvPrim = part.Shape.ToOmvPrimitive(posPart, rotPart);
byte[] sculptAsset = null; byte[] sculptAsset = null;
if (omvPrim.Sculpt != null) if (omvPrim.Sculpt != null)
sculptAsset = World.AssetService.GetData(omvPrim.Sculpt.SculptTexture.ToString()); sculptAsset = World.AssetService.GetData(omvPrim.Sculpt.SculptTexture.ToString());
FacetedMesh mesh = null;
// When part is mesh, get and check mesh // When part is mesh, get mesh and check for hits
if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type == SculptType.Mesh && sculptAsset != null) if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type == SculptType.Mesh && sculptAsset != null)
{ {
AssetMesh meshAsset = new AssetMesh(omvPrim.Sculpt.SculptTexture, sculptAsset); AssetMesh meshAsset = new AssetMesh(omvPrim.Sculpt.SculptTexture, sculptAsset);
FacetedMesh mesh = null; FacetedMesh.TryDecodeFromAsset(omvPrim, meshAsset, m_meshLodInCastRay, out mesh);
FacetedMesh.TryDecodeFromAsset(omvPrim, meshAsset, DetailLevel.Highest, out mesh);
meshAsset = null; meshAsset = null;
AddRayInFacetedMesh(mesh, rayTrans, ref rayHits);
mesh = null;
} }
// When part is sculpt, create and check mesh // When part is sculpt, create mesh and check for hits
// Quirk: Generated sculpt mesh is about 2.8% smaller in X and Y than visual sculpt. // Quirk: Generated sculpt mesh is about 2.8% smaller in X and Y than visual sculpt.
else if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type != SculptType.Mesh && sculptAsset != null) else if (omvPrim.Sculpt != null && omvPrim.Sculpt.Type != SculptType.Mesh && sculptAsset != null)
{ {
@ -14169,15 +14170,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Image sculpt = imgDecoder.DecodeToImage(sculptAsset); Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
if (sculpt != null) if (sculpt != null)
{ {
SimpleMesh mesh = primMesher.GenerateSimpleSculptMesh(omvPrim, (Bitmap)sculpt, DetailLevel.Medium); mesh = primMesher.GenerateFacetedSculptMesh(omvPrim, (Bitmap)sculpt, m_sculptLodInCastRay);
sculpt.Dispose(); sculpt.Dispose();
AddRayInSimpleMesh(mesh, rayTrans, ref rayHits);
mesh = null;
} }
} }
} }
// When part is prim, create and check mesh // When part is prim, create mesh and check for hits
else if (omvPrim.Sculpt == null) else if (omvPrim.Sculpt == null)
{ {
if ( if (
@ -14186,12 +14185,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
omvPrim.PrimData.PathSkew == 0.0 && omvPrim.PrimData.PathSkew == 0.0 &&
omvPrim.PrimData.PathTwist - omvPrim.PrimData.PathTwistBegin == 0.0 omvPrim.PrimData.PathTwist - omvPrim.PrimData.PathTwistBegin == 0.0
) )
rayTrans.NeedsEnds = false; rayTrans.ShapeNeedsEnds = false;
SimpleMesh mesh = primMesher.GenerateSimpleMesh(omvPrim, DetailLevel.Medium); mesh = primMesher.GenerateFacetedMesh(omvPrim, m_primLodInCastRay);
AddRayInSimpleMesh(mesh, rayTrans, ref rayHits);
mesh = null;
} }
// Check mesh for ray hits
AddRayInFacetedMesh(mesh, rayTrans, ref rayHits);
mesh = null;
} }
} }
} }
@ -14205,38 +14205,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.ForEachRootScenePresence( World.ForEachRootScenePresence(
delegate (ScenePresence sp) delegate (ScenePresence sp)
{ {
// Parse avatar
// Get bounding box // Get bounding box
Vector3 lower; Vector3 lower;
Vector3 upper; Vector3 upper;
BoundingBoxOfScenePresence(sp, out lower, out upper); BoundingBoxOfScenePresence(sp, out lower, out upper);
Vector3 scale = upper - lower; // Parse avatar
Vector3 scalePart = upper - lower;
Vector3 posPart = sp.AbsolutePosition;
Quaternion rotPart = sp.GetWorldRotation();
Quaternion rotPartInv = Quaternion.Inverse(rotPart);
posPart = posPart + (lower + upper) * 0.5f * rotPart;
// Project ray
Vector3 pos1RayProj = ((pos1Ray - posPart) * rotPartInv) / scalePart;
Vector3 pos2RayProj = ((pos2Ray - posPart) * rotPartInv) / scalePart;
// Filter avatars by bounding shapes // Filter avatars by shape bounding boxes
Vector3 posPartRel = sp.AbsolutePosition + posProj + (lower + upper) * 0.5f * sp.Rotation; Vector3 shapeBoxMax = new Vector3(0.5f + tol, 0.5f + tol, 0.5f + tol);
Vector3 posPartProj = posPartRel * rotProj; if (RayIntersectsShapeBox(pos1RayProj, pos2RayProj, shapeBoxMax))
if (InBoundingShapes(ray, rayLength, scale, posPartRel, posPartProj, rotProj))
{ {
// Prepare data needed to check for ray hits // Prepare data needed to check for ray hits
RayTrans rayTrans = new RayTrans(); RayTrans rayTrans = new RayTrans();
rayTrans.PartId = sp.UUID; rayTrans.PartId = sp.UUID;
rayTrans.GroupId = sp.ParentPart != null ? sp.ParentPart.ParentGroup.UUID : sp.UUID; rayTrans.GroupId = sp.ParentPart != null ? sp.ParentPart.ParentGroup.UUID : sp.UUID;
rayTrans.Link = sp.ParentPart != null ? UUID2LinkNumber(sp.ParentPart, sp.UUID) : 0; rayTrans.Link = sp.ParentPart != null ? UUID2LinkNumber(sp.ParentPart, sp.UUID) : 0;
rayTrans.Scale = scale; rayTrans.ScalePart = scalePart;
rayTrans.PositionPartProj = posPartProj; rayTrans.PositionPart = posPart;
rayTrans.PositionProj = posProj; rayTrans.RotationPart = rotPart;
rayTrans.RotationPartProj = rotProj * sp.Rotation; rayTrans.ShapeNeedsEnds = false;
rayTrans.RotationBack = rotBack; rayTrans.Position1Ray = pos1Ray;
rayTrans.NeedsEnds = false; rayTrans.Position1RayProj = pos1RayProj;
rayTrans.RayLength = rayLength; rayTrans.VectorRayProj = pos2RayProj - pos1RayProj;
rayTrans.Tolerance = tol;
rayTrans.Tolerance2 = tol2;
// Make OMV prim, create and check mesh // Make OMV prim, create and check mesh
Primitive omvPrim = MakeOpenMetaversePrim(scale, posPartProj, rayTrans.RotationPartProj, ScriptBaseClass.PRIM_TYPE_SPHERE); PrimitiveBaseShape prim = PrimitiveBaseShape.CreateSphere();
SimpleMesh mesh = primMesher.GenerateSimpleMesh(omvPrim, DetailLevel.Medium); prim.Scale = scalePart;
AddRayInSimpleMesh(mesh, rayTrans, ref rayHits); Primitive omvPrim = prim.ToOmvPrimitive(posPart, rotPart);
FacetedMesh mesh = primMesher.GenerateFacetedMesh(omvPrim, m_meshLodInCastRay);
AddRayInFacetedMesh(mesh, rayTrans, ref rayHits);
mesh = null; mesh = null;
} }
} }
@ -14248,32 +14253,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// Parse terrain // Parse terrain
// Mesh terrain and check projected bounding box // Mesh terrain and check bounding box
Vector3 posPartProj = posProj * rotProj;
Quaternion rotPartProj = rotProj;
Vector3 lower; Vector3 lower;
Vector3 upper; Vector3 upper;
List<Tri> triangles = TrisFromHeightmapUnderRay(start, end, out lower, out upper); List<Tri> triangles = TrisFromHeightmapUnderRay(pos1Ray, pos2Ray, out lower, out upper);
Vector3 lowerBox = new Vector3(float.MaxValue, float.MaxValue, float.MaxValue); lower.Z -= tol;
Vector3 upperBox = new Vector3(float.MinValue, float.MinValue, float.MinValue); upper.Z += tol;
int dummy = 0; if ((pos1Ray.Z >= lower.Z || pos2Ray.Z >= lower.Z) && (pos1Ray.Z <= upper.Z || pos2Ray.Z <= upper.Z))
AddBoundingBoxOfSimpleBox(lower, upper, posPartProj, rotPartProj, true, ref lowerBox, ref upperBox, ref dummy);
if (lowerBox.X <= tol && lowerBox.Y <= tol && lowerBox.Z <= tol && upperBox.X >= -tol && upperBox.Y >= -tol && upperBox.Z >= -rayLength - tol)
{ {
// Prepare data needed to check for ray hits // Prepare data needed to check for ray hits
RayTrans rayTrans = new RayTrans(); RayTrans rayTrans = new RayTrans();
rayTrans.PartId = UUID.Zero; rayTrans.PartId = UUID.Zero;
rayTrans.GroupId = UUID.Zero; rayTrans.GroupId = UUID.Zero;
rayTrans.Link = 0; rayTrans.Link = 0;
rayTrans.Scale = new Vector3 (1.0f, 1.0f, 1.0f); rayTrans.ScalePart = new Vector3 (1.0f, 1.0f, 1.0f);
rayTrans.PositionPartProj = posPartProj; rayTrans.PositionPart = Vector3.Zero;
rayTrans.PositionProj = posProj; rayTrans.RotationPart = Quaternion.Identity;
rayTrans.RotationPartProj = rotPartProj; rayTrans.ShapeNeedsEnds = true;
rayTrans.RotationBack = rotBack; rayTrans.Position1Ray = pos1Ray;
rayTrans.NeedsEnds = true; rayTrans.Position1RayProj = pos1Ray;
rayTrans.RayLength = rayLength; rayTrans.VectorRayProj = vecRay;
rayTrans.Tolerance = tol;
rayTrans.Tolerance2 = tol2;
// Check mesh // Check mesh
AddRayInTris(triangles, rayTrans, ref rayHits); AddRayInTris(triangles, rayTrans, ref rayHits);
@ -14358,15 +14357,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public UUID PartId; public UUID PartId;
public UUID GroupId; public UUID GroupId;
public int Link; public int Link;
public Vector3 Scale; public Vector3 ScalePart;
public Vector3 PositionPartProj; public Vector3 PositionPart;
public Vector3 PositionProj; public Quaternion RotationPart;
public Quaternion RotationPartProj; public bool ShapeNeedsEnds;
public Quaternion RotationBack; public Vector3 Position1Ray;
public bool NeedsEnds; public Vector3 Position1RayProj;
public float RayLength; public Vector3 VectorRayProj;
public float Tolerance;
public float Tolerance2;
} }
/// <summary> /// <summary>
@ -14383,21 +14380,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
/// <summary> /// <summary>
/// Helper to parse SimpleMesh for ray hits. /// Helper to check if a ray intersects a shape bounding box.
/// </summary> /// </summary>
private void AddRayInSimpleMesh(SimpleMesh mesh, RayTrans rayTrans, ref List<RayHit> rayHits) private bool RayIntersectsShapeBox(Vector3 pos1RayProj, Vector3 pos2RayProj, Vector3 shapeBoxMax)
{ {
if (mesh != null) // Skip if ray can't intersect bounding box;
Vector3 rayBoxProjMin = Vector3.Min(pos1RayProj, pos2RayProj);
Vector3 rayBoxProjMax = Vector3.Max(pos1RayProj, pos2RayProj);
if (
rayBoxProjMin.X > shapeBoxMax.X || rayBoxProjMin.Y > shapeBoxMax.Y || rayBoxProjMin.Z > shapeBoxMax.Z ||
rayBoxProjMax.X < -shapeBoxMax.X || rayBoxProjMax.Y < -shapeBoxMax.Y || rayBoxProjMax.Z < -shapeBoxMax.Z
)
return false;
// Check if ray intersect any bounding box side
int sign = 0;
float dist = 0.0f;
Vector3 posProj = Vector3.Zero;
Vector3 vecRayProj = pos2RayProj - pos1RayProj;
// Check both X sides unless ray is parallell to them
if (Math.Abs(vecRayProj.X) > m_floatToleranceInCastRay)
{ {
for (int i = 0; i < mesh.Indices.Count; i += 3) for (sign = -1; sign <= 1; sign += 2)
{ {
Tri triangle = new Tri(); dist = ((float)sign * shapeBoxMax.X - pos1RayProj.X) / vecRayProj.X;
triangle.p1 = mesh.Vertices[mesh.Indices[i]].Position; posProj = pos1RayProj + vecRayProj * dist;
triangle.p2 = mesh.Vertices[mesh.Indices[i + 1]].Position; if (Math.Abs(posProj.Y) <= shapeBoxMax.Y && Math.Abs(posProj.Z) <= shapeBoxMax.Z)
triangle.p3 = mesh.Vertices[mesh.Indices[i + 2]].Position; return true;
AddRayInTri(triangle, rayTrans, ref rayHits);
} }
} }
// Check both Y sides unless ray is parallell to them
if (Math.Abs(vecRayProj.Y) > m_floatToleranceInCastRay)
{
for (sign = -1; sign <= 1; sign += 2)
{
dist = ((float)sign * shapeBoxMax.Y - pos1RayProj.Y) / vecRayProj.Y;
posProj = pos1RayProj + vecRayProj * dist;
if (Math.Abs(posProj.X) <= shapeBoxMax.X && Math.Abs(posProj.Z) <= shapeBoxMax.Z)
return true;
}
}
// Check both Z sides unless ray is parallell to them
if (Math.Abs(vecRayProj.Z) > m_floatToleranceInCastRay)
{
for (sign = -1; sign <= 1; sign += 2)
{
dist = ((float)sign * shapeBoxMax.Z - pos1RayProj.Z) / vecRayProj.Z;
posProj = pos1RayProj + vecRayProj * dist;
if (Math.Abs(posProj.X) <= shapeBoxMax.X && Math.Abs(posProj.Y) <= shapeBoxMax.Y)
return true;
}
}
// No hits on bounding box so return false
return false;
} }
/// <summary> /// <summary>
@ -14409,7 +14448,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
foreach (Face face in mesh.Faces) foreach (Face face in mesh.Faces)
{ {
for (int i = 0; i <face.Indices.Count; i += 3) for (int i = 0; i < face.Indices.Count; i += 3)
{ {
Tri triangle = new Tri(); Tri triangle = new Tri();
triangle.p1 = face.Vertices[face.Indices[i]].Position; triangle.p1 = face.Vertices[face.Indices[i]].Position;
@ -14435,23 +14474,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <summary> /// <summary>
/// Helper to add ray hit in a Tri (triangle). /// Helper to add ray hit in a Tri (triangle).
/// </summary> /// </summary>
private void AddRayInTri(Tri triangle, RayTrans rayTrans, ref List<RayHit> rayHits) private void AddRayInTri(Tri triProj, RayTrans rayTrans, ref List<RayHit> rayHits)
{ {
// Check for hit in triangle // Check for hit in triangle
float distance; Vector3 posHitProj;
Vector3 posHit; Vector3 normalProj;
Vector3 normal; if (HitRayInTri(triProj, rayTrans.Position1RayProj, rayTrans.VectorRayProj, out posHitProj, out normalProj))
if (HitRayInTri(triangle, rayTrans, out distance, out posHit, out normal))
{ {
// Project hit part back to normal coordinate system // Hack to circumvent ghost face bug in PrimMesher by removing hits in (ghost) face plane through shape center
Vector3 posPart = rayTrans.PositionPartProj * rayTrans.RotationBack - rayTrans.PositionProj; if (Math.Abs(Vector3.Dot(posHitProj, normalProj)) < m_floatToleranceInCastRay && !rayTrans.ShapeNeedsEnds)
// Hack to circumvent ghost face bug in PrimMesher by removing hits in (ghost) faces plane through shape center
if (Math.Abs(Vector3.Dot(posPart, normal) - Vector3.Dot(posHit, normal)) < rayTrans.Tolerance && !rayTrans.NeedsEnds)
return; return;
// Remove duplicate hits at triangle edges and intersections
// Transform hit and normal to region coordinate system
Vector3 posHit = rayTrans.PositionPart + (posHitProj * rayTrans.ScalePart) * rayTrans.RotationPart;
Vector3 normal = Vector3.Normalize((normalProj * rayTrans.ScalePart) * rayTrans.RotationPart);
// Remove duplicate hits at triangle intersections
float distance = Vector3.Distance(rayTrans.Position1Ray, posHit);
for (int i = rayHits.Count - 1; i >= 0; i--) for (int i = rayHits.Count - 1; i >= 0; i--)
{ {
if (rayHits[i].PartId == rayTrans.PartId && Math.Abs(rayHits[i].Distance - distance) < rayTrans.Tolerance2) if (rayHits[i].PartId != rayTrans.PartId)
break;
if (Math.Abs(rayHits[i].Distance - distance) < m_floatTolerance2InCastRay)
return; return;
} }
@ -14468,76 +14512,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
/// <summary> /// <summary>
/// Helper to find ray hit in a Tri (triangle). /// Helper to find ray hit in triangle
/// </summary> /// </summary>
private bool HitRayInTri(Tri triangle, RayTrans rayTrans, out float distance, out Vector3 posHit, out Vector3 normal) bool HitRayInTri(Tri triProj, Vector3 pos1RayProj, Vector3 vecRayProj, out Vector3 posHitProj, out Vector3 normalProj)
{ {
// Initialize float tol = m_floatToleranceInCastRay;
distance = 0.0f; posHitProj = Vector3.Zero;
posHit = Vector3.Zero;
normal = Vector3.Zero;
float tol = rayTrans.Tolerance;
// Project triangle on X-Y plane // Calculate triangle edge vectors
Vector3 pos1 = triangle.p1 * rayTrans.Scale * rayTrans.RotationPartProj + rayTrans.PositionPartProj; Vector3 vec1Proj = triProj.p2 - triProj.p1;
Vector3 pos2 = triangle.p2 * rayTrans.Scale * rayTrans.RotationPartProj + rayTrans.PositionPartProj; Vector3 vec2Proj = triProj.p3 - triProj.p2;
Vector3 pos3 = triangle.p3 * rayTrans.Scale * rayTrans.RotationPartProj + rayTrans.PositionPartProj; Vector3 vec3Proj = triProj.p1 - triProj.p3;
// Check if ray/origo inside triangle bounding rectangle // Calculate triangle normal
Vector3 lower = Vector3.Min(pos1, Vector3.Min(pos2, pos3)); normalProj = Vector3.Cross(vec1Proj, vec2Proj);
Vector3 upper = Vector3.Max(pos1, Vector3.Max(pos2, pos3));
if (lower.X > tol || lower.Y > tol || lower.Z > tol || upper.X < -tol || upper.Y < -tol || upper.Z < -rayTrans.RayLength - tol) // Skip if degenerate triangle or ray parallell with triangle plane
float divisor = Vector3.Dot(vecRayProj, normalProj);
if (Math.Abs(divisor) < tol)
return false; return false;
// Check if ray/origo inside every edge or reverse "outside" every edge on exit // Skip if exit and not configured to detect
float dist; if (divisor > tol && !m_detectExitsInCastRay)
bool inside = true;
bool outside = true;
Vector3 vec1 = pos2 - pos1;
dist = pos1.X * vec1.Y - pos1.Y * vec1.X;
if (dist < -tol)
inside = false;
if (dist > tol)
outside = false;
Vector3 vec2 = pos3 - pos2;
dist = pos2.X * vec2.Y - pos2.Y * vec2.X;
if (dist < -tol)
inside = false;
if (dist > tol)
outside = false;
Vector3 vec3 = pos1 - pos3;
dist = pos3.X * vec3.Y - pos3.Y * vec3.X;
if (dist < -tol)
inside = false;
if (dist > tol)
outside = false;
// Skip if ray/origo outside
if (!inside && !(outside && m_detectExitsInCastRay))
return false; return false;
// Calculate normal // Skip if outside ray ends
Vector3 normalProj = Vector3.Cross(vec1, vec2); float distanceProj = Vector3.Dot(triProj.p1 - pos1RayProj, normalProj) / divisor;
float normalLength = normalProj.Length(); if (distanceProj < -tol || distanceProj > 1 + tol)
// Skip if degenerate triangle
if (normalLength < tol)
return false;
normalProj = normalProj / normalLength;
// Skip if ray parallell to triangle plane
if (Math.Abs(normalProj.Z) < tol)
return false; return false;
// Calculate distance // Calculate hit position in triangle
distance = Vector3.Dot(normalProj, pos2) / normalProj.Z * -1.0f; posHitProj = pos1RayProj + vecRayProj * distanceProj;
// Skip if outside ray
if (distance < -tol || distance > rayTrans.RayLength + tol) // Skip if outside triangle bounding box
Vector3 triProjMin = Vector3.Min(Vector3.Min(triProj.p1, triProj.p2), triProj.p3);
Vector3 triProjMax = Vector3.Max(Vector3.Max(triProj.p1, triProj.p2), triProj.p3);
if (
posHitProj.X < triProjMin.X - tol || posHitProj.Y < triProjMin.Y - tol || posHitProj.Z < triProjMin.Z - tol ||
posHitProj.X > triProjMax.X + tol || posHitProj.Y > triProjMax.Y + tol || posHitProj.Z > triProjMax.Z + tol
)
return false; return false;
// Calculate projected hit position // Skip if outside triangle
Vector3 posHitProj = new Vector3(0.0f, 0.0f, -distance); if (
// Project hit back to normal coordinate system Vector3.Dot(Vector3.Cross(vec1Proj, normalProj), posHitProj - triProj.p1) > tol ||
posHit = posHitProj * rayTrans.RotationBack - rayTrans.PositionProj; Vector3.Dot(Vector3.Cross(vec2Proj, normalProj), posHitProj - triProj.p2) > tol ||
normal = normalProj * rayTrans.RotationBack; Vector3.Dot(Vector3.Cross(vec3Proj, normalProj), posHitProj - triProj.p3) > tol
)
return false;
// Return hit
return true; return true;
} }
@ -14660,24 +14684,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
y = Util.Clamp<int>(yInt+1, 0, World.Heightmap.Height - 1); y = Util.Clamp<int>(yInt+1, 0, World.Heightmap.Height - 1);
Vector3 pos2 = new Vector3(x, y, (float)World.Heightmap[x, y]); Vector3 pos2 = new Vector3(x, y, (float)World.Heightmap[x, y]);
// Adjust bounding box // Adjust bounding box
zLower = Math.Min(zLower, pos1.Z); zLower = Math.Min(zLower, pos2.Z);
zUpper = Math.Max(zUpper, pos1.Z); zUpper = Math.Max(zUpper, pos2.Z);
// Corner 3 of 1x1 rectangle // Corner 3 of 1x1 rectangle
x = Util.Clamp<int>(xInt, 0, World.Heightmap.Width - 1); x = Util.Clamp<int>(xInt, 0, World.Heightmap.Width - 1);
y = Util.Clamp<int>(yInt, 0, World.Heightmap.Height - 1); y = Util.Clamp<int>(yInt, 0, World.Heightmap.Height - 1);
Vector3 pos3 = new Vector3(x, y, (float)World.Heightmap[x, y]); Vector3 pos3 = new Vector3(x, y, (float)World.Heightmap[x, y]);
// Adjust bounding box // Adjust bounding box
zLower = Math.Min(zLower, pos1.Z); zLower = Math.Min(zLower, pos3.Z);
zUpper = Math.Max(zUpper, pos1.Z); zUpper = Math.Max(zUpper, pos3.Z);
// Corner 4 of 1x1 rectangle // Corner 4 of 1x1 rectangle
x = Util.Clamp<int>(xInt+1, 0, World.Heightmap.Width - 1); x = Util.Clamp<int>(xInt+1, 0, World.Heightmap.Width - 1);
y = Util.Clamp<int>(yInt, 0, World.Heightmap.Height - 1); y = Util.Clamp<int>(yInt, 0, World.Heightmap.Height - 1);
Vector3 pos4 = new Vector3(x, y, (float)World.Heightmap[x, y]); Vector3 pos4 = new Vector3(x, y, (float)World.Heightmap[x, y]);
// Adjust bounding box // Adjust bounding box
zLower = Math.Min(zLower, pos1.Z); zLower = Math.Min(zLower, pos4.Z);
zUpper = Math.Max(zUpper, pos1.Z); zUpper = Math.Max(zUpper, pos4.Z);
// Add triangle 1 // Add triangle 1
Tri triangle1 = new Tri(); Tri triangle1 = new Tri();
@ -14694,25 +14718,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
triangles.Add(triangle2); triangles.Add(triangle2);
} }
/// <summary>
/// Helper to check if a ray intersects bounding shapes.
/// </summary>
private bool InBoundingShapes(Vector3 ray, float rayLength, Vector3 scale, Vector3 posPartRel, Vector3 posPartProj, Quaternion rotProj)
{
float tol = m_floatToleranceInCastRay;
// Check if ray intersects projected bounding box
Vector3 lowerBox = new Vector3(float.MaxValue, float.MaxValue, float.MaxValue);
Vector3 upperBox = new Vector3(float.MinValue, float.MinValue, float.MinValue);
int dummy = 0;
AddBoundingBoxOfSimpleBox(scale * -0.5f, scale * 0.5f, posPartProj, rotProj, true, ref lowerBox, ref upperBox, ref dummy);
if (lowerBox.X > tol || lowerBox.Y > tol || lowerBox.Z > tol || upperBox.X < -tol || upperBox.Y < -tol || upperBox.Z < -rayLength - tol)
return false;
// Passed bounding shape filters, so return true
return true;
}
/// <summary> /// <summary>
/// Helper to get link number for a UUID. /// Helper to get link number for a UUID.
/// </summary> /// </summary>

46
bin/OpenSimDefaults.ini
View File

@ -1397,11 +1397,6 @@
; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL()) ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
max_external_urls_per_simulator = 100 max_external_urls_per_simulator = 100
; Use version 1 of llCastRay as default if true. If set to false, the new
; version of llCastRay will be used. This gives better accuracy but
; uses more CPU and may may be slow on some servers
UseLlCastRayV1 = true
; Use size boxes instead of meshed prims, sculpts and mesh when calculating bounding boxes. ; Use size boxes instead of meshed prims, sculpts and mesh when calculating bounding boxes.
; Speeds up calculations but can make them inaccurate, in some cases very inaccurate. ; Speeds up calculations but can make them inaccurate, in some cases very inaccurate.
UseSimpleBoxesInGetBoundingBox = false UseSimpleBoxesInGetBoundingBox = false
@ -1494,32 +1489,52 @@
; Worst case is twisted tube, 0.5+sqrt(1.25) ; Worst case is twisted tube, 0.5+sqrt(1.25)
PrimBoundingBoxSafetyCoefficientZ = 1.618034 PrimBoundingBoxSafetyCoefficientZ = 1.618034
; Accepted calculation precision error in calculations in llCastRay ; Use llCastRay V3 if true
; Gives better accuracy and can be faster on some servers, but slower on others,
; compared to previous version of llCastRay
; Generates geometry meshes and can therefore use much system resources
UseLlCastRayV3 = false
; Accepted calculation precision error in calculations in llCastRay V3
FloatToleranceInLlCastRay = 0.000001 FloatToleranceInLlCastRay = 0.000001
; Accepted distance difference between duplicate hits in llCastRay ; Accepted distance difference between duplicate hits in llCastRay V3
FloatTolerance2InLlCastRay = 0.0001 FloatTolerance2InLlCastRay = 0.0001
; Maximum number of returned hits from llCastRay ; Detail level when rendering prims in llCastRay V3
; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
PrimDetailLevelInLlCastRay = 1
; Detail level when rendering sculpts in llCastRay V3
; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
SculptDetailLevelInLlCastRay = 1
; Detail level when rendering meshes in llCastRay V3
; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
MeshDetailLevelInLlCastRay = 3
; Detail level when rendering avatar capsules in llCastRay V3
; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
AvatarDetailLevelInLlCastRay = 1
; Maximum number of returned hits from llCastRay V3
MaxHitsInLlCastRay = 16 MaxHitsInLlCastRay = 16
; Maximum number of returned hits per prim from llCastRay ; Maximum number of returned hits per prim from llCastRay V3
MaxHitsPerPrimInLlCastRay = 16 MaxHitsPerPrimInLlCastRay = 16
; Maximum number of returned hits per object from llCastRay ; Maximum number of returned hits per object from llCastRay V3
MaxHitsPerObjectInLlCastRay = 16 MaxHitsPerObjectInLlCastRay = 16
; Report ray intersections with surfaces on exits from a prim as hits in llCastRay if true ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay V3 if true
DetectExitHitsInLlCastRay = false DetectExitHitsInLlCastRay = false
; Filter on parts instead of groups in llCastRay if true ; Filter on parts instead of groups in llCastRay V3 if true
FilterPartsInLlCastRay = false FilterPartsInLlCastRay = false
; Detect attachments in llCastRay if true ; Detect attachments in llCastRay V3 if true
DoAttachmentsInLlCastRay = false DoAttachmentsInLlCastRay = false
; Use legacy version 1 of llCastRay if true
UseLlCastRayV1 = true
[DataSnapshot] [DataSnapshot]
; The following set of configs pertains to search. ; The following set of configs pertains to search.
@ -1547,6 +1562,7 @@
; data service ; data service
;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py" ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
[Economy] [Economy]
; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only -
; The default economy module only implements just enough to allow free actions (transfer of objects, etc). ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).