mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make input to PolygonVertexArray constant

Browse Source
This commit is contained in:
Mkr 2018-09-09 16:26:29 -07:00
parent fa1917a782
commit 54f17ac0aa
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/collision/PolygonVertexArray.cpp
View File

@ -43,14 +43,14 @@ using namespace reactphysics3d;
* @param vertexDataType Data type of the vertices data * @param vertexDataType Data type of the vertices data
* @param indexDataType Data type of the face indices data * @param indexDataType Data type of the face indices data
*/ */
PolygonVertexArray::PolygonVertexArray(uint nbVertices, void* verticesStart, int verticesStride, PolygonVertexArray::PolygonVertexArray(uint nbVertices, const void* verticesStart, int verticesStride,
void* indexesStart, int indexesStride, const void* indexesStart, int indexesStride,
uint nbFaces, PolygonFace* facesStart, uint nbFaces, PolygonFace* facesStart,
VertexDataType vertexDataType, IndexDataType indexDataType) { VertexDataType vertexDataType, IndexDataType indexDataType) {
mNbVertices = nbVertices; mNbVertices = nbVertices;
mVerticesStart = reinterpret_cast<unsigned char*>(verticesStart); mVerticesStart = reinterpret_cast<const unsigned char*>(verticesStart);
mVerticesStride = verticesStride; mVerticesStride = verticesStride;
mIndicesStart = reinterpret_cast<unsigned char*>(indexesStart); mIndicesStart = reinterpret_cast<const unsigned char*>(indexesStart);
mIndicesStride = indexesStride; mIndicesStride = indexesStride;
mNbFaces = nbFaces; mNbFaces = nbFaces;
mPolygonFacesStart = facesStart; mPolygonFacesStart = facesStart;
@ -71,7 +71,7 @@ uint PolygonVertexArray::getVertexIndexInFace(uint faceIndex, uint noVertexInFac
assert(noVertexInFace < face->nbVertices); assert(noVertexInFace < face->nbVertices);
void* vertexIndexPointer = mIndicesStart + (face->indexBase + noVertexInFace) * mIndicesStride; const void* vertexIndexPointer = mIndicesStart + (face->indexBase + noVertexInFace) * mIndicesStride;
if (mIndexDataType == PolygonVertexArray::IndexDataType::INDEX_INTEGER_TYPE) { if (mIndexDataType == PolygonVertexArray::IndexDataType::INDEX_INTEGER_TYPE) {
return *((uint*)vertexIndexPointer); return *((uint*)vertexIndexPointer);

16
src/collision/PolygonVertexArray.h
View File

@ -69,14 +69,14 @@ class PolygonVertexArray {
uint mNbVertices; uint mNbVertices;
/// Pointer to the first vertex value in the array /// Pointer to the first vertex value in the array
unsigned char* mVerticesStart; const unsigned char* mVerticesStart;
/// Stride (number of bytes) between the beginning of two vertices /// Stride (number of bytes) between the beginning of two vertices
/// values in the array /// values in the array
int mVerticesStride; int mVerticesStride;
/// Pointer to the first vertex index of the array /// Pointer to the first vertex index of the array
unsigned char* mIndicesStart; const unsigned char* mIndicesStart;
/// Stride (number of bytes) between the beginning of two indices in /// Stride (number of bytes) between the beginning of two indices in
/// the array /// the array
@ -97,8 +97,8 @@ class PolygonVertexArray {
public: public:
/// Constructor /// Constructor
PolygonVertexArray(uint nbVertices, void* verticesStart, int verticesStride, PolygonVertexArray(uint nbVertices, const void* verticesStart, int verticesStride,
void* indexesStart, int indexesStride, const void* indexesStart, int indexesStride,
uint nbFaces, PolygonFace* facesStart, uint nbFaces, PolygonFace* facesStart,
VertexDataType vertexDataType, IndexDataType indexDataType); VertexDataType vertexDataType, IndexDataType indexDataType);
@ -130,10 +130,10 @@ class PolygonVertexArray {
PolygonFace* getPolygonFace(uint faceIndex) const; PolygonFace* getPolygonFace(uint faceIndex) const;
/// Return the pointer to the start of the vertices array /// Return the pointer to the start of the vertices array
unsigned char* getVerticesStart() const; const unsigned char* getVerticesStart() const;
/// Return the pointer to the start of the indices array /// Return the pointer to the start of the indices array
unsigned char* getIndicesStart() const; const unsigned char* getIndicesStart() const;
}; };
// Return the vertex data type // Return the vertex data type
@ -198,7 +198,7 @@ inline PolygonVertexArray::PolygonFace* PolygonVertexArray::getPolygonFace(uint
/** /**
* @return A pointer to the start of the vertex array of the polyhedron * @return A pointer to the start of the vertex array of the polyhedron
*/ */
inline unsigned char* PolygonVertexArray::getVerticesStart() const { inline const unsigned char* PolygonVertexArray::getVerticesStart() const {
return mVerticesStart; return mVerticesStart;
} }
@ -206,7 +206,7 @@ inline unsigned char* PolygonVertexArray::getVerticesStart() const {
/** /**
* @return A pointer to the start of the face indices array of the polyhedron * @return A pointer to the start of the face indices array of the polyhedron
*/ */
inline unsigned char* PolygonVertexArray::getIndicesStart() const { inline const unsigned char* PolygonVertexArray::getIndicesStart() const {
return mIndicesStart; return mIndicesStart;
} }

2
src/collision/PolyhedronMesh.cpp
View File

@ -105,7 +105,7 @@ Vector3 PolyhedronMesh::getVertex(uint index) const {
uint vertexIndex = mHalfEdgeStructure.getVertex(index).vertexPointIndex; uint vertexIndex = mHalfEdgeStructure.getVertex(index).vertexPointIndex;
PolygonVertexArray::VertexDataType vertexType = mPolygonVertexArray->getVertexDataType(); PolygonVertexArray::VertexDataType vertexType = mPolygonVertexArray->getVertexDataType();
unsigned char* verticesStart = mPolygonVertexArray->getVerticesStart(); const unsigned char* verticesStart = mPolygonVertexArray->getVerticesStart();
int vertexStride = mPolygonVertexArray->getVerticesStride(); int vertexStride = mPolygonVertexArray->getVerticesStride();
Vector3 vertex; Vector3 vertex;