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

make Bullet compile on Visual Studio 6

Browse Source
This commit is contained in:
erwin.coumans
2010-01-30 23:10:12 +00:00
parent 788f48643b
commit e57f03599a
12 changed files with 515 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp
View File

@@ -254,7 +254,7 @@ void CollisionInterfaceDemo::clientResetScene()
{
objects[0].getWorldTransform().setOrigin(btVector3(0.0f,3.f,0.f));
btQuaternion rotA(0.739,-0.204,0.587,0.257);
btQuaternion rotA(0.739f,-0.204f,0.587f,0.257f);
rotA.normalize();
objects[0].getWorldTransform().setRotation(rotA);

8
Demos/GenericJointDemo/Ragdoll.cpp
View File

@@ -97,9 +97,9 @@ btScalar(0.)));
// Setup some damping on the m_bodies
for (int i = 0; i < BODYPART_COUNT; ++i)
{
m_bodies[i]->setDamping(0.05, 0.85);
m_bodies[i]->setDeactivationTime(0.8);
m_bodies[i]->setSleepingThresholds(1.6, 2.5);
m_bodies[i]->setDamping(0.05f, 0.85f);
m_bodies[i]->setDeactivationTime(0.8f);
m_bodies[i]->setSleepingThresholds(1.6f, 2.5f);
}
///////////////////////////// SETTING THE CONSTRAINTS /////////////////////////////////////////////7777
@@ -191,7 +191,7 @@ btScalar(0.)));
joint6DOF->setAngularUpperLimit(btVector3(SIMD_EPSILON,SIMD_EPSILON,SIMD_EPSILON));
#else
joint6DOF->setAngularLowerLimit(btVector3(-SIMD_EPSILON,-SIMD_EPSILON,-SIMD_EPSILON));
joint6DOF->setAngularUpperLimit(btVector3(SIMD_PI*0.7,SIMD_EPSILON,SIMD_EPSILON));
joint6DOF->setAngularUpperLimit(btVector3(SIMD_PI*0.7f,SIMD_EPSILON,SIMD_EPSILON));
#endif
m_joints[JOINT_LEFT_ELBOW] = joint6DOF;
m_ownerWorld->addConstraint(m_joints[JOINT_LEFT_ELBOW], true);

6
Demos/OpenGL/GL_DialogDynamicsWorld.cpp
View File

@@ -110,7 +110,9 @@ void GL_DialogDynamicsWorld::setScreenSize(int width, int height)
{
for (int i=0;i<m_dynamicsWorld->getCollisionObjectArray().size();i++)
int i;
for ( i=0;i<m_dynamicsWorld->getCollisionObjectArray().size();i++)
{
btCollisionObject* colObj = m_dynamicsWorld->getCollisionObjectArray()[i];
btRigidBody* body = btRigidBody::upcast(colObj);
@@ -129,7 +131,7 @@ void GL_DialogDynamicsWorld::setScreenSize(int width, int height)
}
}
for (int i=0;i<m_dialogs.size();i++)
for ( i=0;i<m_dialogs.size();i++)
{
m_dialogs[i]->setScreenSize(width,height);
}

20
Demos/SoftDemo/CMakeLists.txt
View File

@@ -10,6 +10,7 @@
# You shouldn't have to modify anything below this line
########################################################
IF (USE_GLUT)
INCLUDE_DIRECTORIES(
@@ -25,3 +26,22 @@ ADD_EXECUTABLE(AppSoftBodyDemo
SoftDemo.cpp
)
IF (WIN32)
IF (CMAKE_CL_64)
ADD_CUSTOM_COMMAND(
TARGET AppSoftBodyDemo
POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
)
ELSE(CMAKE_CL_64)
ADD_CUSTOM_COMMAND(
TARGET AppSoftBodyDemo
POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
)
ENDIF(CMAKE_CL_64)
ENDIF(WIN32)
ELSE(USE_GLUT)
ENDIF (USE_GLUT)

4
Demos/SoftDemo/SoftDemo.cpp
View File

@@ -218,7 +218,7 @@ void SoftDemo::clientMoveAndDisplay()
#endif //PRINT_CONTACT_STATISTICS
glutSwapBuffers();
swapBuffers();
}
@@ -232,7 +232,7 @@ void SoftDemo::displayCallback(void) {
renderme();
glFlush();
glutSwapBuffers();
swapBuffers();
}

8
Demos/SoftDemo/SoftDemo.h
View File

@@ -19,7 +19,13 @@ subject to the following restrictions:
#ifndef SOFT_DEMO_H
#define SOFT_DEMO_H
#ifdef _WINDOWS
#include "Win32DemoApplication.h"
#define PlatformDemoApplication Win32DemoApplication
#else
#include "GlutDemoApplication.h"
#define PlatformDemoApplication GlutDemoApplication
#endif
#include "LinearMath/btAlignedObjectArray.h"
#include "BulletSoftBody/btSoftBody.h"
@@ -41,7 +47,7 @@ class btSoftRigidDynamicsWorld;
///CcdPhysicsDemo shows basic stacking using Bullet physics, and allows toggle of Ccd (using key '1')
class SoftDemo : public GlutDemoApplication
class SoftDemo : public PlatformDemoApplication
{
public: