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

revert accidently committed tweaks in demos

Browse Source
This commit is contained in:
erwin.coumans
2009-03-23 03:36:03 +00:00
parent 7ae29bd13e
commit 77fac5e2ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/BasicDemo/BasicDemo.cpp
View File

@@ -23,7 +23,7 @@ subject to the following restrictions:
#define MAX_PROXIES (ARRAY_SIZE_X*ARRAY_SIZE_Y*ARRAY_SIZE_Z + 1024) #define MAX_PROXIES (ARRAY_SIZE_X*ARRAY_SIZE_Y*ARRAY_SIZE_Z + 1024)
///scaling of the objects (0.1 = 20 centimeter boxes ) ///scaling of the objects (0.1 = 20 centimeter boxes )
#define SCALING 0.1 #define SCALING 1.
#define START_POS_X -5 #define START_POS_X -5
#define START_POS_Y -5 #define START_POS_Y -5
#define START_POS_Z -3 #define START_POS_Z -3

6
Demos/OpenGL/DemoApplication.cpp
View File

@@ -71,7 +71,7 @@ m_cameraUp(0,1,0),
m_forwardAxis(2), m_forwardAxis(2),
m_glutScreenWidth(0), m_glutScreenWidth(0),
m_glutScreenHeight(0), m_glutScreenHeight(0),
m_ShootBoxInitialSpeed(4.f), m_ShootBoxInitialSpeed(40.f),
m_stepping(true), m_stepping(true),
m_singleStep(false), m_singleStep(false),
m_idle(false), m_idle(false),
@@ -544,7 +544,7 @@ void DemoApplication::setShootBoxShape ()
btConvexShape* childShape = new btBoxShape(btVector3(1.f,1.f,1.f)); btConvexShape* childShape = new btBoxShape(btVector3(1.f,1.f,1.f));
m_shootBoxShape = new btUniformScalingShape(childShape,0.5f); m_shootBoxShape = new btUniformScalingShape(childShape,0.5f);
#else #else
m_shootBoxShape = new btSphereShape(.1f);//BoxShape(btVector3(1.f,1.f,1.f)); m_shootBoxShape = new btBoxShape(btVector3(.5f,.5f,.5f));
#endif// #endif//
} }
} }
@@ -554,7 +554,7 @@ void DemoApplication::shootBox(const btVector3& destination)
if (m_dynamicsWorld) if (m_dynamicsWorld)
{ {
float mass = 0.1f; float mass = 1.f;
btTransform startTransform; btTransform startTransform;
startTransform.setIdentity(); startTransform.setIdentity();
btVector3 camPos = getCameraPosition(); btVector3 camPos = getCameraPosition();