mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-14 18:00:48 +00:00
working vhacd
renamed ThreadPool to TorqueThreadPool to avoid conflics fixed data transmission between stages of convexDecome and trimesh creation TODO: re-add our own functions for generating sphere/cylinder/box
This commit is contained in:
parent
679f0ff065
commit
eb33fe04af
15 changed files with 116 additions and 75 deletions
|
|
@ -65,7 +65,7 @@ namespace ImageUtil
|
|||
}
|
||||
|
||||
//Thread work job for compression
|
||||
struct CompressJob : public ThreadPool::WorkItem
|
||||
struct CompressJob : public TorqueThreadPool::WorkItem
|
||||
{
|
||||
S32 width;
|
||||
S32 height;
|
||||
|
|
@ -124,7 +124,7 @@ namespace ImageUtil
|
|||
srcDDS->mFlags.set(DDSFile::CompressedData);
|
||||
|
||||
//grab global thread pool
|
||||
ThreadPool* pThreadPool = &ThreadPool::GLOBAL();
|
||||
TorqueThreadPool* pThreadPool = &TorqueThreadPool::GLOBAL();
|
||||
|
||||
if (cubemap)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ void TheoraTexture::_onTextureEvent( GFXTexCallbackCode code )
|
|||
{
|
||||
// Blast out work items and then release all texture locks.
|
||||
|
||||
ThreadPool::GLOBAL().flushWorkItems();
|
||||
TorqueThreadPool::GLOBAL().flushWorkItems();
|
||||
mAsyncState->getFrameStream()->releaseTextureLocks();
|
||||
|
||||
// The Theora decoder does not implement seeking at the moment,
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ class TheoraTexture : private IOutputStream< TheoraTextureFrame* >,
|
|||
|
||||
///
|
||||
FrameReadItem( AsyncBufferedInputStream< TheoraTextureFrame*, IInputStream< OggTheoraFrame* >* >* stream,
|
||||
ThreadPool::Context* context );
|
||||
TorqueThreadPool::Context* context );
|
||||
};
|
||||
|
||||
/// Stream filter that turns a stream of OggTheoraFrames into a buffered background stream of TheoraTextureFrame
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue