diff options
author | Melanie | 2012-10-17 20:46:38 +0200 |
---|---|---|
committer | Melanie | 2012-10-17 20:46:38 +0200 |
commit | 0ca96669321b1a33190d0d93ae8f7b3aee60f492 (patch) | |
tree | ac3b6297630f461f468a13550eaabe571f993ac6 /OpenSim/Region/Physics/Meshing/Mesh.cs | |
parent | Allow the console to be used by gods as well as region owners. (diff) | |
parent | coment a debug warning (diff) | |
download | opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.zip opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.gz opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.bz2 opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Mesh.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs index c715642..6970553 100644 --- a/OpenSim/Region/Physics/Meshing/Mesh.cs +++ b/OpenSim/Region/Physics/Meshing/Mesh.cs | |||
@@ -148,6 +148,12 @@ namespace OpenSim.Region.Physics.Meshing | |||
148 | return Vector3.Zero; | 148 | return Vector3.Zero; |
149 | } | 149 | } |
150 | 150 | ||
151 | // not functional | ||
152 | public Vector3 GetOBB() | ||
153 | { | ||
154 | return new Vector3(0.5f, 0.5f, 0.5f); | ||
155 | } | ||
156 | |||
151 | public void CalcNormals() | 157 | public void CalcNormals() |
152 | { | 158 | { |
153 | int iTriangles = m_triangles.Count; | 159 | int iTriangles = m_triangles.Count; |
@@ -253,6 +259,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
253 | 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) |
254 | { | 260 | { |
255 | // A vertex is 3 floats | 261 | // A vertex is 3 floats |
262 | |||
256 | vertexStride = 3 * sizeof(float); | 263 | vertexStride = 3 * sizeof(float); |
257 | 264 | ||
258 | // 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 |