diff options
author | UbitUmarov | 2015-09-08 20:03:54 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-08 20:03:54 +0100 |
commit | 40fd7cbf7478b4b3966ef49728974ba3f75512dd (patch) | |
tree | e40872070b926d26100d5a79c304e31420da551f /OpenSim/Region/PhysicsModules | |
parent | more on compile.. (diff) | |
download | opensim-SC-40fd7cbf7478b4b3966ef49728974ba3f75512dd.zip opensim-SC-40fd7cbf7478b4b3966ef49728974ba3f75512dd.tar.gz opensim-SC-40fd7cbf7478b4b3966ef49728974ba3f75512dd.tar.bz2 opensim-SC-40fd7cbf7478b4b3966ef49728974ba3f75512dd.tar.xz |
a mess with Modules and Module
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
40 files changed, 44 insertions, 44 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 436ea75..6f27ac7 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.PhysicsModules.ConvexDecompositionDotNet; | 36 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
37 | 37 | ||
38 | namespace OpenSim.Region.PhysicsModule.BulletS | 38 | namespace OpenSim.Region.PhysicsModule.BulletS |
39 | { | 39 | { |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs index 176b02c..4ec6f51 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | |||
@@ -30,7 +30,6 @@ using System.Text; | |||
30 | using OMV = OpenMetaverse; | 30 | using OMV = OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.PhysicsModules.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; | ||
34 | 33 | ||
35 | namespace OpenSim.Region.PhysicsModule.BulletS | 34 | namespace OpenSim.Region.PhysicsModule.BulletS |
36 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs index 1c27c62..37cee20 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | |||
@@ -31,8 +31,8 @@ using System.Text; | |||
31 | 31 | ||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModules.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModules.Meshing; | 34 | using OpenSim.Region.PhysicsModule.Meshing; |
35 | using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; | 35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
36 | 36 | ||
37 | using OMV = OpenMetaverse; | 37 | using OMV = OpenMetaverse; |
38 | 38 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs index 4eeea4d..109e19c 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs | |||
@@ -34,7 +34,7 @@ using Nini.Config; | |||
34 | 34 | ||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.PhysicsModules.SharedBase; | 36 | using OpenSim.Region.PhysicsModules.SharedBase; |
37 | using OpenSim.Region.PhysicsModules.Meshing; | 37 | using OpenSim.Region.PhysicsModule.Meshing; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | 39 | ||
40 | using OpenMetaverse; | 40 | using OpenMetaverse; |
@@ -86,7 +86,7 @@ public static class BulletSimTestsUtil | |||
86 | info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize; | 86 | info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize; |
87 | OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info); | 87 | OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info); |
88 | 88 | ||
89 | IMesher mesher = new OpenSim.Region.PhysicsModules.Meshing.Meshmerizer(); | 89 | IMesher mesher = new OpenSim.Region.PhysicsModule.Meshing.Meshmerizer(); |
90 | INonSharedRegionModule mod = mesher as INonSharedRegionModule; | 90 | INonSharedRegionModule mod = mesher as INonSharedRegionModule; |
91 | mod.Initialise(openSimINI); | 91 | mod.Initialise(openSimINI); |
92 | mod.AddRegion(scene); | 92 | mod.AddRegion(scene); |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs index 3d81439..7ad689e 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.PhysicsModules.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModule.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 6a98535..4140d25 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.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 4480036..70c3a2b 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.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 e6dc98a..5046bce 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.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 09129ed..44e3e50 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.PhysicsModules.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModule.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 7d342d1..8a0164e 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.PhysicsModules.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModule.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 66457ac..d3f0052 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.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 b0bbfb9..3903254 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.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 f58cad6..da9ae0c 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.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 8f08ddf..42f7a22 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet |
33 | { | 33 | { |
34 | public enum PlaneTriResult : int | 34 | public enum PlaneTriResult : int |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs index 2d72117..045f620 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.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 cc5f99c..9f56bc5 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.PhysicsModules.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModule.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 da2255e..bfe11e5 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.PhysicsModules.ConvexDecompositionDotNet | 31 | namespace OpenSim.Region.PhysicsModule.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 2a58ec4..e7358c1 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.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 64a9ef8..fde9b32 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.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 266ed0b..c420fde 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.PhysicsModules.ConvexDecompositionDotNet | 32 | namespace OpenSim.Region.PhysicsModule.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 058934d..b2b6fd3 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.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 58f4f58..087eba7 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.PhysicsModules.ConvexDecompositionDotNet | 33 | namespace OpenSim.Region.PhysicsModule.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 b3d4ecb..90624eb 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.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 41e0912..e9320c0 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.PhysicsModules.ConvexDecompositionDotNet | 30 | namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet |
31 | { | 31 | { |
32 | public class int4 | 32 | public class int4 |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs index 34a925d..a0e3b7f 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs | |||
@@ -31,7 +31,7 @@ using System.Diagnostics; | |||
31 | using System.Globalization; | 31 | using System.Globalization; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Region.PhysicsModules.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModules.Meshing; | 34 | using OpenSim.Region.PhysicsModule.Meshing; |
35 | 35 | ||
36 | public class Vertex : IComparable<Vertex> | 36 | public class Vertex : IComparable<Vertex> |
37 | { | 37 | { |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs index 8c97f2f..e63ad01 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Region.PhysicsModules.SharedBase; | |||
33 | using PrimMesher; | 33 | using PrimMesher; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | 35 | ||
36 | namespace OpenSim.Region.PhysicsModules.Meshing | 36 | namespace OpenSim.Region.PhysicsModule.Meshing |
37 | { | 37 | { |
38 | public class Mesh : IMesh | 38 | public class Mesh : IMesh |
39 | { | 39 | { |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs index bae3449..0d22e96 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs | |||
@@ -44,7 +44,7 @@ using log4net; | |||
44 | using Nini.Config; | 44 | using Nini.Config; |
45 | using Mono.Addins; | 45 | using Mono.Addins; |
46 | 46 | ||
47 | namespace OpenSim.Region.PhysicsModules.Meshing | 47 | namespace OpenSim.Region.PhysicsModule.Meshing |
48 | { | 48 | { |
49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Meshmerizer")] | 49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Meshmerizer")] |
50 | public class Meshmerizer : IMesher, INonSharedRegionModule | 50 | public class Meshmerizer : IMesher, INonSharedRegionModule |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs index d6ac8b2..648a081 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs | |||
@@ -6,7 +6,7 @@ using Mono.Addins; | |||
6 | // General Information about an assembly is controlled through the following | 6 | // General Information about an assembly is controlled through the following |
7 | // set of attributes. Change these attribute values to modify the information | 7 | // set of attributes. Change these attribute values to modify the information |
8 | // associated with an assembly. | 8 | // associated with an assembly. |
9 | [assembly: AssemblyTitle("OpenSim.Region.PhysicsModules.Meshing")] | 9 | [assembly: AssemblyTitle("OpenSim.Region.PhysicsModule.Meshing")] |
10 | [assembly: AssemblyDescription("")] | 10 | [assembly: AssemblyDescription("")] |
11 | [assembly: AssemblyConfiguration("")] | 11 | [assembly: AssemblyConfiguration("")] |
12 | [assembly: AssemblyCompany("http://opensimulator.org")] | 12 | [assembly: AssemblyCompany("http://opensimulator.org")] |
@@ -32,5 +32,5 @@ using Mono.Addins; | |||
32 | // | 32 | // |
33 | [assembly: AssemblyVersion("0.8.2.*")] | 33 | [assembly: AssemblyVersion("0.8.2.*")] |
34 | 34 | ||
35 | [assembly: Addin("OpenSim.Region.PhysicsModules.Meshing", OpenSim.VersionInfo.VersionNumber)] | 35 | [assembly: Addin("OpenSim.Region.PhysicsModule.Meshing", OpenSim.VersionInfo.VersionNumber)] |
36 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] | 36 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs b/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs index 09676c6..dbf4f7e 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs | |||
@@ -47,7 +47,7 @@ using log4net; | |||
47 | * it's always availabe and thus the default in case of configuration errors | 47 | * it's always availabe and thus the default in case of configuration errors |
48 | */ | 48 | */ |
49 | 49 | ||
50 | namespace OpenSim.Region.PhysicsModules.Meshing | 50 | namespace OpenSim.Region.PhysicsModule.Meshing |
51 | { | 51 | { |
52 | 52 | ||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ZeroMesher")] | 53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ZeroMesher")] |
diff --git a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs index 6dc22bd..483e044 100644 --- a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs +++ b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.PhysicsModule.ODE.Tests | |||
65 | info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize; | 65 | info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize; |
66 | OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info); | 66 | OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info); |
67 | 67 | ||
68 | //IMesher mesher = new OpenSim.Region.PhysicsModules.Meshing.Meshmerizer(); | 68 | //IMesher mesher = new OpenSim.Region.PhysicsModule.Meshing.Meshmerizer(); |
69 | //INonSharedRegionModule mod = mesher as INonSharedRegionModule; | 69 | //INonSharedRegionModule mod = mesher as INonSharedRegionModule; |
70 | //mod.Initialise(openSimINI); | 70 | //mod.Initialise(openSimINI); |
71 | //mod.AddRegion(scene); | 71 | //mod.AddRegion(scene); |
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs index 284d9fe..fb38cdb 100644 --- a/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs +++ b/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs | |||
@@ -31,7 +31,7 @@ using System.Diagnostics; | |||
31 | using System.Globalization; | 31 | using System.Globalization; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Region.PhysicsModules.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModules.UbitMeshing; | 34 | using OpenSim.Region.PhysicsModule.UbitMeshing; |
35 | 35 | ||
36 | public class Vertex : IComparable<Vertex> | 36 | public class Vertex : IComparable<Vertex> |
37 | { | 37 | { |
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs index 485de63..e3bfe77 100644 --- a/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs +++ b/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs | |||
@@ -35,7 +35,7 @@ using OpenMetaverse; | |||
35 | using System.Runtime.Serialization; | 35 | using System.Runtime.Serialization; |
36 | using System.Runtime.Serialization.Formatters.Binary; | 36 | using System.Runtime.Serialization.Formatters.Binary; |
37 | 37 | ||
38 | namespace OpenSim.Region.PhysicsModules.UbitMeshing | 38 | namespace OpenSim.Region.PhysicsModule.UbitMeshing |
39 | { | 39 | { |
40 | public class MeshBuildingData | 40 | public class MeshBuildingData |
41 | { | 41 | { |
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs index 7318d31..60b0ce0 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.PhysicsModules.ConvexDecompositionDotNet; | 35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenMetaverse.StructuredData; | 37 | using OpenMetaverse.StructuredData; |
38 | using System.Drawing; | 38 | using System.Drawing; |
@@ -49,7 +49,7 @@ using System.Runtime.Serialization.Formatters.Binary; | |||
49 | 49 | ||
50 | using Mono.Addins; | 50 | using Mono.Addins; |
51 | 51 | ||
52 | namespace OpenSim.Region.PhysicsModules.UbitMeshing | 52 | namespace OpenSim.Region.PhysicsModule.UbitMeshing |
53 | { | 53 | { |
54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UbitMeshmerizer")] | 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UbitMeshmerizer")] |
55 | public class UbitMeshmerizer : IMesher, INonSharedRegionModule | 55 | public class UbitMeshmerizer : IMesher, INonSharedRegionModule |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs index 0edc46f..5622e48 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs | |||
@@ -37,7 +37,7 @@ using OpenSim.Framework; | |||
37 | using OpenSim.Region.PhysicsModules.SharedBase; | 37 | using OpenSim.Region.PhysicsModules.SharedBase; |
38 | using log4net; | 38 | using log4net; |
39 | 39 | ||
40 | namespace OpenSim.Region.PhysicsModules.UbitOde | 40 | namespace OpenSim.Region.PhysicsModule.UbitOde |
41 | { | 41 | { |
42 | /// <summary> | 42 | /// <summary> |
43 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. | 43 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs index 89adab8..abe6f37 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs | |||
@@ -50,7 +50,7 @@ using OdeAPI; | |||
50 | using OpenSim.Framework; | 50 | using OpenSim.Framework; |
51 | using OpenSim.Region.PhysicsModules.SharedBase; | 51 | using OpenSim.Region.PhysicsModules.SharedBase; |
52 | 52 | ||
53 | namespace OpenSim.Region.PhysicsModules.UbitOde | 53 | namespace OpenSim.Region.PhysicsModule.UbitOde |
54 | { | 54 | { |
55 | public class ODEDynamics | 55 | public class ODEDynamics |
56 | { | 56 | { |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs index 6fb10b1..330b191 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs | |||
@@ -16,7 +16,7 @@ using log4net; | |||
16 | using Nini.Config; | 16 | using Nini.Config; |
17 | using OpenMetaverse; | 17 | using OpenMetaverse; |
18 | 18 | ||
19 | namespace OpenSim.Region.PhysicsModules.UbitOde | 19 | namespace OpenSim.Region.PhysicsModule.UbitOde |
20 | { | 20 | { |
21 | public enum MeshState : byte | 21 | public enum MeshState : byte |
22 | { | 22 | { |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs index 344cfcc..8e8e069 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs | |||
@@ -57,7 +57,7 @@ using OdeAPI; | |||
57 | using OpenSim.Framework; | 57 | using OpenSim.Framework; |
58 | using OpenSim.Region.PhysicsModules.SharedBase; | 58 | using OpenSim.Region.PhysicsModules.SharedBase; |
59 | 59 | ||
60 | namespace OpenSim.Region.PhysicsModules.UbitOde | 60 | namespace OpenSim.Region.PhysicsModule.UbitOde |
61 | { | 61 | { |
62 | public class OdePrim : PhysicsActor | 62 | public class OdePrim : PhysicsActor |
63 | { | 63 | { |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs index eac4515..6b3672a 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs | |||
@@ -36,7 +36,7 @@ using OdeAPI; | |||
36 | using log4net; | 36 | using log4net; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | 38 | ||
39 | namespace OpenSim.Region.PhysicsModules.UbitOde | 39 | namespace OpenSim.Region.PhysicsModule.UbitOde |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Processes raycast requests as ODE is in a state to be able to do them. | 42 | /// Processes raycast requests as ODE is in a state to be able to do them. |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs index b1c758e..ef828de 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs | |||
@@ -36,7 +36,7 @@ using OdeAPI; | |||
36 | using log4net; | 36 | using log4net; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | 38 | ||
39 | namespace OpenSim.Region.PhysicsModules.UbitOde | 39 | namespace OpenSim.Region.PhysicsModule.UbitOde |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// </summary> | 42 | /// </summary> |
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs index 4031f0d..7211774 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs | |||
@@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
45 | using OpenSim.Region.PhysicsModules.SharedBase; | 45 | using OpenSim.Region.PhysicsModules.SharedBase; |
46 | using OpenMetaverse; | 46 | using OpenMetaverse; |
47 | 47 | ||
48 | namespace OpenSim.Region.PhysicsModules.UbitOde | 48 | namespace OpenSim.Region.PhysicsModule.UbitOde |
49 | { | 49 | { |
50 | // colision flags of things others can colide with | 50 | // colision flags of things others can colide with |
51 | // rays, sensors, probes removed since can't be colided with | 51 | // rays, sensors, probes removed since can't be colided with |
@@ -384,6 +384,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde | |||
384 | PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; | 384 | PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; |
385 | 385 | ||
386 | scene.RegisterModuleInterface<PhysicsScene>(this); | 386 | scene.RegisterModuleInterface<PhysicsScene>(this); |
387 | |||
387 | Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); | 388 | Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); |
388 | 389 | ||
389 | Initialization(extent); | 390 | Initialization(extent); |