diff options
Diffstat (limited to '')
24 files changed, 23 insertions, 27 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 6f27ac7..436ea75 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
@@ -33,7 +33,7 @@ using log4net; | |||
33 | using OMV = OpenMetaverse; | 33 | using OMV = OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.PhysicsModules.SharedBase; | 35 | using OpenSim.Region.PhysicsModules.SharedBase; |
36 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 36 | using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; |
37 | 37 | ||
38 | namespace OpenSim.Region.PhysicsModule.BulletS | 38 | namespace OpenSim.Region.PhysicsModule.BulletS |
39 | { | 39 | { |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs index 37cee20..e791b27 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | |||
@@ -32,7 +32,7 @@ using System.Text; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModules.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModule.Meshing; | 34 | using OpenSim.Region.PhysicsModule.Meshing; |
35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 35 | using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; |
36 | 36 | ||
37 | using OMV = OpenMetaverse; | 37 | using OMV = OpenMetaverse; |
38 | 38 | ||
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs index 7ad689e..3d81439 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
32 | { | 32 | { |
33 | public class Wpoint | 33 | public class Wpoint |
34 | { | 34 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs index 4140d25..6a98535 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public static class Concavity | 34 | public static class Concavity |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs index 70c3a2b..4480036 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public class DecompDesc | 34 | public class DecompDesc |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs index 5046bce..e6dc98a 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public delegate void ConvexDecompositionCallback(ConvexResult result); | 34 | public delegate void ConvexDecompositionCallback(ConvexResult result); |
35 | 35 | ||
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs index 44e3e50..09129ed 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
32 | { | 32 | { |
33 | public class ConvexResult | 33 | public class ConvexResult |
34 | { | 34 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs index 8a0164e..7d342d1 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
32 | { | 32 | { |
33 | public class HullResult | 33 | public class HullResult |
34 | { | 34 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs index d3f0052..66457ac 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public class HullTriangle : int3 | 34 | public class HullTriangle : int3 |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs index 3903254..b0bbfb9 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public static class HullUtils | 34 | public static class HullUtils |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs index da9ae0c..f58cad6 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class Plane | 32 | public class Plane |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs index 42f7a22..8f08ddf 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public enum PlaneTriResult : int | 34 | public enum PlaneTriResult : int |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs index c6ab386..113f547 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | |||
@@ -1,7 +1,6 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | using Mono.Addins; | ||
5 | 4 | ||
6 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
7 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
@@ -34,6 +33,3 @@ using Mono.Addins; | |||
34 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
35 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
36 | [assembly: AssemblyVersion("0.8.2.*")] | 35 | [assembly: AssemblyVersion("0.8.2.*")] |
37 | |||
38 | [assembly: Addin("OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet", OpenSim.VersionInfo.VersionNumber)] | ||
39 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] | ||
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs index 045f620..2d72117 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class Quaternion : float4 | 32 | public class Quaternion : float4 |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs index 9f56bc5..cc5f99c 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
32 | { | 32 | { |
33 | public class Rect3d | 33 | public class Rect3d |
34 | { | 34 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs index bfe11e5..da2255e 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
32 | { | 32 | { |
33 | public class VertexPool | 33 | public class VertexPool |
34 | { | 34 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs index e7358c1..2a58ec4 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class float2 | 32 | public class float2 |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs index fde9b32..64a9ef8 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class float3 : IEquatable<float3> | 32 | public class float3 : IEquatable<float3> |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs index c420fde..266ed0b 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public class float3x3 | 34 | public class float3x3 |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs index b2b6fd3..058934d 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class float4 | 32 | public class float4 |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs index 087eba7..58f4f58 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Linq; | 30 | using System.Linq; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 33 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
34 | { | 34 | { |
35 | public class float4x4 | 35 | public class float4x4 |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs index 90624eb..b3d4ecb 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class int3 | 32 | public class int3 |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs index e9320c0..41e0912 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class int4 | 32 | public class int4 |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs index 0bbd0db..ea86bb3 100644 --- a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs | |||
@@ -32,7 +32,7 @@ using OpenSim.Framework; | |||
32 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.PhysicsModules.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 35 | using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenMetaverse.StructuredData; | 37 | using OpenMetaverse.StructuredData; |
38 | using System.Drawing; | 38 | using System.Drawing; |