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

add a few virtual destructors, remove physics client from server

Browse Source
This commit is contained in:
Erwin Coumans
2016-10-20 14:08:55 -07:00
parent 24593ed11a
commit 0ca1cee6f0
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/CommonInterfaces/CommonCameraInterface.h
View File

@@ -3,6 +3,7 @@
struct CommonCameraInterface struct CommonCameraInterface
{ {
virtual ~CommonCameraInterface(){}
virtual void getCameraProjectionMatrix(float m[16])const = 0; virtual void getCameraProjectionMatrix(float m[16])const = 0;
virtual void getCameraViewMatrix(float m[16]) const = 0; virtual void getCameraViewMatrix(float m[16]) const = 0;

1
examples/CommonInterfaces/CommonRenderInterface.h
View File

@@ -19,6 +19,7 @@ enum
struct CommonRenderInterface struct CommonRenderInterface
{ {
virtual ~CommonRenderInterface() {}
virtual void init()=0; virtual void init()=0;
virtual void updateCamera(int upAxis)=0; virtual void updateCamera(int upAxis)=0;
virtual void removeAllInstances() = 0; virtual void removeAllInstances() = 0;

14
examples/SharedMemory/main.cpp
View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
#include "PhysicsServerExample.h" #include "PhysicsServerExample.h"
#include "PhysicsClientExample.h"
#include "Bullet3Common/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include "../CommonInterfaces/CommonExampleInterface.h" #include "../CommonInterfaces/CommonExampleInterface.h"
@@ -73,16 +73,10 @@ int main(int argc, char* argv[])
args.GetCmdLineArgument("shared_memory_key", gSharedMemoryKey); args.GetCmdLineArgument("shared_memory_key", gSharedMemoryKey);
if (args.CheckCmdLineFlag("client")) // options.m_option |= PHYSICS_SERVER_ENABLE_COMMAND_LOGGING;
{ // options.m_option |= PHYSICS_SERVER_REPLAY_FROM_COMMAND_LOG;
example = (SharedMemoryCommon*)PhysicsClientCreateFunc(options);
}else
{
// options.m_option |= PHYSICS_SERVER_ENABLE_COMMAND_LOGGING;
// options.m_option |= PHYSICS_SERVER_REPLAY_FROM_COMMAND_LOG;
example = (SharedMemoryCommon*)PhysicsServerCreateFunc(options); example = (SharedMemoryCommon*)PhysicsServerCreateFunc(options);
}
example->initPhysics(); example->initPhysics();