Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add missing include for qScriptRegisterMetaType in Agent

Browse source
This commit is contained in:
Stephen Birarda 2017-04-10 19:16:07 -07:00 committed by Zach Fox
parent 42a406e90a
commit 6c49db0f1b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/Agent.cpp
View file

@ -28,9 +28,10 @@
#include <NodeList.h>
#include <udt/PacketHeaders.h>
#include <ResourceCache.h>
#include <ScriptAvatarData.h>
#include <ScriptCache.h>
#include <SoundCache.h>
#include <ScriptEngines.h>
#include <SoundCache.h>
#include <UUID.h>
#include <recording/Deck.h>
@ -344,7 +345,7 @@ void Agent::executeScript() {
_scriptEngine->registerGlobalObject("Avatar", scriptedAvatar.data());
// register meta types for retrieval of ScriptAvatarData objects
qScriptRegisterMetaType(_scriptEngine, avatarDataToScriptValue, avatarDataFromScriptValue);
qScriptRegisterMetaType(_scriptEngine.get(), avatarDataToScriptValue, avatarDataFromScriptValue);
auto player = DependencyManager::get<recording::Deck>();
connect(player.data(), &recording::Deck::playbackStateChanged, [=] {

4
libraries/script-engine/src/ScriptAvatarData.h
View file

@ -136,7 +136,7 @@ private:
Q_DECLARE_METATYPE(AvatarSharedPointer)
QScriptValue avatarToScriptValue(QScriptEngine* engine, const AvatarSharedPointer& in);
void avatarFromScriptValue(const QScriptValue& object, AvatarSharedPointer& out);
QScriptValue avatarDataToScriptValue(QScriptEngine* engine, const AvatarSharedPointer& in);
void avatarDataFromScriptValue(const QScriptValue& object, AvatarSharedPointer& out);
#endif // hifi_ScriptAvatarData_h