From 5be9119455257d055476cb455b26503052e5b939 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Tue, 8 Sep 2015 13:39:09 -0700
Subject: [PATCH] run the PhysicsServerExample 'stepSimulation' smoother fix a
 warning in ThirdParty/stb_image fix an single/double precision issue in
 btPolyhedralContactClipping.cpp

---
 examples/SharedMemory/PhysicsServerExample.cpp            | 8 ++++++--
 examples/ThirdPartyLibs/stb_image/stb_image.cpp           | 4 ++--
 .../NarrowPhaseCollision/btPolyhedralContactClipping.cpp  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/examples/SharedMemory/PhysicsServerExample.cpp b/examples/SharedMemory/PhysicsServerExample.cpp
index 87bbb8392..d6065407e 100644
--- a/examples/SharedMemory/PhysicsServerExample.cpp
+++ b/examples/SharedMemory/PhysicsServerExample.cpp
@@ -169,8 +169,12 @@ bool PhysicsServerExample::wantsTermination()
 
 void	PhysicsServerExample::stepSimulation(float deltaTime)
 {
-    
-    m_physicsServer.processClientCommands();
+	btClock rtc;
+	btScalar endTime = rtc.getTimeMilliseconds() + deltaTime*btScalar(800);
+	while (rtc.getTimeMilliseconds()<endTime)
+	{
+		m_physicsServer.processClientCommands();
+	}
 }
 
 void PhysicsServerExample::renderScene()
diff --git a/examples/ThirdPartyLibs/stb_image/stb_image.cpp b/examples/ThirdPartyLibs/stb_image/stb_image.cpp
index 226d7a8c8..bbae0b0e4 100644
--- a/examples/ThirdPartyLibs/stb_image/stb_image.cpp
+++ b/examples/ThirdPartyLibs/stb_image/stb_image.cpp
@@ -2619,7 +2619,7 @@ static int shiftsigned(int v, int shift, int bits)
 static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
 {
    uint8 *out;
-   unsigned int mr=0,mg=0,mb=0,ma=0, fake_a=0;
+   unsigned int mr=0,mg=0,mb=0,ma=0;//, fake_a=0;
    stbi_uc pal[256][4];
    int psize=0,i,j,compress=0,width;
    int bpp, flip_vertically, pad, target, offset, hsz;
@@ -2668,7 +2668,7 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
                   mg = 0xffu <<  8;
                   mb = 0xffu <<  0;
                   ma = 0xffu << 24;
-                  fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255
+                  //fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255
                } else {
                   mr = 31u << 10;
                   mg = 31u <<  5;
diff --git a/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp b/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
index ea131f0c4..d5f4a964b 100644
--- a/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
+++ b/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
@@ -116,7 +116,7 @@ static int gActualSATPairTests=0;
 
 inline bool IsAlmostZero(const btVector3& v)
 {
-	if(fabsf(v.x())>1e-6 || fabsf(v.y())>1e-6 || fabsf(v.z())>1e-6)	return false;
+	if(btFabs(v.x())>1e-6 || btFabs(v.y())>1e-6 || btFabs(v.z())>1e-6)	return false;
 	return true;
 }