Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 35 files). Show all
Unified · Split
| @@ -233,11 +233,11 @@ int ScriptManager::processLevelMaxRetries { ScriptRequest::MAX_RETRIES }; · 232 unmodified lines | ||
| 233 | 233 | ScriptManager::ScriptManager(Context context, const QString& scriptContents, const QString& fileNameString) : |
| 234 | 234 | QObject(), |
| 235 | 235 | _context(context), |
| 236 | + _engine(newScriptEngine(this)), | |
| 236 | 237 | _scriptContents(scriptContents), |
| 237 | 238 | _timerFunctionMap(), |
| 238 | 239 | _fileNameString(fileNameString), |
| 239 | − _assetScriptingInterface(new AssetScriptingInterface(this)), | |
| 240 | − _engine(newScriptEngine(this)) | |
| 240 | + _assetScriptingInterface(new AssetScriptingInterface(this)) | |
| 241 | 241 | { |
| 242 | 242 | switch (_context) { |
| 243 | 243 | case Context::CLIENT_SCRIPT: |
| @@ -647,17 +647,17 @@ void ScriptManager::initMetaTypes() { · 403 unmodified lines | ||
| 647 | 647 | scriptRegisterSequenceMetaType<QVector<glm::quat>>(scriptEngine); |
| 648 | 648 | scriptRegisterSequenceMetaType<QVector<QString>>(scriptEngine); |
| 649 | 649 | |
| 650 | − scriptRegisterMetaType(scriptEngine, animationDetailsToScriptValue, animationDetailsFromScriptValue); | |
| 651 | − scriptRegisterMetaType(scriptEngine, webSocketToScriptValue, webSocketFromScriptValue); | |
| 652 | − scriptRegisterMetaType(scriptEngine, qWSCloseCodeToScriptValue, qWSCloseCodeFromScriptValue); | |
| 653 | − scriptRegisterMetaType(scriptEngine, wscReadyStateToScriptValue, wscReadyStateFromScriptValue); | |
| 650 | + scriptRegisterMetaType<AnimationDetails, animationDetailsToScriptValue, animationDetailsFromScriptValue>(scriptEngine); | |
| 651 | + scriptRegisterMetaType<WebSocketClass*, webSocketToScriptValue, webSocketFromScriptValue>(scriptEngine); | |
| 652 | + scriptRegisterMetaType<QWebSocketProtocol::CloseCode, qWSCloseCodeToScriptValue, qWSCloseCodeFromScriptValue>(scriptEngine); | |
| 653 | + scriptRegisterMetaType<WebSocketClass::ReadyState, wscReadyStateToScriptValue, wscReadyStateFromScriptValue>(scriptEngine); | |
| 654 | 654 | |
| 655 | − scriptRegisterMetaType(scriptEngine, externalResourceBucketToScriptValue, externalResourceBucketFromScriptValue); | |
| 655 | + scriptRegisterMetaType<ExternalResource::Bucket, externalResourceBucketToScriptValue, externalResourceBucketFromScriptValue>(scriptEngine); | |
| 656 | 656 | |
| 657 | − scriptRegisterMetaType(scriptEngine, scriptableResourceToScriptValue, scriptableResourceFromScriptValue); | |
| 657 | + scriptRegisterMetaType<ScriptableResourceRawPtr, scriptableResourceToScriptValue, scriptableResourceFromScriptValue>(scriptEngine); | |
| 658 | 658 | |
| 659 | − scriptRegisterMetaType(scriptEngine, meshToScriptValue, meshFromScriptValue); | |
| 660 | − scriptRegisterMetaType(scriptEngine, meshesToScriptValue, meshesFromScriptValue); | |
| 659 | + scriptRegisterMetaType<MeshProxy*, meshToScriptValue, meshFromScriptValue>(scriptEngine); | |
| 660 | + scriptRegisterMetaType<MeshProxyList, meshesToScriptValue, meshesFromScriptValue>(scriptEngine); | |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | 663 | void ScriptManager::init() { |