Merge branch 'master' of https://github.com/worklist/hifi into 19507

Stojce Slavkovski committed 12 years ago

Commit ac8d27e2 parents 9aa9b08 45197c77 files · +160 −98Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

         _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)),
         _cameraPushback(0.0f),
         _scaleMirror(1.0f),
+        _rotateMirror(0.0f),
+        _raiseMirror(0.0f),
         _mouseX(0),
         _mouseY(0),
         _lastMouseMove(usecTimestampNow()),
     _settings->endArray();
 }
-void Application::stopAllScripts() {
-    // stops all current running scripts
-    for (int i = 0; i < _scriptEnginesHash.size(); ++i) {
-        _scriptEnginesHash.values().at(i)->stop();
-        qDebug() << "stopping script..." << getRunningScripts().at(i);
-    }
-    _scriptEnginesHash.clear();
-    _runningScriptsWidget->setRunningScripts(getRunningScripts());
-    bumpSettings();
-}
-void Application::stopScript(const QString &scriptName) {
-    if (_scriptEnginesHash.contains(scriptName)) {
-        _scriptEnginesHash.value(scriptName)->stop();
-        qDebug() << "stopping script..." << scriptName;
-        _scriptEnginesHash.remove(scriptName);
-        _runningScriptsWidget->setRunningScripts(getRunningScripts());
-        bumpSettings();
-    }
-}
-void Application::reloadAllScripts() {
-    // remember all the current scripts so we can reload them
-    QStringList reloadList = getRunningScripts();
-    // reloads all current running scripts
-    stopAllScripts();
-    foreach (QString scriptName, reloadList){
-        qDebug() << "reloading script..." << scriptName;
-        loadScript(scriptName);
-    }
-}
-void Application::manageRunningScriptsWidgetVisibility(bool shown) {
-    if (_runningScriptsWidgetWasVisible && shown) {
-        _runningScriptsWidget->show();
-    } else if (_runningScriptsWidgetWasVisible && !shown) {
-        _runningScriptsWidget->hide();
-    }
-}
-void Application::toggleRunningScriptsWidget() {
-    if (_runningScriptsWidgetWasVisible) {
-        _runningScriptsWidget->hide();
-        _runningScriptsWidgetWasVisible = false;
-    } else {
-        _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(),
-                                                 _window->size()));
-        _runningScriptsWidget->show();
-        _runningScriptsWidgetWasVisible = true;
-    }
-}
-void Application::uploadHead() {
-    uploadModel(HEAD_MODEL);
-}
-void Application::uploadSkeleton() {
-    uploadModel(SKELETON_MODEL);
-}
-void Application::uploadAttachment() {
-    uploadModel(ATTACHMENT_MODEL);
-}
 ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) {
     if(loadScriptFromEditor && _scriptEnginesHash.contains(scriptName) && !_scriptEnginesHash[scriptName]->isFinished()){
         return _scriptEnginesHash[scriptName];
     return scriptEngine;
 }
+void Application::stopAllScripts(bool restart) {
+    // stops all current running scripts
+    for (QHash<QString, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
+            it != _scriptEnginesHash.constEnd(); it++) {
+        if (restart) {
+            connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&)));
+        }
+        it.value()->stop();
+        qDebug() << "stopping script..." << it.key();
+    }
+    _scriptEnginesHash.clear();
+    _runningScriptsWidget->setRunningScripts(getRunningScripts());
+    bumpSettings();
+}
+void Application::stopScript(const QString &scriptName) {
+    if (_scriptEnginesHash.contains(scriptName)) {
+        _scriptEnginesHash.value(scriptName)->stop();
+        qDebug() << "stopping script..." << scriptName;
+        _scriptEnginesHash.remove(scriptName);
+        _runningScriptsWidget->setRunningScripts(getRunningScripts());
+        bumpSettings();
+    }
+}
+void Application::reloadAllScripts() {
+    stopAllScripts(true);
+}
+void Application::manageRunningScriptsWidgetVisibility(bool shown) {
+    if (_runningScriptsWidgetWasVisible && shown) {
+        _runningScriptsWidget->show();
+    } else if (_runningScriptsWidgetWasVisible && !shown) {
+        _runningScriptsWidget->hide();
+    }
+}
+void Application::toggleRunningScriptsWidget() {
+    if (_runningScriptsWidgetWasVisible) {
+        _runningScriptsWidget->hide();
+        _runningScriptsWidgetWasVisible = false;
+    } else {
+        _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(),
+                                                 _window->size()));
+        _runningScriptsWidget->show();
+        _runningScriptsWidgetWasVisible = true;
+    }
+}
+void Application::uploadHead() {
+    uploadModel(HEAD_MODEL);
+}
+void Application::uploadSkeleton() {
+    uploadModel(SKELETON_MODEL);
+}
+void Application::uploadAttachment() {
+    uploadModel(ATTACHMENT_MODEL);
+}
 QString Application::getPreviousScriptLocation() {
     QString suggestedName;
     if (_previousScriptLocation.isEmpty()) {

Merge branch 'master' of https://github.com/worklist/hifi into 19507

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code