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

missed a creatMesh in chODE. temporary removed m_meshfailed test since it may colide with how meshs and sculpts are loaded. This needs a good revision..

avinationmerge
UbitUmarov 2012-03-21 14:03:50 +00:00
parent 316f272b62
commit a03c55fee7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
View File

@ -2137,13 +2137,18 @@ namespace OpenSim.Region.Physics.OdePlugin
m_targetSpace = targetspace; m_targetSpace = targetspace;
if (_mesh == null && m_meshfailed == false) if (_mesh == null) // && m_meshfailed == false)
{ {
if (_parent_scene.needsMeshing(_pbs)) if (_parent_scene.needsMeshing(_pbs))
{ {
bool convex;
if (m_shapetype == 2)
convex = true;
else
convex = false;
try try
{ {
_mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true); _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true,convex);
} }
catch catch
{ {
@ -2382,7 +2387,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// we don't need to do space calculation because the client sends a position update also. // we don't need to do space calculation because the client sends a position update also.
// Construction of new prim // Construction of new prim
if (_parent_scene.needsMeshing(_pbs) && m_meshfailed == false) if (_parent_scene.needsMeshing(_pbs))// && m_meshfailed == false)
{ {
float meshlod = _parent_scene.meshSculptLOD; float meshlod = _parent_scene.meshSculptLOD;
@ -2493,7 +2498,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (_size.Z <= 0) _size.Z = 0.01f; if (_size.Z <= 0) _size.Z = 0.01f;
// Construction of new prim // Construction of new prim
if (_parent_scene.needsMeshing(_pbs) && m_meshfailed == false) if (_parent_scene.needsMeshing(_pbs))// && m_meshfailed == false)
{ {
// Don't need to re-enable body.. it's done in SetMesh // Don't need to re-enable body.. it's done in SetMesh
float meshlod = _parent_scene.meshSculptLOD; float meshlod = _parent_scene.meshSculptLOD;