From cd0ee0ff1db256882aacf2e5dc1654ecb19b237a Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Nov 2014 14:58:29 -0800
Subject: [PATCH] better support for includes in entity scripts

---
 interface/src/entities/EntityTreeRenderer.cpp | 15 +++++++++++++--
 interface/src/entities/EntityTreeRenderer.h   |  2 +-
 libraries/script-engine/src/ScriptEngine.cpp  | 11 ++++++++---
 libraries/script-engine/src/ScriptEngine.h    |  3 +++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/interface/src/entities/EntityTreeRenderer.cpp b/interface/src/entities/EntityTreeRenderer.cpp
index 192b42c58b..dfe9505c02 100644
--- a/interface/src/entities/EntityTreeRenderer.cpp
+++ b/interface/src/entities/EntityTreeRenderer.cpp
@@ -99,13 +99,15 @@ QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItem
 }
 
 
-QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorText) {
+QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorText, bool& isURL) {
     QUrl url(scriptMaybeURLorText);
     
     // If the url is not valid, this must be script text...
     if (!url.isValid()) {
+        isURL = false;
         return scriptMaybeURLorText;
     }
+    isURL = true;
 
     QString scriptContents; // assume empty
     
@@ -168,7 +170,8 @@ QScriptValue EntityTreeRenderer::loadEntityScript(EntityItem* entity) {
         return QScriptValue(); // no script
     }
     
-    QString scriptContents = loadScriptContents(entity->getScript());
+    bool isURL = false; // loadScriptContents() will tell us if this is a URL or just text.
+    QString scriptContents = loadScriptContents(entity->getScript(), isURL);
     
     QScriptSyntaxCheckResult syntaxCheck = QScriptEngine::checkSyntax(scriptContents);
     if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) {
@@ -179,6 +182,9 @@ QScriptValue EntityTreeRenderer::loadEntityScript(EntityItem* entity) {
         return QScriptValue(); // invalid script
     }
     
+    if (isURL) {
+        _entitiesScriptEngine->setParentURL(entity->getScript());
+    }
     QScriptValue entityScriptConstructor = _entitiesScriptEngine->evaluate(scriptContents);
     
     if (!entityScriptConstructor.isFunction()) {
@@ -189,9 +195,14 @@ QScriptValue EntityTreeRenderer::loadEntityScript(EntityItem* entity) {
     }
 
     QScriptValue entityScriptObject = entityScriptConstructor.construct();
+
     EntityScriptDetails newDetails = { entity->getScript(), entityScriptObject };
     _entityScripts[entityID] = newDetails;
 
+    if (isURL) {
+        _entitiesScriptEngine->setParentURL("");
+    }
+
     return entityScriptObject; // newly constructed
 }
 
diff --git a/interface/src/entities/EntityTreeRenderer.h b/interface/src/entities/EntityTreeRenderer.h
index e5eba79e0d..8b2131691c 100644
--- a/interface/src/entities/EntityTreeRenderer.h
+++ b/interface/src/entities/EntityTreeRenderer.h
@@ -132,7 +132,7 @@ private:
     QScriptValue loadEntityScript(const EntityItemID& entityItemID);
     QScriptValue getPreviouslyLoadedEntityScript(const EntityItemID& entityItemID);
     QScriptValue getPreviouslyLoadedEntityScript(EntityItem* entity);
-    QString loadScriptContents(const QString& scriptMaybeURLorText);
+    QString loadScriptContents(const QString& scriptMaybeURLorText, bool& isURL);
     QScriptValueList createMouseEventArgs(const EntityItemID& entityID, QMouseEvent* event, unsigned int deviceID);
     QScriptValueList createMouseEventArgs(const EntityItemID& entityID, const MouseEvent& mouseEvent);
     
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index e6002d7c10..fc1e8ce8bc 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -618,16 +618,20 @@ void ScriptEngine::stopTimer(QTimer *timer) {
 }
 
 QUrl ScriptEngine::resolvePath(const QString& include) const {
-    // first lets check to see if it's already a full URL
     QUrl url(include);
+    // first lets check to see if it's already a full URL
     if (!url.scheme().isEmpty()) {
         return url;
     }
 
     // we apparently weren't a fully qualified url, so, let's assume we're relative
     // to the original URL of our script
-    QUrl parentURL(_fileNameString);
-
+    QUrl parentURL;
+    if (_parentURL.isEmpty()) {
+        parentURL = QUrl(_fileNameString);
+    } else {
+        parentURL = QUrl(_parentURL);
+    }
     // if the parent URL's scheme is empty, then this is probably a local file...
     if (parentURL.scheme().isEmpty()) {
         parentURL = QUrl::fromLocalFile(_fileNameString);
@@ -660,6 +664,7 @@ void ScriptEngine::include(const QString& includeFile) {
 #else
         QString fileName = url.toLocalFile();
 #endif
+
         QFile scriptFile(fileName);
         if (scriptFile.open(QFile::ReadOnly | QFile::Text)) {
             qDebug() << "Including file:" << fileName;
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index bb279b8887..289436aada 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -93,6 +93,8 @@ public:
     void setUserLoaded(bool isUserLoaded) { _isUserLoaded = isUserLoaded;  }
     bool isUserLoaded() const { return _isUserLoaded; }
 
+    void setParentURL(const QString& parentURL) { _parentURL = parentURL;  }
+
 public slots:
     void stop();
 
@@ -121,6 +123,7 @@ signals:
 
 protected:
     QString _scriptContents;
+    QString _parentURL;
     bool _isFinished;
     bool _isRunning;
     bool _isInitialized;