aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing/SculptMesh.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Meshing/SculptMesh.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index 360b2f7..707c0e3 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -30,14 +30,14 @@ using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Drawing.Imaging; 31using System.Drawing.Imaging;
32using System.Text; 32using System.Text;
33using OpenJPEGNet; 33using OpenMetaverse.Imaging;
34using Image = System.Drawing.Image;
35 34
36namespace OpenSim.Region.Physics.Meshing 35namespace OpenSim.Region.Physics.Meshing
37{ 36{
38 // This functionality based on the XNA SculptPreview by John Hurliman. 37 // This functionality based on the XNA SculptPreview by John Hurliman.
39 public class SculptMesh : Mesh 38 public class SculptMesh : Mesh
40 { 39 {
40 ManagedImage managedImage;
41 Image idata = null; 41 Image idata = null;
42 Bitmap bLOD = null; 42 Bitmap bLOD = null;
43 Bitmap bBitmap = null; 43 Bitmap bBitmap = null;
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.Meshing
55 55
56 try 56 try
57 { 57 {
58 idata = OpenJPEG.DecodeToImage(jpegData); 58 OpenJPEG.DecodeToImage(jpegData, out managedImage, out idata);
59 //int i = 0; 59 //int i = 0;
60 //i = i / i; 60 //i = i / i;
61 } 61 }
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Physics.Meshing
64 System.Console.WriteLine("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed!"); 64 System.Console.WriteLine("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed!");
65 return; 65 return;
66 } 66 }
67
67 if (idata != null) 68 if (idata != null)
68 { 69 {
69 bBitmap = new Bitmap(idata); 70 bBitmap = new Bitmap(idata);