Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make UserActivityLogger available to AC scripts

Browse source
This commit is contained in:
David Rowe 2017-04-25 13:42:12 +12:00
parent c05954ee4b
commit 4c30c0d722
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClient.cpp
View file

@ -30,6 +30,7 @@
#include <ShutdownEventListener.h> #include <ShutdownEventListener.h>
#include <SoundCache.h> #include <SoundCache.h>
#include <ResourceScriptingInterface.h> #include <ResourceScriptingInterface.h>
#include <UserActivityLoggerScriptingInterface.h>
#include "AssignmentFactory.h" #include "AssignmentFactory.h"
#include "AssignmentActionFactory.h" #include "AssignmentActionFactory.h"
@ -66,6 +67,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
DependencyManager::registerInheritance<EntityActionFactoryInterface, AssignmentActionFactory>(); DependencyManager::registerInheritance<EntityActionFactoryInterface, AssignmentActionFactory>();
auto actionFactory = DependencyManager::set<AssignmentActionFactory>(); auto actionFactory = DependencyManager::set<AssignmentActionFactory>();
DependencyManager::set<ResourceScriptingInterface>(); DependencyManager::set<ResourceScriptingInterface>();
DependencyManager::set<UserActivityLoggerScriptingInterface>();
// setup a thread for the NodeList and its PacketReceiver // setup a thread for the NodeList and its PacketReceiver
QThread* nodeThread = new QThread(this); QThread* nodeThread = new QThread(this);

3
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -43,6 +43,7 @@
#include <NetworkAccessManager.h> #include <NetworkAccessManager.h>
#include <PathUtils.h> #include <PathUtils.h>
#include <ResourceScriptingInterface.h> #include <ResourceScriptingInterface.h>
#include <UserActivityLoggerScriptingInterface.h>
#include <NodeList.h> #include <NodeList.h>
#include <ScriptAvatarData.h> #include <ScriptAvatarData.h>
#include <udt/PacketHeaders.h> #include <udt/PacketHeaders.h>
@ -677,6 +678,8 @@ void ScriptEngine::init() {
registerGlobalObject("Model", new ModelScriptingInterface(this)); registerGlobalObject("Model", new ModelScriptingInterface(this));
qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue); qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue); qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
} }
void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) { void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {