livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIRE-32359] [BUG-323869] Physics shape display in view incorrect 

Fixes from upstream caused a partial reversion of an older bug. 
meshes with a hull based (non triangle) user physics will not be convexified 
when scaled to below 0.5m, viewer was failing to reflect that
master
Beq 2022-11-05 15:04:40 +00:00
parent 1aa2535ae6
commit 1132c5742c
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
indra/newview/llphysicsshapebuilderutil.cpp
View File

@ -203,35 +203,34 @@ void LLPhysicsShapeBuilderUtil::determinePhysicsShape(const LLPhysicsVolumeParam
{
specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX;
}
else if (volume_params.isMeshSculpt() &&
// Check overall dimensions, not individual triangles.
(scale.mV[0] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE ||
scale.mV[1] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE ||
scale.mV[2] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE
) )
{
// Server distinguishes between user-specified or default convex mesh, vs server's thin-triangle override, but we don't.
specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX;
}
// <FS:Beq> restore proper behaviour.
// else if (volume_params.isMeshSculpt() &&
// // Check overall dimensions, not individual triangles.
// (scale.mV[0] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE ||
// scale.mV[1] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE ||
// scale.mV[2] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE
// ) )
// {
// // Server distinguishes between user-specified or default convex mesh, vs server's thin-triangle override, but we don't.
// specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX;
// }
// </FS:Beq>
else if ( volume_params.isSculpt() ) // Is a sculpt of any kind (mesh or legacy)
{
//<FS:Beq> [BUG-134006] Viewer code is not aligned to server code when calculating physics shape for thin objects.
specOut.mType = PhysicsShapeSpecification::INVALID;
// <FS:Beq> FIRE-23053 - add decomp check analysed mesh physics is not correctly displayed for thin meshes
// if (volume_params.isMeshSculpt()){
if (volume_params.isMeshSculpt() && !hasDecomp){
static const float SHAPE_BUILDER_CONVEXIFICATION_SIZE_MESH = 0.5;
// it's a mesh and only one size is smaller than min.
for (S32 i = 0; i < 3; ++i)
{
if (scale[i] < SHAPE_BUILDER_CONVEXIFICATION_SIZE_MESH)
{
specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX;
}
}
if ( (volume_params.isMeshSculpt() && !hasDecomp) &&
(scale.mV[0] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE ||
scale.mV[1] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE ||
scale.mV[2] < SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE
) )
{
specOut.mType = PhysicsShapeSpecification::PRIM_CONVEX;
}
if (specOut.mType == PhysicsShapeSpecification::INVALID)
//</FS:Beq>
//</FS:Beq> note: dangling if....(hopefully this will go away with PR sent to LL)
specOut.mType = volume_params.isMeshSculpt() ? PhysicsShapeSpecification::USER_MESH : PhysicsShapeSpecification::SCULPT;
}
else // Resort to mesh