Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring the mess for the Agent

Browse source
This commit is contained in:
samcake 2015-11-16 19:27:28 -08:00
parent 065c148e0f
commit 8553033d59
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@
#include <EntityScriptingInterface.h> // TODO: consider moving to scriptengine.h #include <EntityScriptingInterface.h> // TODO: consider moving to scriptengine.h
#include "avatars/ScriptableAvatar.h" #include "avatars/ScriptableAvatar.h"
#include "RecordingScriptingInterface.h"
#include "Agent.h" #include "Agent.h"
@ -45,6 +46,7 @@ Agent::Agent(NLPacket& packet) :
DependencyManager::set<ResourceCacheSharedItems>(); DependencyManager::set<ResourceCacheSharedItems>();
DependencyManager::set<SoundCache>(); DependencyManager::set<SoundCache>();
DependencyManager::set<RecordingScriptingInterface>();
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();

2
examples/acScripts/ControlACs.js
View file

@ -156,7 +156,7 @@ function sendCommand(id, action) {
position: controlEntityPosition, position: controlEntityPosition,
dimensions: { x: controlEntitySize, y: controlEntitySize, z: controlEntitySize }, dimensions: { x: controlEntitySize, y: controlEntitySize, z: controlEntitySize },
visible: false, visible: false,
lifetime: 10, lifetime: 10000,
userData: JSON.stringify({ userData: JSON.stringify({
idKey: { idKey: {
uD_id: id uD_id: id

6
interface/src/scripting/RecordingScriptingInterface.cpp
View file

@ -8,6 +8,8 @@
#include "RecordingScriptingInterface.h" #include "RecordingScriptingInterface.h"
#include <QThread>
#include <recording/Deck.h> #include <recording/Deck.h>
#include <recording/Recorder.h> #include <recording/Recorder.h>
#include <recording/Clip.h> #include <recording/Clip.h>
@ -16,8 +18,8 @@
#include <AudioClient.h> #include <AudioClient.h>
#include <AudioConstants.h> #include <AudioConstants.h>
#include "avatar/AvatarManager.h" //#include "avatar/AvatarManager.h"
#include "Application.h" //#include "Application.h"
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
typedef int16_t AudioSample; typedef int16_t AudioSample;