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

fixes in test/SharedMemory

Browse Source
This commit is contained in:
Erwin Coumans
2015-12-15 13:45:34 -08:00
parent 46ddfa39d7
commit dabccd184d
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/SharedMemory/premake4.lua
View File

@@ -3,7 +3,7 @@ project ("Test_SharedMemoryPhysicsClient")
language "C++" language "C++"
kind "ConsoleApp" kind "ConsoleApp"
includedirs {"../../src", "../../examples/SharedMemory"} includedirs {"../../src", "../../examples"}
links { links {
"BulletFileLoader", "BulletFileLoader",
"Bullet3Common", "Bullet3Common",
@@ -31,7 +31,7 @@ project ("Test_PhysicsServerLoopBack")
language "C++" language "C++"
kind "ConsoleApp" kind "ConsoleApp"
includedirs {"../../src", "../../examples/SharedMemory", includedirs {"../../src", "../../examples",
"../../examples/ThirdPartyLibs"} "../../examples/ThirdPartyLibs"}
defines {"PHYSICS_LOOP_BACK"} defines {"PHYSICS_LOOP_BACK"}
links { links {
@@ -88,7 +88,7 @@ project ("Test_PhysicsServerLoopBack")
language "C++" language "C++"
kind "ConsoleApp" kind "ConsoleApp"
includedirs {"../../src", "../../examples/SharedMemory", includedirs {"../../src", "../../examples",
"../../examples/ThirdPartyLibs"} "../../examples/ThirdPartyLibs"}
defines {"PHYSICS_SERVER_DIRECT"} defines {"PHYSICS_SERVER_DIRECT"}
links { links {

11
test/SharedMemory/test.c
View File

@@ -1,16 +1,16 @@
//#include "SharedMemoryCommands.h" //#include "SharedMemoryCommands.h"
#include "PhysicsClientC_API.h" #include "SharedMemory/PhysicsClientC_API.h"
#ifdef PHYSICS_LOOP_BACK #ifdef PHYSICS_LOOP_BACK
#include "PhysicsLoopBackC_API.h" #include "SharedMemory/PhysicsLoopBackC_API.h"
#endif //PHYSICS_LOOP_BACK #endif //PHYSICS_LOOP_BACK
#ifdef PHYSICS_SERVER_DIRECT #ifdef PHYSICS_SERVER_DIRECT
#include "PhysicsDirectC_API.h" #include "SharedMemory/PhysicsDirectC_API.h"
#endif //PHYSICS_SERVER_DIRECT #endif //PHYSICS_SERVER_DIRECT
#include "SharedMemoryPublic.h" #include "SharedMemory/SharedMemoryPublic.h"
#include "Bullet3Common/b3Logging.h" #include "Bullet3Common/b3Logging.h"
#include <string.h> #include <string.h>
@@ -19,10 +19,9 @@
int main(int argc, char* argv[]) 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 sensorJointIndexLeft=-1;
int sensorJointIndexRight=-1; int sensorJointIndexRight=-1;
int statusType = -1;
const char* urdfFileName = "r2d2.urdf"; const char* urdfFileName = "r2d2.urdf";
double gravx=0, gravy=0, gravz=-9.8; double gravx=0, gravy=0, gravz=-9.8;
double timeStep = 1./60.; double timeStep = 1./60.;