Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #853 from ctrlaltdavid/fix/enter-entity

Browse source 
Fix enterEntity event not firing in entity script after content reload
This commit is contained in:
kasenvr 2020-11-12 01:02:55 -05:00 committed by GitHub
commit 8f4f15ba25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -167,6 +167,13 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() {
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
entityScriptingInterface->setEntitiesScriptEngine(entitiesScriptEngineProvider);
connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptPreloadFinished, [&](const EntityItemID& entityID) {
EntityItemPointer entity = getTree()->findEntityByID(entityID);
if (entity) {
entity->setScriptHasFinishedPreload(true);
}
});
// Connect mouse events to entity script callbacks
if (!_mouseAndPreloadSignalHandlersConnected) {
@ -205,13 +212,6 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() {
_entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverLeaveEntity", event);
});
connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptPreloadFinished, [&](const EntityItemID& entityID) {
EntityItemPointer entity = getTree()->findEntityByID(entityID);
if (entity) {
entity->setScriptHasFinishedPreload(true);
}
});
_mouseAndPreloadSignalHandlersConnected = true;
}
}