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
6565 #include "RecordingScriptingInterface.h"
6666 #include "ScriptEngines.h"
6767 #include "TabletScriptingInterface.h"
68+#include "ModelScriptingInterface.h"
69+
6870
6971 #include <Profile.h>
7072
@@ -594,7 +596,7 @@ void ScriptEngine::init() { · 523 unmodified lines
594596 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
595597
596598 registerGlobalObject("File", new FileScriptingInterface(this));
597−
599+
598600 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);
599601 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);
600602
@@ -612,6 +614,10 @@ void ScriptEngine::init() { · 11 unmodified lines
612614 registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
613615
614616 registerGlobalObject("DebugDraw", &DebugDraw::getInstance());
617+
618+ registerGlobalObject("Model", new ModelScriptingInterface(this));
619+ qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
620+ qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
615621 }
616622
617623 void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {