better support for includes in entity scripts

ZappoMan committed 11 years ago

Commit cd0ee0f1 parent 137642f4 files · +25 −6Browse files

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

Unified · Split

@@ -93,6 +93,8 @@ public: · 92 unmodified lines
93	93	void setUserLoaded(bool isUserLoaded) { _isUserLoaded = isUserLoaded; }
94	94	bool isUserLoaded() const { return _isUserLoaded; }
95	95
	96	+ void setParentURL(const QString& parentURL) { _parentURL = parentURL; }
	97	+
96	98	public slots:
97	99	void stop();
98	100
@@ -121,6 +123,7 @@ signals: · 22 unmodified lines
121	123
122	124	protected:
123	125	QString _scriptContents;
	126	+ QString _parentURL;
124	127	bool _isFinished;
125	128	bool _isRunning;
126	129	bool _isInitialized;