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

Merge pull request #1832 from birarda/script-timer

Browse source 
hide ScriptEngine calls from JS
This commit is contained in:
ZappoMan 2014-02-03 12:45:41 -08:00
commit c739c2452a
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -4110,7 +4110,7 @@ void Application::loadScript(const QString& fileNameString) {
QThread* workerThread = new QThread(this); QThread* workerThread = new QThread(this);
// when the worker thread is started, call our engine's run.. // when the worker thread is started, call our engine's run..
connect(workerThread, SIGNAL(started()), scriptEngine, SLOT(run())); connect(workerThread, &QThread::started, scriptEngine, &ScriptEngine::run);
// when the thread is terminated, add both scriptEngine and thread to the deleteLater queue // when the thread is terminated, add both scriptEngine and thread to the deleteLater queue
connect(scriptEngine, SIGNAL(finished(const QString&)), scriptEngine, SLOT(deleteLater())); connect(scriptEngine, SIGNAL(finished(const QString&)), scriptEngine, SLOT(deleteLater()));

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

@ -106,6 +106,7 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents) {
} }
void ScriptEngine::init() { void ScriptEngine::init() {
qDebug() << "Init called!";
if (_isInitialized) { if (_isInitialized) {
return; // only initialize once return; // only initialize once
} }
@ -334,4 +335,3 @@ void ScriptEngine::stopTimer(QTimer *timer) {
delete timer; delete timer;
} }
} }

7
libraries/script-engine/src/ScriptEngine.h
View file

@ -60,13 +60,14 @@ public:
void setAvatarData(AvatarData* avatarData, const QString& objectName); void setAvatarData(AvatarData* avatarData, const QString& objectName);
void init();
void run(); /// runs continuously until Agent.stop() is called
void evaluate(); /// initializes the engine, and evaluates the script, but then returns control to caller
void timerFired(); void timerFired();
public slots: public slots:
void init();
void run(); /// runs continuously until Agent.stop() is called
void stop(); void stop();
void evaluate(); /// initializes the engine, and evaluates the script, but then returns control to caller
QObject* setInterval(const QScriptValue& function, int intervalMS); QObject* setInterval(const QScriptValue& function, int intervalMS);
QObject* setTimeout(const QScriptValue& function, int timeoutMS); QObject* setTimeout(const QScriptValue& function, int timeoutMS);