Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 9 files). Show all
Unified · Split
| @@ -63,6 +63,8 @@ · 62 unmodified lines | |||
| 63 | #include "RecordingScriptingInterface.h" | 63 | #include "RecordingScriptingInterface.h" |
| 64 | #include "ScriptEngines.h" | 64 | #include "ScriptEngines.h" |
| 65 | #include "TabletScriptingInterface.h" | 65 | #include "TabletScriptingInterface.h" |
| 66 | #include "ModelScriptingInterface.h" | ||
| 67 | |||
| 66 | 68 | ||
| 67 | #include "MIDIEvent.h" | 69 | #include "MIDIEvent.h" |
| 68 | 70 | ||
| @@ -570,7 +572,7 @@ void ScriptEngine::init() { · 501 unmodified lines | |||
| 570 | registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data()); | 572 | registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data()); |
| 571 | 573 | ||
| 572 | registerGlobalObject("File", new FileScriptingInterface(this)); | 574 | registerGlobalObject("File", new FileScriptingInterface(this)); |
| 573 | 575 | ||
| 574 | qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue); | 576 | qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue); |
| 575 | qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue); | 577 | qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue); |
| 576 | 578 | ||
| @@ -586,6 +588,9 @@ void ScriptEngine::init() { · 9 unmodified lines | |||
| 586 | registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); | 588 | registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); |
| 587 | registerGlobalObject("Assets", &_assetScriptingInterface); | 589 | registerGlobalObject("Assets", &_assetScriptingInterface); |
| 588 | registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data()); | 590 | registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data()); |
| 591 | |||
| 592 | registerGlobalObject("Model", new ModelScriptingInterface(this)); | ||
| 593 | qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue); | ||
| 589 | } | 594 | } |
| 590 | 595 | ||
| 591 | void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) { | 596 | void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) { |