diff options
author | UbitUmarov | 2012-10-09 04:31:50 +0100 |
---|---|---|
committer | UbitUmarov | 2012-10-09 04:31:50 +0100 |
commit | 87175412882e8e4b7cd9d92d6a9be8546ec7e9e9 (patch) | |
tree | d857ccfd8dedc965033ee42b9678c4b175bcdd62 /OpenSim/Region/Physics/Meshing | |
parent | temporary debug code (diff) | |
download | opensim-SC_OLD-87175412882e8e4b7cd9d92d6a9be8546ec7e9e9.zip opensim-SC_OLD-87175412882e8e4b7cd9d92d6a9be8546ec7e9e9.tar.gz opensim-SC_OLD-87175412882e8e4b7cd9d92d6a9be8546ec7e9e9.tar.bz2 opensim-SC_OLD-87175412882e8e4b7cd9d92d6a9be8546ec7e9e9.tar.xz |
force allocation of mesh data on creation ( messy code version )
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Mesh.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs index c03f18b..6970553 100644 --- a/OpenSim/Region/Physics/Meshing/Mesh.cs +++ b/OpenSim/Region/Physics/Meshing/Mesh.cs | |||
@@ -259,6 +259,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
259 | public void getVertexListAsPtrToFloatArray(out IntPtr vertices, out int vertexStride, out int vertexCount) | 259 | public void getVertexListAsPtrToFloatArray(out IntPtr vertices, out int vertexStride, out int vertexCount) |
260 | { | 260 | { |
261 | // A vertex is 3 floats | 261 | // A vertex is 3 floats |
262 | |||
262 | vertexStride = 3 * sizeof(float); | 263 | vertexStride = 3 * sizeof(float); |
263 | 264 | ||
264 | // If there isn't an unmanaged array allocated yet, do it now | 265 | // If there isn't an unmanaged array allocated yet, do it now |
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index b462713..fd4ac7f 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -702,10 +702,11 @@ namespace OpenSim.Region.Physics.Meshing | |||
702 | return CreateMesh(primName, primShape, size, lod, false); | 702 | return CreateMesh(primName, primShape, size, lod, false); |
703 | } | 703 | } |
704 | 704 | ||
705 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex) | 705 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde) |
706 | { | 706 | { |
707 | return CreateMesh(primName, primShape, size, lod, false); | 707 | return CreateMesh(primName, primShape, size, lod, false); |
708 | } | 708 | } |
709 | |||
709 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) | 710 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) |
710 | { | 711 | { |
711 | #if SPAM | 712 | #if SPAM |