diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Physics/Meshing/SculptMesh.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/SculptMesh.cs | 7 |
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; | |||
30 | using System.Drawing; | 30 | using System.Drawing; |
31 | using System.Drawing.Imaging; | 31 | using System.Drawing.Imaging; |
32 | using System.Text; | 32 | using System.Text; |
33 | using OpenJPEGNet; | 33 | using OpenMetaverse.Imaging; |
34 | using Image = System.Drawing.Image; | ||
35 | 34 | ||
36 | namespace OpenSim.Region.Physics.Meshing | 35 | namespace 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); |