Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 17:49:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix enterEntity event not firing in entithy script after content reload

Browse source
This commit is contained in:
David Rowe 2020-11-04 11:23:47 +13:00
parent 82a0815964
commit c6728be4e8
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>(); auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
entityScriptingInterface->setEntitiesScriptEngine(entitiesScriptEngineProvider); 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 // Connect mouse events to entity script callbacks
if (!_mouseAndPreloadSignalHandlersConnected) { if (!_mouseAndPreloadSignalHandlersConnected) {
@ -205,13 +212,6 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() {
_entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverLeaveEntity", event); _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; _mouseAndPreloadSignalHandlersConnected = true;
} }
} }