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

fix some cases in prim number of sides

httptests
UbitUmarov 2018-05-27 01:54:05 +01:00
parent e0b2ee80f9
commit 458fe42afd
1 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -3892,6 +3892,7 @@ namespace OpenSim.Region.Framework.Scenes
public int GetNumberOfSides() public int GetNumberOfSides()
{ {
int ret = 0; int ret = 0;
int cut;
if(Shape.SculptEntry) if(Shape.SculptEntry)
{ {
@ -3913,24 +3914,42 @@ namespace OpenSim.Region.Framework.Scenes
if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // cut case if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // cut case
{ {
// removed sides // removed sides
int cut = (Shape.ProfileEnd + Shape.ProfileBegin); if (Shape.ProfileBegin > 0)
if(cut > 50000) // range is 0 to 50000 {
cut = 50000; cut = Shape.ProfileBegin;
cut /= 12500; // ie 1/4 cut /= 12500;
ret -= cut; ret -= cut;
ret += 2; // both cut faces }
if (Shape.ProfileEnd > 0)
{
cut = Shape.ProfileEnd;
cut /= 12500;
ret -= cut;
}
ret += 2;
} }
break; break;
case PrimType.PRISM: case PrimType.PRISM:
ret = 5; ret = 5;
if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // cut case if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // cut case
{ {
// removed faces // removed sides
int cut = (Shape.ProfileEnd + Shape.ProfileBegin); if (Shape.ProfileBegin > 0)
if(cut >= 16667 ) // ie 1/3 {
cut = (Shape.ProfileBegin);
if(cut >= 16667 )
ret--; ret--;
if(cut >= 33333 ) // ie 2/3 if(cut >= 33333 )
ret--; ret--;
}
if (Shape.ProfileEnd > 0)
{
cut = (Shape.ProfileEnd);
if(cut >= 16667 )
ret--;
if(cut >= 33333 )
ret--;
}
ret += 2; // both cut faces ret += 2; // both cut faces
} }
break; break;
@ -3944,7 +3963,7 @@ namespace OpenSim.Region.Framework.Scenes
// cut faces exist if cut or skew or unequal twist limits // cut faces exist if cut or skew or unequal twist limits
if (Shape.PathBegin > 0 || Shape.PathEnd > 0 || Shape.PathSkew != 0 || (Shape.PathTwistBegin != Shape.PathTwist)) if (Shape.PathBegin > 0 || Shape.PathEnd > 0 || Shape.PathSkew != 0 || (Shape.PathTwistBegin != Shape.PathTwist))
ret += 2; ret += 2;
if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0 || Shape.ProfileHollow > 0) // dimple faces also if hollow if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0 || Shape.ProfileHollow > 0) // dimple also if hollow
ret += 2; ret += 2;
break; break;
case PrimType.TORUS: case PrimType.TORUS:
@ -3964,13 +3983,19 @@ namespace OpenSim.Region.Framework.Scenes
ret += 2; ret += 2;
if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // profile cut if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // profile cut
{ {
// removed sides if (Shape.ProfileBegin > 0)
int cut = (Shape.ProfileEnd + Shape.ProfileBegin); {
if(cut > 50000) cut = Shape.ProfileBegin;
cut = 50000;
cut /= 12500; cut /= 12500;
ret -= cut; ret -= cut;
ret += 2; // both cut faces }
if (Shape.ProfileEnd > 0)
{
cut = Shape.ProfileEnd;
cut /= 12500;
ret -= cut;
}
ret += 2;
} }
break; break;
case PrimType.RING: case PrimType.RING:
@ -3981,13 +4006,23 @@ namespace OpenSim.Region.Framework.Scenes
ret += 2; ret += 2;
if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // profile cut if (Shape.ProfileBegin > 0 || Shape.ProfileEnd > 0) // profile cut
{ {
// removed faces if (Shape.ProfileBegin > 0)
int cut = (Shape.ProfileEnd + Shape.ProfileBegin); {
cut = Shape.ProfileBegin;
if(cut >= 16667 ) if(cut >= 16667 )
ret--; ret--;
if(cut >= 33333 ) if(cut >= 33333 )
ret--; ret--;
ret += 2; // both cut faces }
if (Shape.ProfileEnd > 0)
{
cut = Shape.ProfileEnd;
if(cut >= 16667 )
ret--;
if(cut >= 33333 )
ret--;
}
ret += 2;
} }
break; break;
} }