Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-08-19 09:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes in cached textures (pointer re-use)

Browse Source
This commit is contained in:
Erwin Coumans
2020-09-13 16:49:13 -07:00
parent f9a96442d1
commit 0c2a54193c
2 changed files with 377 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/SharedMemory/PhysicsServerExample.cpp
View File

@@ -684,7 +684,7 @@ public:
GUIHelperInterface* m_childGuiHelper;
btHashMap<btHashPtr, int> m_cachedTextureIds;
int m_uidGenerator;
const unsigned char* m_texels;
int m_textureWidth;
@@ -910,7 +910,11 @@ public:
}
virtual int registerTexture(const unsigned char* texels, int width, int height)
{
int* cachedTexture = m_cachedTextureIds[texels];
if (cachedTexture)
{
return *cachedTexture;
}
m_texels = texels;
m_textureWidth = width;
m_textureHeight = height;
@@ -919,7 +923,7 @@ public:
m_cs->setSharedParam(1, eGUIHelperRegisterTexture);
workerThreadWait();
m_cachedTextureIds.insert(texels, m_textureId);
return m_textureId;
}
virtual int registerGraphicsShape(const float* vertices, int numvertices, const int* indices, int numIndices, int primitiveType, int textureId)
@@ -973,6 +977,7 @@ public:
virtual void removeAllGraphicsInstances()
{
m_cachedTextureIds.clear();
m_cs->lock();
m_cs->setSharedParam(1, eGUIHelperRemoveAllGraphicsInstances);
workerThreadWait();