OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

demote ConvexDecompositionDotNet to a simple dll, i had made it a region module

avinationmerge
UbitUmarov 2015-09-09 15:07:35 +01:00
parent 52fb24ade5
commit 9a919bac3f
25 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
View File

@ -33,7 +33,7 @@ using log4net;
using OMV = OpenMetaverse; using OMV = OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
namespace OpenSim.Region.PhysicsModule.BulletS namespace OpenSim.Region.PhysicsModule.BulletS
{ {

2
OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
View File

@ -32,7 +32,7 @@ using System.Text;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.Meshing; using OpenSim.Region.PhysicsModule.Meshing;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OMV = OpenMetaverse; using OMV = OpenMetaverse;

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Wpoint public class Wpoint
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public static class Concavity public static class Concavity
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class DecompDesc public class DecompDesc
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public delegate void ConvexDecompositionCallback(ConvexResult result); public delegate void ConvexDecompositionCallback(ConvexResult result);

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class ConvexResult public class ConvexResult
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class HullResult public class HullResult
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class HullTriangle : int3 public class HullTriangle : int3
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public static class HullUtils public static class HullUtils
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Plane public class Plane
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public enum PlaneTriResult : int public enum PlaneTriResult : int
{ {

4
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
View File

@ -1,7 +1,6 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Mono.Addins;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
@ -34,6 +33,3 @@ using Mono.Addins;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.8.2.*")] [assembly: AssemblyVersion("0.8.2.*")]
[assembly: Addin("OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Quaternion : float4 public class Quaternion : float4
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Rect3d public class Rect3d
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class VertexPool public class VertexPool
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float2 public class float2
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float3 : IEquatable<float3> public class float3 : IEquatable<float3>
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float3x3 public class float3x3
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float4 public class float4
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float4x4 public class float4x4
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class int3 public class int3
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class int4 public class int4
{ {

2
OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
View File

@ -32,7 +32,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using System.Drawing; using System.Drawing;

8
prebuild.xml
View File

@ -381,7 +381,7 @@
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.Framework"/> <Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/> <Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/>
<Reference name="Mono.Addins" path="../../../../bin/"/> <Reference name="Mono.Addins" path="../../../../bin/"/>
<Reference name="log4net" path="../../../../bin/"/> <Reference name="log4net" path="../../../../bin/"/>
@ -416,7 +416,7 @@
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.Framework"/> <Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/> <Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/>
<Reference name="zlib.net" path="../../../../bin/"/> <Reference name="zlib.net" path="../../../../bin/"/>
<Reference name="Mono.Addins" path="../../../../bin/"/> <Reference name="Mono.Addins" path="../../../../bin/"/>
<Reference name="log4net" path="../../../../bin/"/> <Reference name="log4net" path="../../../../bin/"/>
@ -1592,7 +1592,7 @@
</Files> </Files>
</Project> </Project>
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library"> <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../../../../bin/</OutputPath> <OutputPath>../../../../bin/</OutputPath>
@ -1760,7 +1760,7 @@
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/"/> <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/> <Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/>
<Reference name="Mono.Addins" path="../../../../bin/"/> <Reference name="Mono.Addins" path="../../../../bin/"/>
<Reference name="BulletXNA.dll" path="../../../../bin/"/> <Reference name="BulletXNA.dll" path="../../../../bin/"/>
<Reference name="log4net.dll" path="../../../../bin/"/> <Reference name="log4net.dll" path="../../../../bin/"/>