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

ConvexPolyhedronShape::getVertex() should return constant references

Browse Source
This commit is contained in:
jingqi 2021-12-03 11:39:27 +08:00
parent 069b7d3961
commit e28c6e5d7f
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/reactphysics3d/collision/shapes/BoxShape.h
View File

@ -112,7 +112,7 @@ class BoxShape : public ConvexPolyhedronShape {
virtual uint32 getNbVertices() const override; virtual uint32 getNbVertices() const override;
/// Return a given vertex of the polyhedron /// Return a given vertex of the polyhedron
virtual HalfEdgeStructure::Vertex getVertex(uint32 vertexIndex) const override; virtual const HalfEdgeStructure::Vertex& getVertex(uint32 vertexIndex) const override;
/// Return the number of half-edges of the polyhedron /// Return the number of half-edges of the polyhedron
virtual uint32 getNbHalfEdges() const override; virtual uint32 getNbHalfEdges() const override;

4
include/reactphysics3d/collision/shapes/ConvexMeshShape.h
View File

@ -118,7 +118,7 @@ class ConvexMeshShape : public ConvexPolyhedronShape {
virtual uint32 getNbVertices() const override; virtual uint32 getNbVertices() const override;
/// Return a given vertex of the polyhedron /// Return a given vertex of the polyhedron
virtual HalfEdgeStructure::Vertex getVertex(uint32 vertexIndex) const override; virtual const HalfEdgeStructure::Vertex& getVertex(uint32 vertexIndex) const override;
/// Return the number of half-edges of the polyhedron /// Return the number of half-edges of the polyhedron
virtual uint32 getNbHalfEdges() const override; virtual uint32 getNbHalfEdges() const override;
@ -208,7 +208,7 @@ RP3D_FORCE_INLINE uint32 ConvexMeshShape::getNbVertices() const {
} }
// Return a given vertex of the polyhedron // Return a given vertex of the polyhedron
RP3D_FORCE_INLINE HalfEdgeStructure::Vertex ConvexMeshShape::getVertex(uint32 vertexIndex) const { RP3D_FORCE_INLINE const HalfEdgeStructure::Vertex& ConvexMeshShape::getVertex(uint32 vertexIndex) const {
assert(vertexIndex < getNbVertices()); assert(vertexIndex < getNbVertices());
return mPolyhedronMesh->getHalfEdgeStructure().getVertex(vertexIndex); return mPolyhedronMesh->getHalfEdgeStructure().getVertex(vertexIndex);
} }

2
include/reactphysics3d/collision/shapes/ConvexPolyhedronShape.h
View File

@ -68,7 +68,7 @@ class ConvexPolyhedronShape : public ConvexShape {
virtual uint32 getNbVertices() const=0; virtual uint32 getNbVertices() const=0;
/// Return a given vertex of the polyhedron /// Return a given vertex of the polyhedron
virtual HalfEdgeStructure::Vertex getVertex(uint32 vertexIndex) const=0; virtual const HalfEdgeStructure::Vertex& getVertex(uint32 vertexIndex) const=0;
/// Return the position of a given vertex /// Return the position of a given vertex
virtual Vector3 getVertexPosition(uint32 vertexIndex) const=0; virtual Vector3 getVertexPosition(uint32 vertexIndex) const=0;

13
include/reactphysics3d/collision/shapes/TriangleShape.h
View File

@ -151,7 +151,7 @@ class TriangleShape : public ConvexPolyhedronShape {
virtual uint32 getNbVertices() const override; virtual uint32 getNbVertices() const override;
/// Return a given vertex of the polyhedron /// Return a given vertex of the polyhedron
virtual HalfEdgeStructure::Vertex getVertex(uint32 vertexIndex) const override; virtual const HalfEdgeStructure::Vertex& getVertex(uint32 vertexIndex) const override;
/// Return the position of a given vertex /// Return the position of a given vertex
virtual Vector3 getVertexPosition(uint32 vertexIndex) const override; virtual Vector3 getVertexPosition(uint32 vertexIndex) const override;
@ -244,16 +244,9 @@ RP3D_FORCE_INLINE uint32 TriangleShape::getNbVertices() const {
} }
// Return a given vertex of the polyhedron // Return a given vertex of the polyhedron
RP3D_FORCE_INLINE HalfEdgeStructure::Vertex TriangleShape::getVertex(uint32 vertexIndex) const { RP3D_FORCE_INLINE const HalfEdgeStructure::Vertex& TriangleShape::getVertex(uint32 vertexIndex) const {
assert(vertexIndex < 3); assert(vertexIndex < 3);
return mTriangleHalfEdgeStructure.getVertex(vertexIndex);
HalfEdgeStructure::Vertex vertex(vertexIndex);
switch (vertexIndex) {
case 0: vertex.edgeIndex = 0; break;
case 1: vertex.edgeIndex = 2; break;
case 2: vertex.edgeIndex = 4; break;
}
return vertex;
} }
// Return the position of a given vertex // Return the position of a given vertex

2
src/collision/shapes/BoxShape.cpp
View File

@ -130,7 +130,7 @@ const HalfEdgeStructure::Face& BoxShape::getFace(uint32 faceIndex) const {
} }
// Return a given vertex of the polyhedron // Return a given vertex of the polyhedron
HalfEdgeStructure::Vertex BoxShape::getVertex(uint32 vertexIndex) const { const HalfEdgeStructure::Vertex& BoxShape::getVertex(uint32 vertexIndex) const {
assert(vertexIndex < getNbVertices()); assert(vertexIndex < getNbVertices());
return mPhysicsCommon.mBoxShapeHalfEdgeStructure.getVertex(vertexIndex); return mPhysicsCommon.mBoxShapeHalfEdgeStructure.getVertex(vertexIndex);
} }