History

Merge pull request #9885 from sethalves/model-scripting

Model scripting

Brad Hefta-Gaub committed 9 years ago

Commit a75acd12 parents 652c800 0e8d62c15 files · +379 −22Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+7−1
@@ -65,6 +65,8 @@ · 64 unmodified lines
65#include "RecordingScriptingInterface.h"65#include "RecordingScriptingInterface.h"
66#include "ScriptEngines.h"66#include "ScriptEngines.h"
67#include "TabletScriptingInterface.h"67#include "TabletScriptingInterface.h"
68#include "ModelScriptingInterface.h"
69
68 70
69#include <Profile.h>71#include <Profile.h>
70 72
@@ -594,7 +596,7 @@ void ScriptEngine::init() { · 523 unmodified lines
594 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());596 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
595 597
596 registerGlobalObject("File", new FileScriptingInterface(this));598 registerGlobalObject("File", new FileScriptingInterface(this));
597 599
598 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);600 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);
599 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);601 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);
600 602
@@ -612,6 +614,10 @@ void ScriptEngine::init() { · 11 unmodified lines
612 registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());614 registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
613 615
614 registerGlobalObject("DebugDraw", &DebugDraw::getInstance());616 registerGlobalObject("DebugDraw", &DebugDraw::getInstance());
617
618 registerGlobalObject("Model", new ModelScriptingInterface(this));
619 qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
620 qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
615}621}
616 622
617void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {623void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {