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

ubOde simple spheres and boxes with type convex have no holes on physics(long forgotten fix)

melanie
UbitUmarov 2016-12-12 17:53:40 +00:00
parent 1388ac2ef7
commit fe3303dc11
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
View File

@ -239,7 +239,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
if (m_scene.haveActor(repData.actor)) if (m_scene.haveActor(repData.actor))
{ {
if (needsMeshing(repData.pbs)) // no need for pbs now? if (needsMeshing(repData)) // no need for pbs now?
{ {
repData.comand = meshWorkerCmnds.changefull; repData.comand = meshWorkerCmnds.changefull;
createqueue.Enqueue(repData); createqueue.Enqueue(repData);
@ -284,8 +284,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
/// </summary> /// </summary>
/// <param name="pbs"></param> /// <param name="pbs"></param>
/// <returns></returns> /// <returns></returns>
public bool needsMeshing(PrimitiveBaseShape pbs) public bool needsMeshing(ODEPhysRepData repData)
{ {
PrimitiveBaseShape pbs = repData.pbs;
// check sculpts or meshs // check sculpts or meshs
if (pbs.SculptEntry) if (pbs.SculptEntry)
{ {
@ -301,6 +302,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (forceSimplePrimMeshing) if (forceSimplePrimMeshing)
return true; return true;
// convex shapes have no holes
ushort profilehollow = pbs.ProfileHollow;
if(repData.shapetype == 2)
profilehollow = 0;
// if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight) if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
@ -309,7 +315,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
&& pbs.ProfileHollow == 0 && profilehollow == 0
&& pbs.PathTwist == 0 && pbs.PathTwistBegin == 0 && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
&& pbs.PathBegin == 0 && pbs.PathEnd == 0 && pbs.PathBegin == 0 && pbs.PathEnd == 0
&& pbs.PathTaperX == 0 && pbs.PathTaperY == 0 && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
@ -326,7 +332,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
int iPropertiesNotSupportedDefault = 0; int iPropertiesNotSupportedDefault = 0;
if (pbs.ProfileHollow != 0) if (profilehollow != 0)
iPropertiesNotSupportedDefault++; iPropertiesNotSupportedDefault++;
if ((pbs.PathBegin != 0) || pbs.PathEnd != 0) if ((pbs.PathBegin != 0) || pbs.PathEnd != 0)
@ -407,7 +413,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
PhysicsActor actor = repData.actor; PhysicsActor actor = repData.actor;
PrimitiveBaseShape pbs = repData.pbs; PrimitiveBaseShape pbs = repData.pbs;
if (!needsMeshing(pbs)) if (!needsMeshing(repData))
{ {
repData.meshState = MeshState.noNeed; repData.meshState = MeshState.noNeed;
repData.hasOBB = false; repData.hasOBB = false;
@ -417,16 +423,16 @@ namespace OpenSim.Region.PhysicsModule.ubOde
IMesh mesh = null; IMesh mesh = null;
Vector3 size = repData.size; Vector3 size = repData.size;
byte shapetype = repData.shapetype;
bool convex;
int clod = (int)LevelOfDetail.High; int clod = (int)LevelOfDetail.High;
bool convex;
byte shapetype = repData.shapetype;
if (shapetype == 0) if (shapetype == 0)
convex = false; convex = false;
else else
{ {
convex = true; convex = true;
// sculpts pseudo convex
if (pbs.SculptType != (byte)SculptType.Mesh) if (pbs.SculptType != (byte)SculptType.Mesh)
clod = (int)LevelOfDetail.Low; clod = (int)LevelOfDetail.Low;
} }
@ -483,7 +489,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
repData.mesh = null; repData.mesh = null;
repData.hasOBB = false; repData.hasOBB = false;
if (!needsMeshing(pbs)) if (!needsMeshing(repData))
{ {
repData.meshState = MeshState.noNeed; repData.meshState = MeshState.noNeed;
return; return;