diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/SculptMesh.cs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs index a8f9ae5..4dc6e2e 100644 --- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs +++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs | |||
@@ -52,6 +52,7 @@ namespace PrimMesher | |||
52 | 52 | ||
53 | public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 }; | 53 | public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 }; |
54 | 54 | ||
55 | #if SYSTEM_DRAWING | ||
55 | // private Bitmap ScaleImage(Bitmap srcImage, float scale) | 56 | // private Bitmap ScaleImage(Bitmap srcImage, float scale) |
56 | // { | 57 | // { |
57 | // int sourceWidth = srcImage.Width; | 58 | // int sourceWidth = srcImage.Width; |
@@ -89,7 +90,7 @@ namespace PrimMesher | |||
89 | // return scaledImage; | 90 | // return scaledImage; |
90 | // } | 91 | // } |
91 | 92 | ||
92 | #if SYSTEM_DRAWING | 93 | |
93 | public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode) | 94 | public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode) |
94 | { | 95 | { |
95 | Bitmap bitmap = (Bitmap)Bitmap.FromFile(fileName); | 96 | Bitmap bitmap = (Bitmap)Bitmap.FromFile(fileName); |
@@ -320,20 +321,9 @@ namespace PrimMesher | |||
320 | if (sculptType == SculptType.plane) | 321 | if (sculptType == SculptType.plane) |
321 | invert = !invert; | 322 | invert = !invert; |
322 | 323 | ||
323 | //float sourceScaleFactor = (float)(lod) / (float)Math.Sqrt(sculptBitmap.Width * sculptBitmap.Height); | ||
324 | |||
325 | //int scale = (int)(1.0f / sourceScaleFactor); | ||
326 | //if (scale < 1) scale = 1; | ||
327 | |||
328 | //List<List<Coord>> rows = bitmap2Coords(sculptBitmap, scale, mirror); | ||
329 | |||
330 | viewerFaces = new List<ViewerFace>(); | 324 | viewerFaces = new List<ViewerFace>(); |
331 | 325 | ||
332 | //int width = sculptBitmap.Width / scale; | ||
333 | // int height = sculptBitmap.Height / scale; | ||
334 | |||
335 | int width = rows[0].Count; | 326 | int width = rows[0].Count; |
336 | // int height = rows.Count; | ||
337 | 327 | ||
338 | int p1, p2, p3, p4; | 328 | int p1, p2, p3, p4; |
339 | 329 | ||