Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 7 files). Show all
Unified · Split
| @@ -59,6 +59,7 @@ · 58 unmodified lines | ||
| 59 | 59 | #include "FileScriptingInterface.h" // unzip project |
| 60 | 60 | #include "MenuItemProperties.h" |
| 61 | 61 | #include "ScriptAudioInjector.h" |
| 62 | +#include "ScriptAvatarData.h" | |
| 62 | 63 | #include "ScriptCache.h" |
| 63 | 64 | #include "ScriptEngineLogging.h" |
| 64 | 65 | #include "ScriptEngine.h" |
| @@ -111,15 +112,15 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) { · 46 unmodified lines | ||
| 111 | 112 | return QScriptValue(); |
| 112 | 113 | } |
| 113 | 114 | |
| 114 | −QScriptValue avatarDataToScriptValue(QScriptEngine* engine, const AvatarSharedPointer& in) { | |
| 115 | − return engine->newQObject(new AvatarDataScriptingInterface(in), QScriptEngine::ScriptOwnership); | |
| 115 | +/* | |
| 116 | +QScriptValue avatarDataToScriptValue(QScriptEngine* engine, AvatarData* const &in) { | |
| 117 | + return engine->newQObject(in, QScriptEngine::QtOwnership, DEFAULT_QOBJECT_WRAP_OPTIONS); | |
| 116 | 118 | } |
| 117 | 119 | |
| 118 | 120 | void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { |
| 119 | − if (auto avatarDataInterface = qobject_cast<AvatarDataScriptingInterface*>(object.toQObject())) { | |
| 120 | − out = avatarDataInterface->getAvatarData(); | |
| 121 | − } | |
| 121 | + out = qobject_cast<AvatarData*>(object.toQObject()); | |
| 122 | 122 | } |
| 123 | +*/ | |
| 123 | 124 | |
| 124 | 125 | Q_DECLARE_METATYPE(controller::InputController*) |
| 125 | 126 | //static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>(); |