fix function name

super626 · super626 · commit fa588b59fc7f · 2015-04-24T10:18:51.000+08:00
diff --git a/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp
@@ -206,7 +206,7 @@ const char*	btConvexHullShape::serialize(void* dataBuffer, btSerializer* seriali
 	return "btConvexHullShapeData";
 }
 
-void btConvexHullShape::project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const
+void btConvexHullShape::project6(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const
 {
 #if 1
 	minProj = FLT_MAX;
diff --git a/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h b/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h
@@ -73,7 +73,7 @@ ATTRIBUTE_ALIGNED16(class) btConvexHullShape : public btPolyhedralConvexAabbCach
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 	
 
-	virtual void project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const;
+	void project6(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const;
 
 
 	//debugging

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ const char* btConvexHullShape::serialize(void* dataBuffer, btSerializer* seriali`
`206`	`206`	`return "btConvexHullShapeData";`
`207`	`207`	`}`
`208`	`208`
`209`		`-void btConvexHullShape::project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const`
	`209`	`+void btConvexHullShape::project6(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const`
`210`	`210`	`{`
`211`	`211`	`#if 1`
`212`	`212`	`minProj = FLT_MAX;`