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

Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-10-14 13:20:04 -07:00
parent cb2c1d794c 2d88394cd5
commit ad5e6da4df
1 changed files with 92 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -256,13 +256,22 @@ namespace OpenSim.Region.Physics.Meshing
PrimMesh primMesh; PrimMesh primMesh;
PrimMesher.SculptMesh sculptMesh; PrimMesher.SculptMesh sculptMesh;
List<Coord> coords; List<Coord> coords = new List<Coord>();
List<Face> faces; List<Face> faces = new List<Face>();
Image idata = null; Image idata = null;
string decodedSculptFileName = ""; string decodedSculptFileName = "";
if (primShape.SculptEntry) if (primShape.SculptEntry)
{
if (((OpenMetaverse.SculptType)primShape.SculptType) == SculptType.Mesh)
{
// add code for mesh physics proxy generation here
m_log.Debug("[MESH]: mesh proxy generation not implemented yet ");
return null;
}
else
{ {
if (cacheSculptMaps && primShape.SculptTexture != UUID.Zero) if (cacheSculptMaps && primShape.SculptTexture != UUID.Zero)
{ {
@ -353,6 +362,7 @@ namespace OpenSim.Region.Physics.Meshing
coords = sculptMesh.coords; coords = sculptMesh.coords;
faces = sculptMesh.faces; faces = sculptMesh.faces;
} }
}
else else
{ {
float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f; float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;