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

fix btQuickprof introducing #define WIN32_LEAN_AND_MEAN, see also Issue 113

Browse Source
This commit is contained in:
erwin.coumans
2010-08-23 22:21:29 +00:00
parent 0ea249ec33
commit 436c71d440
3 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Demos/DX11ClothDemo/cloth_renderer.cpp
View File

@@ -1134,7 +1134,10 @@ HRESULT CALLBACK OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice, IDXGISwapCha
}
#ifndef BT_NO_PROFILE
btClock m_clock;
#endif //BT_NO_PROFILE
//--------------------------------------------------------------------------------------
// Render the scene using the D3D11 device
//--------------------------------------------------------------------------------------
@@ -1146,8 +1149,12 @@ void CALLBACK OnD3D11FrameRender( ID3D11Device* pd3dDevice, ID3D11DeviceContext*
//float ms = getDeltaTimeMicroseconds();
#ifndef BT_NO_PROFILE
btScalar dt = (btScalar)m_clock.getTimeMicroseconds();
m_clock.reset();
#else
btScalar dt = 1000000.f/60.f;
#endif //BT_NO_PROFILE
///step the simulation
if (m_dynamicsWorld && !paused)

9
Demos/OpenCLClothDemo/cl_cloth_demo.cpp
View File

@@ -400,14 +400,19 @@ void initBullet(void)
#ifndef BT_NO_PROFILE
btClock m_clock;
#endif //BT_NO_PROFILE
void doFlags()
{
//float ms = getDeltaTimeMicroseconds();
#ifndef BT_NO_PROFILE
btScalar dt = (btScalar)m_clock.getTimeMicroseconds();
m_clock.reset();
#else
btScalar dt = 1000000.f/60.f;
#endif
///step the simulation
if( m_dynamicsWorld )
@@ -418,7 +423,9 @@ void doFlags()
if (frameCount==100)
{
m_dynamicsWorld->stepSimulation(1./60.,0);
#ifndef BT_NO_PROFILE
CProfileManager::dumpAll();
#endif //BT_NO_PROFILE
}
updatePhysicsWorld();
}