From dabccd184d9f9ceb9a7df0c1b1f3a12655f0fc86 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 15 Dec 2015 13:45:34 -0800 Subject: [PATCH] fixes in test/SharedMemory --- test/SharedMemory/premake4.lua | 6 +++--- test/SharedMemory/test.c | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/SharedMemory/premake4.lua b/test/SharedMemory/premake4.lua index 2dd047070..b96454580 100644 --- a/test/SharedMemory/premake4.lua +++ b/test/SharedMemory/premake4.lua @@ -3,7 +3,7 @@ project ("Test_SharedMemoryPhysicsClient") language "C++" kind "ConsoleApp" - includedirs {"../../src", "../../examples/SharedMemory"} + includedirs {"../../src", "../../examples"} links { "BulletFileLoader", "Bullet3Common", @@ -31,7 +31,7 @@ project ("Test_PhysicsServerLoopBack") language "C++" kind "ConsoleApp" - includedirs {"../../src", "../../examples/SharedMemory", + includedirs {"../../src", "../../examples", "../../examples/ThirdPartyLibs"} defines {"PHYSICS_LOOP_BACK"} links { @@ -88,7 +88,7 @@ project ("Test_PhysicsServerLoopBack") language "C++" kind "ConsoleApp" - includedirs {"../../src", "../../examples/SharedMemory", + includedirs {"../../src", "../../examples", "../../examples/ThirdPartyLibs"} defines {"PHYSICS_SERVER_DIRECT"} links { diff --git a/test/SharedMemory/test.c b/test/SharedMemory/test.c index abd716178..f30034630 100644 --- a/test/SharedMemory/test.c +++ b/test/SharedMemory/test.c @@ -1,16 +1,16 @@ //#include "SharedMemoryCommands.h" -#include "PhysicsClientC_API.h" +#include "SharedMemory/PhysicsClientC_API.h" #ifdef PHYSICS_LOOP_BACK -#include "PhysicsLoopBackC_API.h" +#include "SharedMemory/PhysicsLoopBackC_API.h" #endif //PHYSICS_LOOP_BACK #ifdef PHYSICS_SERVER_DIRECT -#include "PhysicsDirectC_API.h" +#include "SharedMemory/PhysicsDirectC_API.h" #endif //PHYSICS_SERVER_DIRECT -#include "SharedMemoryPublic.h" +#include "SharedMemory/SharedMemoryPublic.h" #include "Bullet3Common/b3Logging.h" #include @@ -19,10 +19,9 @@ int main(int argc, char* argv[]) { - int i, dofCount , posVarCount, dofIndex, ret ,numJoints, allowSharedMemoryInitialization=0; + int i, dofCount , posVarCount, ret ,numJoints ; int sensorJointIndexLeft=-1; int sensorJointIndexRight=-1; - int statusType = -1; const char* urdfFileName = "r2d2.urdf"; double gravx=0, gravy=0, gravz=-9.8; double timeStep = 1./60.;