mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-13 21:30:09 +00:00
add a few virtual destructors, remove physics client from server
This commit is contained in:
parent
24593ed11a
commit
0ca1cee6f0
@ -3,6 +3,7 @@
|
||||
|
||||
struct CommonCameraInterface
|
||||
{
|
||||
virtual ~CommonCameraInterface(){}
|
||||
virtual void getCameraProjectionMatrix(float m[16])const = 0;
|
||||
virtual void getCameraViewMatrix(float m[16]) const = 0;
|
||||
|
||||
|
@ -19,6 +19,7 @@ enum
|
||||
|
||||
struct CommonRenderInterface
|
||||
{
|
||||
virtual ~CommonRenderInterface() {}
|
||||
virtual void init()=0;
|
||||
virtual void updateCamera(int upAxis)=0;
|
||||
virtual void removeAllInstances() = 0;
|
||||
|
@ -15,7 +15,7 @@ subject to the following restrictions:
|
||||
|
||||
|
||||
#include "PhysicsServerExample.h"
|
||||
#include "PhysicsClientExample.h"
|
||||
|
||||
#include "Bullet3Common/b3CommandLineArgs.h"
|
||||
|
||||
#include "../CommonInterfaces/CommonExampleInterface.h"
|
||||
@ -73,16 +73,10 @@ int main(int argc, char* argv[])
|
||||
|
||||
args.GetCmdLineArgument("shared_memory_key", gSharedMemoryKey);
|
||||
|
||||
if (args.CheckCmdLineFlag("client"))
|
||||
{
|
||||
example = (SharedMemoryCommon*)PhysicsClientCreateFunc(options);
|
||||
}else
|
||||
{
|
||||
// options.m_option |= PHYSICS_SERVER_ENABLE_COMMAND_LOGGING;
|
||||
// options.m_option |= PHYSICS_SERVER_REPLAY_FROM_COMMAND_LOG;
|
||||
// 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();
|
||||
|
Loading…
Reference in New Issue
Block a user