MiniCL and BulletMultiThreaded respect the LIB_SUFFIX
Thanks to pprkut@liwjatan.at for the report in Issue 436 Remove unimplemented methods in headerfiles, thanks to csaba.hruska in Issue 437
This commit is contained in:
@@ -44,7 +44,7 @@ struct btCollisionAlgorithmConstructionInfo
|
|||||||
btDispatcher* m_dispatcher1;
|
btDispatcher* m_dispatcher1;
|
||||||
btPersistentManifold* m_manifold;
|
btPersistentManifold* m_manifold;
|
||||||
|
|
||||||
int getDispatcherId();
|
// int getDispatcherId();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ protected:
|
|||||||
btDispatcher* m_dispatcher;
|
btDispatcher* m_dispatcher;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int getDispatcherId();
|
// int getDispatcherId();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|||||||
@@ -383,9 +383,9 @@ public:
|
|||||||
return m_box_tree.get_node_pointer(index);
|
return m_box_tree.get_node_pointer(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef TRI_COLLISION_PROFILING
|
||||||
static float getAverageTreeCollisionTime();
|
static float getAverageTreeCollisionTime();
|
||||||
|
#endif //TRI_COLLISION_PROFILING
|
||||||
|
|
||||||
static void find_collision(btGImpactBvh * boxset1, const btTransform & trans1,
|
static void find_collision(btGImpactBvh * boxset1, const btTransform & trans1,
|
||||||
btGImpactBvh * boxset2, const btTransform & trans2,
|
btGImpactBvh * boxset2, const btTransform & trans2,
|
||||||
|
|||||||
@@ -222,13 +222,13 @@ public:
|
|||||||
|
|
||||||
//! Use this function for register the algorithm externally
|
//! Use this function for register the algorithm externally
|
||||||
static void registerAlgorithm(btCollisionDispatcher * dispatcher);
|
static void registerAlgorithm(btCollisionDispatcher * dispatcher);
|
||||||
|
#ifdef TRI_COLLISION_PROFILING
|
||||||
//! Gets the average time in miliseconds of tree collisions
|
//! Gets the average time in miliseconds of tree collisions
|
||||||
static float getAverageTreeCollisionTime();
|
static float getAverageTreeCollisionTime();
|
||||||
|
|
||||||
//! Gets the average time in miliseconds of triangle collisions
|
//! Gets the average time in miliseconds of triangle collisions
|
||||||
static float getAverageTriangleCollisionTime();
|
static float getAverageTriangleCollisionTime();
|
||||||
|
#endif //TRI_COLLISION_PROFILING
|
||||||
|
|
||||||
//! Collides two gimpact shapes
|
//! Collides two gimpact shapes
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -359,9 +359,9 @@ public:
|
|||||||
return m_box_tree.get_node_pointer(index);
|
return m_box_tree.get_node_pointer(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef TRI_COLLISION_PROFILING
|
||||||
static float getAverageTreeCollisionTime();
|
static float getAverageTreeCollisionTime();
|
||||||
|
#endif //TRI_COLLISION_PROFILING
|
||||||
|
|
||||||
static void find_collision(btGImpactQuantizedBvh * boxset1, const btTransform & trans1,
|
static void find_collision(btGImpactQuantizedBvh * boxset1, const btTransform & trans1,
|
||||||
btGImpactQuantizedBvh * boxset2, const btTransform & trans2,
|
btGImpactQuantizedBvh * boxset2, const btTransform & trans2,
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ public:
|
|||||||
|
|
||||||
void updateWheelTransform( int wheelIndex, bool interpolatedTransform = true );
|
void updateWheelTransform( int wheelIndex, bool interpolatedTransform = true );
|
||||||
|
|
||||||
void setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth);
|
// void setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth);
|
||||||
|
|
||||||
btWheelInfo& addWheel( const btVector3& connectionPointCS0, const btVector3& wheelDirectionCS0,const btVector3& wheelAxleCS,btScalar suspensionRestLength,btScalar wheelRadius,const btVehicleTuning& tuning, bool isFrontWheel);
|
btWheelInfo& addWheel( const btVector3& connectionPointCS0, const btVector3& wheelDirectionCS0,const btVector3& wheelAxleCS,btScalar suspensionRestLength,btScalar wheelRadius,const btVehicleTuning& tuning, bool isFrontWheel);
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ IF (INSTALL_LIBS)
|
|||||||
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||||
INSTALL(TARGETS BulletMultiThreaded DESTINATION .)
|
INSTALL(TARGETS BulletMultiThreaded DESTINATION .)
|
||||||
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||||
INSTALL(TARGETS BulletMultiThreaded DESTINATION lib)
|
INSTALL(TARGETS BulletMultiThreaded DESTINATION lib${LIB_SUFFIX})
|
||||||
INSTALL(DIRECTORY
|
INSTALL(DIRECTORY
|
||||||
${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING
|
${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING
|
||||||
PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
|
PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
|
||||||
|
|||||||
@@ -119,16 +119,16 @@ struct btSoftBodyHelpers
|
|||||||
|
|
||||||
|
|
||||||
/* Export TetGen compatible .smesh file */
|
/* Export TetGen compatible .smesh file */
|
||||||
static void ExportAsSMeshFile( btSoftBody* psb,
|
// static void ExportAsSMeshFile( btSoftBody* psb,
|
||||||
const char* filename);
|
// const char* filename);
|
||||||
/* Create from TetGen .ele, .face, .node files */
|
/* Create from TetGen .ele, .face, .node files */
|
||||||
static btSoftBody* CreateFromTetGenFile( btSoftBodyWorldInfo& worldInfo,
|
// static btSoftBody* CreateFromTetGenFile( btSoftBodyWorldInfo& worldInfo,
|
||||||
const char* ele,
|
// const char* ele,
|
||||||
const char* face,
|
// const char* face,
|
||||||
const char* node,
|
// const char* node,
|
||||||
bool bfacelinks,
|
// bool bfacelinks,
|
||||||
bool btetralinks,
|
// bool btetralinks,
|
||||||
bool bfacesfromtetras);
|
// bool bfacesfromtetras);
|
||||||
/* Create from TetGen .ele, .face, .node data */
|
/* Create from TetGen .ele, .face, .node data */
|
||||||
static btSoftBody* CreateFromTetGenData( btSoftBodyWorldInfo& worldInfo,
|
static btSoftBody* CreateFromTetGenData( btSoftBodyWorldInfo& worldInfo,
|
||||||
const char* ele,
|
const char* ele,
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ IF (INSTALL_LIBS)
|
|||||||
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||||
INSTALL(TARGETS MiniCL DESTINATION .)
|
INSTALL(TARGETS MiniCL DESTINATION .)
|
||||||
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||||
INSTALL(TARGETS MiniCL DESTINATION lib)
|
INSTALL(TARGETS MiniCL DESTINATION lib${LIB_SUFFIX})
|
||||||
INSTALL(DIRECTORY
|
INSTALL(DIRECTORY
|
||||||
${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING
|
${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING
|
||||||
PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
|
PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
|
||||||
|
|||||||
Reference in New Issue
Block a user