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

Add comment to ScriptEngine::include()

Browse source
This commit is contained in:
Ryan Huffman 2015-01-29 09:08:55 -08:00
parent ce9e8910e4
commit e6caefa023
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -112,7 +112,7 @@ void ScriptEngine::setIsAvatar(bool isAvatar) {
_avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS); _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);
_avatarBillboardTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS); _avatarBillboardTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);
} }
if (!_isAvatar) { if (!_isAvatar) {
delete _avatarIdentityTimer; delete _avatarIdentityTimer;
_avatarIdentityTimer = NULL; _avatarIdentityTimer = NULL;
@ -596,6 +596,12 @@ void ScriptEngine::print(const QString& message) {
emit printedMessage(message); emit printedMessage(message);
} }
/**
* If a callback is specified, the included files will be loaded asynchronously and the callback will be called
* when all of the files have finished loading.
* If no callback is specified, the included files will be loaded synchronously and will block execution until
* all of the files have finished loading.
*/
void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callback) { void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callback) {
QList<QUrl> urls; QList<QUrl> urls;
for (QString file : includeFiles) { for (QString file : includeFiles) {