From ce898ae42a6c6c88c10cb54685639730553ea444 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Apr 2017 18:38:55 +1200 Subject: [PATCH] Play recording --- scripts/system/playRecordingAC.js | 22 ++++++++++++++++++++++ scripts/system/record.js | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/scripts/system/playRecordingAC.js b/scripts/system/playRecordingAC.js index 9322bb88ac..c81ace4295 100644 --- a/scripts/system/playRecordingAC.js +++ b/scripts/system/playRecordingAC.js @@ -22,6 +22,10 @@ isPlaying = false, // TODO: Just use recording value instead? recording = ""; + function log(message) { + print(APP_NAME + ": " + message); + } + function updateRecorder() { Messages.sendMessage(HIFI_RECORDER_CHANNEL, JSON.stringify({ playing: isPlaying, @@ -40,6 +44,24 @@ case PLAYER_COMMAND_PLAY: isPlaying = true; recording = message.recording; + + log("Play recording " + recording); + + Agent.isAvatar = true; + Avatar.position = message.position; + Avatar.orientation = message.orientation; + + Recording.loadRecording(recording); + Recording.setPlayFromCurrentLocation(true); + Recording.setPlayerUseDisplayName(true); + Recording.setPlayerUseHeadModel(false); + Recording.setPlayerUseAttachments(true); + Recording.setPlayerLoop(true); + Recording.setPlayerUseSkeletonModel(true); + + Recording.setPlayerTime(0.0); + Recording.startPlaying(); + break; } diff --git a/scripts/system/record.js b/scripts/system/record.js index a7db4322ac..65ff83c718 100644 --- a/scripts/system/record.js +++ b/scripts/system/record.js @@ -321,7 +321,7 @@ Messages.sendMessage(HIFI_PLAYER_CHANNEL, JSON.stringify({ player: playerIDs[index], command: PLAYER_COMMAND_PLAY, - recording: mapping, + recording: "atp:" + mapping, position: MyAvatar.position, orientation: MyAvatar.orientation }));