diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index a8c99f7..ecc2918 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
@@ -37,9 +37,11 @@ namespace OpenSim.Region.Physics.Manager | |||
37 | { | 37 | { |
38 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod); | 38 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod); |
39 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical); | 39 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical); |
40 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical,bool convex); | 40 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde); |
41 | IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex); | ||
41 | void ReleaseMesh(IMesh mesh); | 42 | void ReleaseMesh(IMesh mesh); |
42 | void ExpireReleaseMeshs(); | 43 | void ExpireReleaseMeshs(); |
44 | void ExpireFileCache(); | ||
43 | } | 45 | } |
44 | 46 | ||
45 | // Values for level of detail to be passed to the mesher. | 47 | // Values for level of detail to be passed to the mesher. |
@@ -57,6 +59,7 @@ namespace OpenSim.Region.Physics.Manager | |||
57 | { | 59 | { |
58 | } | 60 | } |
59 | 61 | ||
62 | [Serializable()] | ||
60 | [StructLayout(LayoutKind.Explicit)] | 63 | [StructLayout(LayoutKind.Explicit)] |
61 | public struct AMeshKey | 64 | public struct AMeshKey |
62 | { | 65 | { |
@@ -66,6 +69,13 @@ namespace OpenSim.Region.Physics.Manager | |||
66 | public ulong hashA; | 69 | public ulong hashA; |
67 | [FieldOffset(8)] | 70 | [FieldOffset(8)] |
68 | public ulong hashB; | 71 | public ulong hashB; |
72 | [FieldOffset(16)] | ||
73 | public ulong hashC; | ||
74 | |||
75 | public override string ToString() | ||
76 | { | ||
77 | return uuid.ToString() + "-" + hashC.ToString("x") ; | ||
78 | } | ||
69 | } | 79 | } |
70 | 80 | ||
71 | public interface IMesh | 81 | public interface IMesh |
@@ -81,5 +91,6 @@ namespace OpenSim.Region.Physics.Manager | |||
81 | void Append(IMesh newMesh); | 91 | void Append(IMesh newMesh); |
82 | void TransformLinear(float[,] matrix, float[] offset); | 92 | void TransformLinear(float[,] matrix, float[] offset); |
83 | Vector3 GetCentroid(); | 93 | Vector3 GetCentroid(); |
94 | Vector3 GetOBB(); | ||
84 | } | 95 | } |
85 | } | 96 | } |