Make individual reload buttons reload scripts

David Rowe committed 11 years ago

Commit 67206331 parent 2a005868 files · +53 −30Browse files

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

Unified · Split

     _vec3Library(),
     _uuidLibrary(),
     _isUserLoaded(false),
+    _isReloading(false),
     _arrayBufferClass(new ArrayBufferClass(this))
 {
     _allScriptsMutex.lock();
     return true;
 }
-void ScriptEngine::loadURL(const QUrl& scriptURL) {
+void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
     if (_isRunning) {
         return;
     }
     _fileNameString = scriptURL.toString();
+    _isReloading = reload;
     QUrl url(scriptURL);
         } else {
             bool isPending;
             auto scriptCache = DependencyManager::get<ScriptCache>();
-            scriptCache->getScript(url, this, isPending);
+            scriptCache->getScript(url, this, isPending, reload);
         }
     }
 }
     }
     QUrl url = resolvePath(loadFile);
-    emit loadScript(url.toString(), false);
+    if (_isReloading) {
+        auto scriptCache = DependencyManager::get<ScriptCache>();
+        scriptCache->deleteScript(url.toString());
+        emit reloadScript(url.toString(), false);
+    } else {
+        emit loadScript(url.toString(), false);
+    }
 }
 void ScriptEngine::nodeKilled(SharedNodePointer node) {