Integrated controller display from tutorial scripts + assets

Anthony J. Thibault committed 10 years ago

Commit 2193c5f1 parent 96445f421 files · +629 −-14Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 21 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+1−0

@@ -133,6 +133,7 @@ public: · 132 unmodified lines
133	Q_INVOKABLE void clearTimeout(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }	133	Q_INVOKABLE void clearTimeout(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }
134	Q_INVOKABLE void print(const QString& message);	134	Q_INVOKABLE void print(const QString& message);
135	Q_INVOKABLE QUrl resolvePath(const QString& path) const;	135	Q_INVOKABLE QUrl resolvePath(const QString& path) const;
		136	Q_INVOKABLE QUrl resourcesPath() const;
136		137
137	// Entity Script Related methods	138	// Entity Script Related methods
138	static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);	139	static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);