Merge branch master

Mohammed Nafees committed 12 years ago

Commit 29d64372 parents dd74ea6 d441e6a645 files · +22419 −7869Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+52−9

 //
 //  ScriptEngine.cpp
-//  hifi
+//  libraries/script-engine/src
 //
 //  Created by Brad Hefta-Gaub on 12/14/13.
-//  Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 #include <QtCore/QCoreApplication>
 #include <Sound.h>
+#include "AnimationObject.h"
 #include "MenuItemProperties.h"
 #include "LocalVoxels.h"
 #include "ScriptEngine.h"
     return soundScriptValue;
 }
+static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
+    qDebug() << "script:print()<<" << context->argument(0).toString();
+    engine->evaluate("Script.print('" + context->argument(0).toString() + "')");
+    return QScriptValue();
+}
 ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
                            AbstractControllerScriptingInterface* controllerScriptingInterface) :
     _scriptName(),
     _fileNameString(fileNameString),
     _quatLibrary(),
-    _vec3Library()
+    _vec3Library(),
+    _uuidLibrary(),
+    _animationCache(this)
 {
 }
     _scriptName(),
     _fileNameString(),
     _quatLibrary(),
-    _vec3Library()
+    _vec3Library(),
+    _uuidLibrary(),
+    _animationCache(this)
 {
     QString scriptURLString = scriptURL.toString();
     _fileNameString = scriptURLString;
     QUrl url(scriptURL);
-    // if the scheme is empty, maybe they typed in a file, let's try
+    // if the scheme length is one or lower, maybe they typed in a file, let's try
-    if (url.scheme().isEmpty()) {
+    const int WINDOWS_DRIVE_LETTER_SIZE = 1;
+    if (url.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {
         url = QUrl::fromLocalFile(scriptURLString);
     }
                 _scriptContents = in.readAll();
             } else {
                 qDebug() << "ERROR Loading file:" << fileName;
+                emit errorMessage("ERROR Loading file:" + fileName);
             }
         } else {
             QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);
     registerGlobalObject(objectName, _avatarData);
 }
+void ScriptEngine::setAvatarHashMap(AvatarHashMap* avatarHashMap, const QString& objectName) {
+    // remove the old Avatar property, if it exists
+    _engine.globalObject().setProperty(objectName, QScriptValue());
+    // give the script engine the new avatar hash map
+    registerGlobalObject(objectName, avatarHashMap);
+}
 bool ScriptEngine::setScriptContents(const QString& scriptContents, const QString& fileNameString) {
     if (_isRunning) {
         return false;
     registerVoxelMetaTypes(&_engine);
     registerEventTypes(&_engine);
     registerMenuItemProperties(&_engine);
+    registerAnimationTypes(&_engine);
     qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
     qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
     qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);
     qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine);
+    qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);
     qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);
+    QScriptValue printConstructorValue = _engine.newFunction(debugPrint);
+    _engine.globalObject().setProperty("print", printConstructorValue);
     QScriptValue soundConstructorValue = _engine.newFunction(soundConstructor);
     QScriptValue soundMetaObject = _engine.newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
     _engine.globalObject().setProperty("Sound", soundMetaObject);
     registerGlobalObject("Particles", &_particlesScriptingInterface);
     registerGlobalObject("Quat", &_quatLibrary);
     registerGlobalObject("Vec3", &_vec3Library);
+    registerGlobalObject("Uuid", &_uuidLibrary);
+    registerGlobalObject("AnimationCache", &_animationCache);
     registerGlobalObject("Voxels", &_voxelsScriptingInterface);
     if (_engine.hasUncaughtException()) {
         int line = _engine.uncaughtExceptionLineNumber();
         qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
+        emit errorMessage("Uncaught exception at line" + QString::number(line) + ":" + result.toString());
     }
 }
         init();
     }
     _isRunning = true;
+    emit runningStateChanged();
     QScriptValue result = _engine.evaluate(_scriptContents);
     if (_engine.hasUncaughtException()) {
         int line = _engine.uncaughtExceptionLineNumber();
         qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
+        emit errorMessage("Uncaught exception at line" + QString::number(line) + ":" + result.toString());
     }
-    timeval startTime;
+    QElapsedTimer startTime;
-    gettimeofday(&startTime, NULL);
+    startTime.start();
     int thisFrame = 0;
     qint64 lastUpdate = usecTimestampNow();
     while (!_isFinished) {
-        int usecToSleep = usecTimestamp(&startTime) + (thisFrame++ * SCRIPT_DATA_CALLBACK_USECS) - usecTimestampNow();
+        int usecToSleep = (thisFrame++ * SCRIPT_DATA_CALLBACK_USECS) - startTime.nsecsElapsed() / 1000; // nsec to usec
         if (usecToSleep > 0) {
             usleep(usecToSleep);
         }
         if (_engine.hasUncaughtException()) {
             int line = _engine.uncaughtExceptionLineNumber();
             qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();
+            emit errorMessage("Uncaught exception at line" + QString::number(line) + ":" + _engine.uncaughtException().toString());
         }
     }
     emit scriptEnding();
     emit finished(_fileNameString);
     _isRunning = false;
+    emit runningStateChanged();
 }
 void ScriptEngine::stop() {
     _isFinished = true;
+    emit runningStateChanged();
 }
 void ScriptEngine::timerFired() {
     return url;
 }
+void ScriptEngine::print(const QString& message) {
+    emit printedMessage(message);
+}
 void ScriptEngine::include(const QString& includeFile) {
     QUrl url = resolveInclude(includeFile);
     QString includeContents;
             includeContents = in.readAll();
         } else {
             qDebug() << "ERROR Loading file:" << fileName;
+            emit errorMessage("ERROR Loading file:" + fileName);
         }
     } else {
         QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);
     if (_engine.hasUncaughtException()) {
         int line = _engine.uncaughtExceptionLineNumber();
         qDebug() << "Uncaught exception at (" << includeFile << ") line" << line << ":" << result.toString();
+        emit errorMessage("Uncaught exception at (" + includeFile + ") line" + QString::number(line) + ":" + result.toString());
     }
 }