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

fix issue with plugin manager (store plugin uid instead of pointer)

Browse Source
This commit is contained in:
erwincoumans
2018-02-06 08:56:24 -08:00
parent 805d4b49b3
commit 3fb26e4835
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
examples/SharedMemory/b3PluginManager.cpp
View File

@@ -78,7 +78,7 @@ typedef b3PoolBodyHandle<b3Plugin> b3PluginHandle;
struct b3PluginManagerInternalData struct b3PluginManagerInternalData
{ {
b3ResizablePool<b3PluginHandle> m_plugins; b3ResizablePool<b3PluginHandle> m_plugins;
b3HashMap<b3HashString, b3PluginHandle*> m_pluginMap; b3HashMap<b3HashString, int> m_pluginMap;
PhysicsDirect* m_physicsDirect; PhysicsDirect* m_physicsDirect;
b3AlignedObjectArray<b3KeyboardEvent> m_keyEvents; b3AlignedObjectArray<b3KeyboardEvent> m_keyEvents;
b3AlignedObjectArray<b3VRControllerEvent> m_vrEvents; b3AlignedObjectArray<b3VRControllerEvent> m_vrEvents;
@@ -102,8 +102,12 @@ b3PluginManager::~b3PluginManager()
{ {
while (m_data->m_pluginMap.size()) while (m_data->m_pluginMap.size())
{ {
b3PluginHandle** plugin = m_data->m_pluginMap.getAtIndex(0); int* pluginUidPtr = m_data->m_pluginMap.getAtIndex(0);
unloadPlugin((*plugin)->m_pluginUniqueId); if (pluginUidPtr)
{
int pluginUid = *pluginUidPtr;
unloadPlugin(*pluginUidPtr);
}
} }
delete m_data->m_physicsDirect; delete m_data->m_physicsDirect;
m_data->m_pluginMap.clear(); m_data->m_pluginMap.clear();
@@ -140,11 +144,11 @@ int b3PluginManager::loadPlugin(const char* pluginPath, const char* postFixStr)
{ {
int pluginUniqueId = -1; int pluginUniqueId = -1;
b3PluginHandle** pluginOrgPtr = m_data->m_pluginMap.find(pluginPath); int* pluginUidPtr = m_data->m_pluginMap.find(pluginPath);
if (pluginOrgPtr) if (pluginUidPtr)
{ {
//already loaded //already loaded
pluginUniqueId = (*pluginOrgPtr)->m_pluginUniqueId; pluginUniqueId = *pluginUidPtr;
} }
else else
{ {
@@ -185,7 +189,7 @@ int b3PluginManager::loadPlugin(const char* pluginPath, const char* postFixStr)
plugin->m_ownsPluginHandle = true; plugin->m_ownsPluginHandle = true;
plugin->m_pluginHandle = pluginHandle; plugin->m_pluginHandle = pluginHandle;
plugin->m_pluginPath = pluginPath; plugin->m_pluginPath = pluginPath;
m_data->m_pluginMap.insert(pluginPath, plugin); m_data->m_pluginMap.insert(pluginPath, pluginUniqueId);
} }
else else
{ {
@@ -246,16 +250,19 @@ void b3PluginManager::tickPlugins(double timeStep, bool isPreTick)
{ {
for (int i=0;i<m_data->m_pluginMap.size();i++) for (int i=0;i<m_data->m_pluginMap.size();i++)
{ {
b3PluginHandle** pluginPtr = m_data->m_pluginMap.getAtIndex(i); int* pluginUidPtr = m_data->m_pluginMap.getAtIndex(i);
b3PluginHandle* plugin = 0; b3PluginHandle* plugin = 0;
if (pluginPtr && *pluginPtr)
if (pluginUidPtr)
{ {
plugin = *pluginPtr; int pluginUid = *pluginUidPtr;
plugin = m_data->m_plugins.getHandle(pluginUid);
} }
else else
{ {
continue; continue;
} }
PFN_TICK tick = isPreTick? plugin->m_preTickFunc : plugin->m_postTickFunc; PFN_TICK tick = isPreTick? plugin->m_preTickFunc : plugin->m_postTickFunc;
if (tick) if (tick)
{ {
@@ -319,7 +326,7 @@ int b3PluginManager::registerStaticLinkedPlugin(const char* pluginPath, PFN_INIT
pluginHandle->m_userPointer = 0; pluginHandle->m_userPointer = 0;
m_data->m_pluginMap.insert(pluginPath, pluginHandle); m_data->m_pluginMap.insert(pluginPath, pluginUniqueId);
{ {
b3PluginContext context; b3PluginContext context;