|
@@ -33,7 +33,7 @@ namespace bs
|
|
|
mDomainLoadConn.disconnect();
|
|
mDomainLoadConn.disconnect();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- void ScriptHandleManager::triggerPreInput()
|
|
|
|
|
|
|
+ void ScriptHandleManager::updateHandles()
|
|
|
{
|
|
{
|
|
|
// Activate global handles
|
|
// Activate global handles
|
|
|
for(auto& handle : mGlobalHandlesToCreate)
|
|
for(auto& handle : mGlobalHandlesToCreate)
|
|
@@ -108,8 +108,14 @@ namespace bs
|
|
|
mDefaultHandleManagerGCHandle = MonoUtil::newGCHandle(defaultHandleManager);
|
|
mDefaultHandleManagerGCHandle = MonoUtil::newGCHandle(defaultHandleManager);
|
|
|
mDefaultHandleManager = MonoUtil::getObjectFromGCHandle(mDefaultHandleManagerGCHandle);
|
|
mDefaultHandleManager = MonoUtil::getObjectFromGCHandle(mDefaultHandleManagerGCHandle);
|
|
|
}
|
|
}
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ void ScriptHandleManager::triggerPreInput()
|
|
|
|
|
+ {
|
|
|
|
|
+ updateHandles();
|
|
|
|
|
|
|
|
- callPreInput(mDefaultHandleManager);
|
|
|
|
|
|
|
+ if(mDefaultHandleManager)
|
|
|
|
|
+ callPreInput(mDefaultHandleManager);
|
|
|
|
|
|
|
|
for (auto& handle : mActiveGlobalHandles)
|
|
for (auto& handle : mActiveGlobalHandles)
|
|
|
callPreInput(handle.object);
|
|
callPreInput(handle.object);
|
|
@@ -120,7 +126,8 @@ namespace bs
|
|
|
|
|
|
|
|
void ScriptHandleManager::triggerPostInput()
|
|
void ScriptHandleManager::triggerPostInput()
|
|
|
{
|
|
{
|
|
|
- callPostInput(mDefaultHandleManager);
|
|
|
|
|
|
|
+ if(mDefaultHandleManager)
|
|
|
|
|
+ callPostInput(mDefaultHandleManager);
|
|
|
|
|
|
|
|
for (auto& handle : mActiveGlobalHandles)
|
|
for (auto& handle : mActiveGlobalHandles)
|
|
|
callPostInput(handle.object);
|
|
callPostInput(handle.object);
|
|
@@ -131,7 +138,10 @@ namespace bs
|
|
|
|
|
|
|
|
void ScriptHandleManager::queueDrawCommands()
|
|
void ScriptHandleManager::queueDrawCommands()
|
|
|
{
|
|
{
|
|
|
- callDraw(mDefaultHandleManager);
|
|
|
|
|
|
|
+ updateHandles();
|
|
|
|
|
+
|
|
|
|
|
+ if(mDefaultHandleManager)
|
|
|
|
|
+ callDraw(mDefaultHandleManager);
|
|
|
|
|
|
|
|
for (auto& handle : mActiveGlobalHandles)
|
|
for (auto& handle : mActiveGlobalHandles)
|
|
|
callDraw(handle.object);
|
|
callDraw(handle.object);
|