Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expose location API to Agent scripts (side-effect, agents now can teleport)

Browse source
This commit is contained in:
Thijs Wenker 2017-06-21 06:31:36 +02:00
parent ec1187991d
commit 47643e1efe
4 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@
#include <AvatarHashMap.h> #include <AvatarHashMap.h>
#include <AudioInjectorManager.h> #include <AudioInjectorManager.h>
#include <AssetClient.h> #include <AssetClient.h>
#include <LocationScriptingInterface.h>
#include <MessagesClient.h> #include <MessagesClient.h>
#include <NetworkAccessManager.h> #include <NetworkAccessManager.h>
#include <NodeList.h> #include <NodeList.h>
@ -453,6 +454,9 @@ void Agent::executeScript() {
_scriptEngine->registerGlobalObject("EntityViewer", &_entityViewer); _scriptEngine->registerGlobalObject("EntityViewer", &_entityViewer);
_scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
LocationScriptingInterface::locationSetter);
auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>(); auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
_scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); _scriptEngine->registerGlobalObject("Recording", recordingInterface.data());

2
interface/src/Application.cpp
View file

@ -88,6 +88,7 @@
#include <UserActivityLoggerScriptingInterface.h> #include <UserActivityLoggerScriptingInterface.h>
#include <LogHandler.h> #include <LogHandler.h>
#include "LocationBookmarks.h" #include "LocationBookmarks.h"
#include <LocationScriptingInterface.h>
#include <MainWindow.h> #include <MainWindow.h>
#include <MappingRequest.h> #include <MappingRequest.h>
#include <MessagesClient.h> #include <MessagesClient.h>
@ -159,7 +160,6 @@
#include "scripting/DesktopScriptingInterface.h" #include "scripting/DesktopScriptingInterface.h"
#include "scripting/GlobalServicesScriptingInterface.h" #include "scripting/GlobalServicesScriptingInterface.h"
#include "scripting/HMDScriptingInterface.h" #include "scripting/HMDScriptingInterface.h"
#include "scripting/LocationScriptingInterface.h"
#include "scripting/MenuScriptingInterface.h" #include "scripting/MenuScriptingInterface.h"
#include "scripting/SettingsScriptingInterface.h" #include "scripting/SettingsScriptingInterface.h"
#include "scripting/WindowScriptingInterface.h" #include "scripting/WindowScriptingInterface.h"

0
interface/src/scripting/LocationScriptingInterface.cpp → libraries/networking/src/LocationScriptingInterface.cpp
View file

0
interface/src/scripting/LocationScriptingInterface.h → libraries/networking/src/LocationScriptingInterface.h
View file