diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Region/Physics/Manager/IMesher.cs | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index ecc2918..5485eb7 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
| @@ -37,7 +37,7 @@ 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, bool forOde); | 40 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex, bool forOde); |
| 41 | IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex); | 41 | IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex); |
| 42 | void ReleaseMesh(IMesh mesh); | 42 | void ReleaseMesh(IMesh mesh); |
| 43 | void ExpireReleaseMeshs(); | 43 | void ExpireReleaseMeshs(); |
| @@ -83,6 +83,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 83 | List<Vector3> getVertexList(); | 83 | List<Vector3> getVertexList(); |
| 84 | int[] getIndexListAsInt(); | 84 | int[] getIndexListAsInt(); |
| 85 | int[] getIndexListAsIntLocked(); | 85 | int[] getIndexListAsIntLocked(); |
| 86 | float[] getVertexListAsFloat(); | ||
| 86 | float[] getVertexListAsFloatLocked(); | 87 | float[] getVertexListAsFloatLocked(); |
| 87 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); | 88 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); |
| 88 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); | 89 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); |