History

It's working...it's workinggit add -A!

Zach Fox committed 9 years ago

Commit 5edd5d21 parent a16e2617 files · +175 −15Browse files

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

Unified · Split

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