mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-06-12 08:23:59 +00:00
update bullet so it actually works
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
parent
c7be48130a
commit
13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
|
|
@ -18,24 +18,26 @@ subject to the following restrictions:
|
|||
|
||||
enum
|
||||
{
|
||||
B3_THREAD_SCHEDULE_TASK=1,
|
||||
B3_THREAD_SCHEDULE_TASK = 1,
|
||||
};
|
||||
|
||||
#include "Bullet3Common/b3Scalar.h" //for B3_ATTRIBUTE_ALIGNED16
|
||||
#include "Bullet3Common/b3Scalar.h" //for B3_ATTRIBUTE_ALIGNED16
|
||||
//#include "PlatformDefinitions.h"
|
||||
//#include "PpuAddressSpace.h"
|
||||
|
||||
class b3Barrier {
|
||||
class b3Barrier
|
||||
{
|
||||
public:
|
||||
b3Barrier() {}
|
||||
virtual ~b3Barrier() {}
|
||||
|
||||
virtual void sync() = 0;
|
||||
virtual void setMaxCount(int n) = 0;
|
||||
virtual int getMaxCount() = 0;
|
||||
virtual int getMaxCount() = 0;
|
||||
};
|
||||
|
||||
class b3CriticalSection {
|
||||
class b3CriticalSection
|
||||
{
|
||||
public:
|
||||
b3CriticalSection() {}
|
||||
virtual ~b3CriticalSection() {}
|
||||
|
|
@ -43,48 +45,40 @@ public:
|
|||
B3_ATTRIBUTE_ALIGNED16(unsigned int mCommonBuff[32]);
|
||||
|
||||
virtual unsigned int getSharedParam(int i) = 0;
|
||||
virtual void setSharedParam(int i,unsigned int p) = 0;
|
||||
virtual void setSharedParam(int i, unsigned int p) = 0;
|
||||
|
||||
virtual void lock() = 0;
|
||||
virtual void unlock() = 0;
|
||||
};
|
||||
|
||||
|
||||
class b3ThreadSupportInterface
|
||||
{
|
||||
public:
|
||||
|
||||
virtual ~b3ThreadSupportInterface();
|
||||
|
||||
virtual void runTask(int uiCommand, void* uiArgument0, int uiArgument1) = 0;
|
||||
|
||||
virtual void runTask(int uiCommand, void* uiArgument0, int uiArgument1) =0;
|
||||
|
||||
|
||||
virtual void waitForResponse(int *puiArgument0, int *puiArgument1) =0;
|
||||
|
||||
virtual void waitForResponse(int* puiArgument0, int* puiArgument1) = 0;
|
||||
|
||||
///non-blocking test if a task is completed. First implement all versions, and then enable this API
|
||||
virtual bool isTaskCompleted(int *puiArgument0, int *puiArgument1, int timeOutInMilliseconds)=0;
|
||||
virtual bool isTaskCompleted(int* puiArgument0, int* puiArgument1, int timeOutInMilliseconds) = 0;
|
||||
|
||||
|
||||
virtual void stopThreads()=0;
|
||||
virtual void stopThreads() = 0;
|
||||
|
||||
///tell the task scheduler to use no more than numTasks tasks
|
||||
virtual void setNumTasks(int numTasks)=0;
|
||||
virtual void setNumTasks(int numTasks) = 0;
|
||||
|
||||
virtual int getNumTasks() const = 0;
|
||||
virtual int getNumTasks() const = 0;
|
||||
|
||||
virtual b3Barrier* createBarrier() = 0;
|
||||
virtual b3Barrier* createBarrier() = 0;
|
||||
|
||||
virtual b3CriticalSection* createCriticalSection() = 0;
|
||||
|
||||
virtual void deleteBarrier(b3Barrier* barrier)=0;
|
||||
virtual void deleteBarrier(b3Barrier* barrier) = 0;
|
||||
|
||||
virtual void deleteCriticalSection(b3CriticalSection* criticalSection)=0;
|
||||
|
||||
virtual void* getThreadLocalMemory(int taskId) { return 0; }
|
||||
virtual void deleteCriticalSection(b3CriticalSection* criticalSection) = 0;
|
||||
|
||||
virtual void* getThreadLocalMemory(int taskId) { return 0; }
|
||||
};
|
||||
|
||||
#endif //B3_THREAD_SUPPORT_INTERFACE_H
|
||||
|
||||
#endif //B3_THREAD_SUPPORT_INTERFACE_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue