float->btScalar

src/BulletSoftBody/btDefaultSoftBodySolver.cpp

@@ -132,7 +132,7 @@ void btDefaultSoftBodySolver::processCollision(btSoftBody *softBody, const btCol
 	softBody->defaultCollisionHandler(collisionObjectWrap);
 }  // btDefaultSoftBodySolver::processCollision
 
-void btDefaultSoftBodySolver::predictMotion(float timeStep)
+void btDefaultSoftBodySolver::predictMotion(btScalar timeStep)
 {
 	for (int i = 0; i < m_softBodySet.size(); ++i)
 	{

src/BulletSoftBody/btDefaultSoftBodySolver.h

@@ -46,9 +46,9 @@ public:
 
 	virtual void copyBackToSoftBodies(bool bMove = true);
 
-	virtual void solveConstraints(float solverdt);
+	virtual void solveConstraints(btScalar solverdt);
 
-	virtual void predictMotion(float solverdt);
+	virtual void predictMotion(btScalar solverdt);
 
 	virtual void copySoftBodyToVertexBuffer(const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer);
 

src/BulletSoftBody/btDeformableBodySolver.cpp

@@ -143,7 +143,7 @@ bool btDeformableBodySolver::updateNodes()
 }
 
 
-void btDeformableBodySolver::predictMotion(float solverdt)
+void btDeformableBodySolver::predictMotion(btScalar solverdt)
 {
     for (int i = 0; i < m_softBodySet.size(); ++i)
     {

src/BulletSoftBody/btDeformableBodySolver.h

@@ -58,14 +58,12 @@ public:
     virtual void updateSoftBodies();
 
     virtual void copyBackToSoftBodies(bool bMove = true) {}
-
-    void extracted(float solverdt);
     
     virtual void solveDeformableConstraints(btScalar solverdt);
     
     btScalar solveContactConstraints();
     
-    virtual void solveConstraints(float dt){}
+    virtual void solveConstraints(btScalar dt){}
     
     void reinitialize(const btAlignedObjectArray<btSoftBody *>& softBodies, btScalar dt);
     
@@ -81,7 +79,7 @@ public:
     
     void computeStep(TVStack& dv, const TVStack& residual);
                      
-    virtual void predictMotion(float solverdt);
+    virtual void predictMotion(btScalar solverdt);
 
     virtual void copySoftBodyToVertexBuffer(const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer) {}
 

src/BulletSoftBody/btSoftBodySolvers.h

@@ -72,10 +72,10 @@ public:
 	virtual void copyBackToSoftBodies(bool bMove = true) = 0;
 
 	/** Predict motion of soft bodies into next timestep */
-	virtual void predictMotion(float solverdt) = 0;
+	virtual void predictMotion(btScalar solverdt) = 0;
 
 	/** Solve constraints for a set of soft bodies */
-	virtual void solveConstraints(float solverdt) = 0;
+	virtual void solveConstraints(btScalar solverdt) = 0;
 
 	/** Perform necessary per-step updates of soft bodies such as recomputing normals and bounding boxes */
 	virtual void updateSoftBodies() = 0;