Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -48,7 +48,7 @@ · 47 unmodified lines | |||
| 48 | const QString GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":true}}"; | 48 | const QString GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":true}}"; |
| 49 | const QString NOT_GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":false}}"; | 49 | const QString NOT_GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":false}}"; |
| 50 | 50 | ||
| 51 | static void staticScriptInitializer(ScriptManager* manager) { | 51 | void staticEntityScriptInitializer(ScriptManager* manager) { |
| 52 | auto scriptEngine = manager->engine().data(); | 52 | auto scriptEngine = manager->engine().data(); |
| 53 | 53 | ||
| 54 | auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); | 54 | auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); |
| @@ -76,7 +76,7 @@ static void staticScriptInitializer(ScriptManager* manager) { · 21 unmodified lines | |||
| 76 | manager->connect(manager, &ScriptManager::releaseEntityPacketSenderMessages, entityScriptingInterface.data(), | 76 | manager->connect(manager, &ScriptManager::releaseEntityPacketSenderMessages, entityScriptingInterface.data(), |
| 77 | &EntityScriptingInterface::releaseEntityPacketSenderMessages, Qt::DirectConnection); | 77 | &EntityScriptingInterface::releaseEntityPacketSenderMessages, Qt::DirectConnection); |
| 78 | } | 78 | } |
| 79 | STATIC_SCRIPT_INITIALIZER(staticScriptInitializer); | 79 | STATIC_SCRIPT_INITIALIZER(staticEntityScriptInitializer); |
| 80 | 80 | ||
| 81 | EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership) : | 81 | EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership) : |
| 82 | _entityTree(nullptr), | 82 | _entityTree(nullptr), |
| @@ -2433,7 +2433,7 @@ void EntityScriptingInterface::getMeshes(const QUuid& entityID, const ScriptValu · 2350 unmodified lines | |||
| 2433 | EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID)); | 2433 | EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID)); |
| 2434 | if (!entity) { | 2434 | if (!entity) { |
| 2435 | qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID; | 2435 | qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID; |
| 2436 | ScriptValueList args { engine->undefinedValue(), false }; | 2436 | ScriptValueList args{ engine->undefinedValue(), engine->newValue(false) }; |
| 2437 | callback.call(ScriptValue(), args); | 2437 | callback.call(ScriptValue(), args); |
| 2438 | return; | 2438 | return; |
| 2439 | } | 2439 | } |
| @@ -2446,7 +2446,7 @@ void EntityScriptingInterface::getMeshes(const QUuid& entityID, const ScriptValu · 6 unmodified lines | |||
| 2446 | ScriptValueList args{ resultAsScriptValue, engine->newValue(true) }; | 2446 | ScriptValueList args{ resultAsScriptValue, engine->newValue(true) }; |
| 2447 | callback.call(ScriptValue(), args); | 2447 | callback.call(ScriptValue(), args); |
| 2448 | } else { | 2448 | } else { |
| 2449 | ScriptValueList args { engine->undefinedValue(), engine->newValue(false) }; | 2449 | ScriptValueList args{ engine->undefinedValue(), engine->newValue(false) }; |
| 2450 | callback.call(ScriptValue(), args); | 2450 | callback.call(ScriptValue(), args); |
| 2451 | } | 2451 | } |
| 2452 | } | 2452 | } |