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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-03 21:38:35 +02:00
parent 149c2adf7d 4f51cc325c
commit 33b2096c5f
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Threading; using System.Threading;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
@ -177,7 +178,7 @@ namespace OpenSim.Region.Physics.OdePlugin
Vector3 size = psize; Vector3 size = psize;
byte shapetype = pshapetype; byte shapetype = pshapetype;
if (needsMeshing(pbs) && (pbs.SculptData.Length > 0)) if (needsMeshing(pbs))
{ {
bool convex; bool convex;
int clod = (int)LevelOfDetail.High; int clod = (int)LevelOfDetail.High;
@ -189,9 +190,24 @@ namespace OpenSim.Region.Physics.OdePlugin
if (pbs.SculptType != (byte)SculptType.Mesh) if (pbs.SculptType != (byte)SculptType.Mesh)
clod = (int)LevelOfDetail.Low; clod = (int)LevelOfDetail.Low;
} }
mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex); mesh = m_mesher.GetMesh(actor.Name, pbs, size, clod, true, convex);
if(mesh == null) if (mesh == null)
mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex); {
if (!pbs.SculptEntry)
return m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex);
if (pbs.SculptTexture == UUID.Zero)
return null;
if(pbs.SculptType != (byte)SculptType.Mesh)
{ // check for sculpt decoded image on cache)
if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + pbs.SculptTexture.ToString())))
return m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex);
}
if(pbs.SculptData != null && pbs.SculptData.Length >0)
return m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex);
}
} }
return mesh; return mesh;
} }

3
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -1353,6 +1353,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
if (m_mesh == null) if (m_mesh == null)
{ {
/*
bool convex; bool convex;
int clod = (int)LevelOfDetail.High; int clod = (int)LevelOfDetail.High;
@ -1366,6 +1367,8 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex); mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);
*/
mesh = _parent_scene.m_meshWorker.getMesh(this, _pbs, _size, m_shapetype);
} }
else else
{ {