From b4701613c8fa0b5acee6747aba0819a20cd80cc5 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 23 Nov 2015 08:00:42 -0800 Subject: [PATCH] consistent *API.* in examples/SharedMemory --- examples/ExampleBrowser/CMakeLists.txt | 4 ++-- examples/ExampleBrowser/premake4.lua | 4 ++-- examples/SharedMemory/PhysicsClientExample.cpp | 1 - .../{PhysicsLoopBackC_Api.cpp => PhysicsLoopBackC_API.cpp} | 0 .../{PhysicsLoopBackC_Api.h => PhysicsLoopBackC_API.h} | 0 examples/SharedMemory/PhysicsServerSharedMemory.cpp | 2 +- examples/SharedMemory/premake4.lua | 4 ++-- test/SharedMemory/premake4.lua | 6 +++--- 8 files changed, 10 insertions(+), 11 deletions(-) rename examples/SharedMemory/{PhysicsLoopBackC_Api.cpp => PhysicsLoopBackC_API.cpp} (100%) rename examples/SharedMemory/{PhysicsLoopBackC_Api.h => PhysicsLoopBackC_API.h} (100%) diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index d99f7c1b2..706199489 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -30,8 +30,8 @@ SET(App_ExampleBrowser_SRCS ../SharedMemory/PhysicsDirectC_API.h ../SharedMemory/PhysicsLoopBack.cpp ../SharedMemory/PhysicsLoopBack.h - ../SharedMemory/PhysicsLoopBackC_Api.cpp - ../SharedMemory/PhysicsLoopBackC_Api.h + ../SharedMemory/PhysicsLoopBackC_API.cpp + ../SharedMemory/PhysicsLoopBackC_API.h ../SharedMemory/PhysicsServerCommandProcessor.cpp ../SharedMemory/PhysicsServerCommandProcessor.h ../BasicDemo/BasicExample.cpp diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua index e6aeadf75..a30f0b950 100644 --- a/examples/ExampleBrowser/premake4.lua +++ b/examples/ExampleBrowser/premake4.lua @@ -68,8 +68,8 @@ "../SharedMemory/PhysicsDirectC_API.h", "../SharedMemory/PhysicsLoopBack.cpp", "../SharedMemory/PhysicsLoopBack.h", - "../SharedMemory/PhysicsLoopBackC_Api.cpp", - "../SharedMemory/PhysicsLoopBackC_Api.h", + "../SharedMemory/PhysicsLoopBackC_API.cpp", + "../SharedMemory/PhysicsLoopBackC_API.h", "../SharedMemory/PhysicsServerCommandProcessor.cpp", "../SharedMemory/PhysicsServerCommandProcessor.h", "../MultiThreading/MultiThreadingExample.cpp", diff --git a/examples/SharedMemory/PhysicsClientExample.cpp b/examples/SharedMemory/PhysicsClientExample.cpp index d069c40a5..307340382 100644 --- a/examples/SharedMemory/PhysicsClientExample.cpp +++ b/examples/SharedMemory/PhysicsClientExample.cpp @@ -10,7 +10,6 @@ //#include "SharedMemoryCommands.h" #include "PhysicsLoopBackC_API.h" #include "PhysicsDirectC_API.h" - #include "PhysicsClientC_API.h" struct MyMotorInfo2 diff --git a/examples/SharedMemory/PhysicsLoopBackC_Api.cpp b/examples/SharedMemory/PhysicsLoopBackC_API.cpp similarity index 100% rename from examples/SharedMemory/PhysicsLoopBackC_Api.cpp rename to examples/SharedMemory/PhysicsLoopBackC_API.cpp diff --git a/examples/SharedMemory/PhysicsLoopBackC_Api.h b/examples/SharedMemory/PhysicsLoopBackC_API.h similarity index 100% rename from examples/SharedMemory/PhysicsLoopBackC_Api.h rename to examples/SharedMemory/PhysicsLoopBackC_API.h diff --git a/examples/SharedMemory/PhysicsServerSharedMemory.cpp b/examples/SharedMemory/PhysicsServerSharedMemory.cpp index dc6846fa6..a00f3d1ae 100644 --- a/examples/SharedMemory/PhysicsServerSharedMemory.cpp +++ b/examples/SharedMemory/PhysicsServerSharedMemory.cpp @@ -240,7 +240,7 @@ void PhysicsServerSharedMemory::processClientCommands() m_data->m_testBlock1->m_numClientCommands++; } } -#endif 0 +#endif ///we ignore overflow of integer for now if (m_data->m_testBlock1->m_numClientCommands> m_data->m_testBlock1->m_numProcessedClientCommands) { diff --git a/examples/SharedMemory/premake4.lua b/examples/SharedMemory/premake4.lua index e2930b2bf..5882257b0 100644 --- a/examples/SharedMemory/premake4.lua +++ b/examples/SharedMemory/premake4.lua @@ -35,8 +35,8 @@ files { "PhysicsDirectC_API.h", "PhysicsLoopBack.cpp", "PhysicsLoopBack.h", - "PhysicsLoopBackC_Api.cpp", - "PhysicsLoopBackC_Api.h", + "PhysicsLoopBackC_API.cpp", + "PhysicsLoopBackC_API.h", "PhysicsServerCommandProcessor.cpp", "PhysicsServerCommandProcessor.h", "../Importers/ImportURDFDemo/ConvertRigidBodies2MultiBody.h", diff --git a/test/SharedMemory/premake4.lua b/test/SharedMemory/premake4.lua index 7ecb46301..2dd047070 100644 --- a/test/SharedMemory/premake4.lua +++ b/test/SharedMemory/premake4.lua @@ -55,8 +55,8 @@ project ("Test_PhysicsServerLoopBack") "../../examples/SharedMemory/PhysicsServerCommandProcessor.h", "../../examples/SharedMemory/PhysicsLoopBack.cpp", "../../examples/SharedMemory/PhysicsLoopBack.h", - "../../examples/SharedMemory/PhysicsLoopBackC_Api.cpp", - "../../examples/SharedMemory/PhysicsLoopBackC_Api.h", + "../../examples/SharedMemory/PhysicsLoopBackC_API.cpp", + "../../examples/SharedMemory/PhysicsLoopBackC_API.h", "../../examples/SharedMemory/PhysicsClientSharedMemory.cpp", "../../examples/SharedMemory/PhysicsClientSharedMemory.h", "../../examples/SharedMemory/PhysicsClientC_API.cpp", @@ -141,4 +141,4 @@ project ("Test_PhysicsServerLoopBack") } - \ No newline at end of file +