Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10764 from thoys/feat/ac-location-jsapi

Browse source 
Expose location scripting interface to Agent (AC script)
This commit is contained in:
Brad Hefta-Gaub 2017-06-21 10:22:48 -07:00 committed by GitHub
commit f7d42c782d
4 changed files with 8 additions and 4 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>
@ -160,7 +161,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"

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

@ -1,6 +1,6 @@
// //
// LocationScriptingInterface.cpp // LocationScriptingInterface.cpp
// interface/src/scripting // libraries/networking/src
// //
// Created by Ryan Huffman on 4/29/14. // Created by Ryan Huffman on 4/29/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
@ -9,7 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <AddressManager.h> #include "AddressManager.h"
#include "LocationScriptingInterface.h" #include "LocationScriptingInterface.h"

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

@ -1,6 +1,6 @@
// //
// LocationScriptingInterface.h // LocationScriptingInterface.h
// interface/src/scripting // libraries/networking/src
// //
// Created by Ryan Huffman on 4/29/14. // Created by Ryan Huffman on 4/29/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.