Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version update to 2.74

Browse Source
This commit is contained in:
erwin.coumans
2009-02-06 05:02:33 +00:00
parent 2162f6663d
commit f7092c0767
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
2.73 2.74

4
config.h.in
View File

@@ -60,10 +60,6 @@
/* Define to 1 if you have the <windows.h> header file. */ /* Define to 1 if you have the <windows.h> header file. */
#undef HAVE_WINDOWS_H #undef HAVE_WINDOWS_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE

2
configure.ac
View File

@@ -9,7 +9,7 @@ AC_PREREQ([2.54])
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
AC_INIT( AC_INIT(
[bullet], [bullet],
[2.73], [2.74],
[bullet@erwincoumans.com]) [bullet@erwincoumans.com])
AC_CANONICAL_HOST AC_CANONICAL_HOST
CS_PACKAGEINFO( CS_PACKAGEINFO(

16
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
View File

@@ -291,10 +291,13 @@ void btConeTwistConstraint::solveConstraintObsolete(btSolverBody& bodyA,btSolver
btTransform trBCur = m_rbB.getCenterOfMassTransform(); btTransform trBCur = m_rbB.getCenterOfMassTransform();
btVector3 omegaA; bodyA.getAngularVelocity(omegaA); btVector3 omegaA; bodyA.getAngularVelocity(omegaA);
btVector3 omegaB; bodyB.getAngularVelocity(omegaB); btVector3 omegaB; bodyB.getAngularVelocity(omegaB);
btTransform trAPred; trAPred.setIdentity(); btTransformUtil::integrateTransform( btTransform trAPred; trAPred.setIdentity();
trACur, btVector3(0,0,0), omegaA, timeStep, trAPred); btVector3 zerovec(0,0,0);
btTransform trBPred; trBPred.setIdentity(); btTransformUtil::integrateTransform( btTransformUtil::integrateTransform(
trBCur, btVector3(0,0,0), omegaB, timeStep, trBPred); trACur, zerovec, omegaA, timeStep, trAPred);
btTransform trBPred; trBPred.setIdentity();
btTransformUtil::integrateTransform(
trBCur, zerovec, omegaB, timeStep, trBPred);
// compute desired transforms in world // compute desired transforms in world
btTransform trPose(m_qTarget); btTransform trPose(m_qTarget);
@@ -304,8 +307,9 @@ void btConeTwistConstraint::solveConstraintObsolete(btSolverBody& bodyA,btSolver
// compute desired omegas in world // compute desired omegas in world
btVector3 omegaADes, omegaBDes; btVector3 omegaADes, omegaBDes;
btTransformUtil::calculateVelocity(trACur, trADes, timeStep, btVector3(0,0,0), omegaADes);
btTransformUtil::calculateVelocity(trBCur, trBDes, timeStep, btVector3(0,0,0), omegaBDes); btTransformUtil::calculateVelocity(trACur, trADes, timeStep, zerovec, omegaADes);
btTransformUtil::calculateVelocity(trBCur, trBDes, timeStep, zerovec, omegaBDes);
// compute delta omegas // compute delta omegas
btVector3 dOmegaA = omegaADes - omegaA; btVector3 dOmegaA = omegaADes - omegaA;

2
src/LinearMath/btScalar.h
View File

@@ -25,7 +25,7 @@ subject to the following restrictions:
#include <cfloat> #include <cfloat>
#include <float.h> #include <float.h>
#define BT_BULLET_VERSION 273 #define BT_BULLET_VERSION 274
inline int btGetVersion() inline int btGetVersion()
{ {