mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
added prompt
This commit is contained in:
parent
811fa8da39
commit
cb0b5b5d02
2 changed files with 27 additions and 15 deletions
|
@ -84,7 +84,7 @@
|
|||
overlay = null;
|
||||
},
|
||||
|
||||
startRecording: function (entityID) {
|
||||
startRecording: function () {
|
||||
if (!isAvatarRecording) {
|
||||
print("RECORDING STARTED");
|
||||
Messages.sendMessage(CLIENTS_TO_MASTER_CHANNEL, PARTICIPATING_MESSAGE); //tell to master that I'm participating
|
||||
|
@ -94,7 +94,7 @@
|
|||
}
|
||||
},
|
||||
|
||||
stopRecording: function (entityID) {
|
||||
stopRecording: function () {
|
||||
if (isAvatarRecording) {
|
||||
print("RECORDING ENDED");
|
||||
Recording.stopRecording();
|
||||
|
@ -109,7 +109,7 @@
|
|||
_this.stopRecording();
|
||||
Messages.unsubscribe(MASTER_TO_CLIENTS_CHANNEL);
|
||||
Messages.messageReceived.disconnect(receivingMessage);
|
||||
if(overlay !== null){
|
||||
if (overlay !== null) {
|
||||
Overlays.deleteOverlay(overlay);
|
||||
overlay = null;
|
||||
}
|
||||
|
|
|
@ -29,11 +29,14 @@ var STOP_MESSAGE = "recordingEnded";
|
|||
var PARTICIPATING_MESSAGE = "participatingToRecording";
|
||||
var TIMEOUT = 20;
|
||||
|
||||
|
||||
var toolBar = null;
|
||||
var recordIcon;
|
||||
var isRecording = false;
|
||||
var performanceJSON = { "avatarClips" : [] };
|
||||
var responsesExpected = 0;
|
||||
var readyToPrintInfo = false;
|
||||
var performanceFileURL = null;
|
||||
var waitingForPerformanceFile = true;
|
||||
var totalWaitingTime = 0;
|
||||
var extension = "txt";
|
||||
|
@ -71,9 +74,9 @@ function mousePressEvent(event) {
|
|||
print("I'm the master. I want to start recording");
|
||||
Messages.sendMessage(MASTER_TO_CLIENTS_CHANNEL, START_MESSAGE);
|
||||
isRecording = true;
|
||||
waitingForPerformanceFile = true;
|
||||
} else {
|
||||
print("I want to stop recording");
|
||||
waitingForPerformanceFile = true;
|
||||
Script.update.connect(update);
|
||||
Messages.sendMessage(MASTER_TO_CLIENTS_CHANNEL, STOP_MESSAGE);
|
||||
isRecording = false;
|
||||
|
@ -108,29 +111,38 @@ function update(deltaTime) {
|
|||
}
|
||||
//clean things after upload performance file to asset
|
||||
waitingForPerformanceFile = false;
|
||||
responsesExpected = 0;
|
||||
totalWaitingTime = 0;
|
||||
Script.update.disconnect(update);
|
||||
performanceJSON = { "avatarClips" : [] };
|
||||
}
|
||||
} else if (readyToPrintInfo == true){
|
||||
Window.prompt("Performance file and clips: ", getUtilityString());
|
||||
responsesExpected = 0;
|
||||
performanceJSON = { "avatarClips" : [] };
|
||||
Script.update.disconnect(update);
|
||||
}
|
||||
}
|
||||
|
||||
function getUtilityString() {
|
||||
var resultString = "JSON:\n" + performanceFileURL + "\n" + responsesExpected + " avatar clips:\n";
|
||||
var avatarClips = performanceJSON.avatarClips;
|
||||
avatarClips.forEach(function(param) {
|
||||
resultString += param + "\n";
|
||||
});
|
||||
return resultString;
|
||||
}
|
||||
|
||||
function uploadFinished(url){
|
||||
//need to print somehow the url here this way the master can copy the url
|
||||
print("PERFORMANCE FILE URL: " + url);
|
||||
Assets.downloadData(url, function (data) {
|
||||
printPerformanceJSON(JSON.parse(data));
|
||||
});
|
||||
}
|
||||
|
||||
function printPerformanceJSON(obj) {
|
||||
print("some info:");
|
||||
print("downloaded performance file from asset and examinating its content...");
|
||||
var avatarClips = obj.avatarClips;
|
||||
performanceFileURL = url;
|
||||
print("PERFORMANCE FILE URL: " + performanceFileURL);
|
||||
print("number of clips obtained:" + responsesExpected);
|
||||
var avatarClips = performanceJSON.avatarClips;
|
||||
avatarClips.forEach(function(param) {
|
||||
print("clip url obtained: " + param);
|
||||
});
|
||||
readyToPrintInfo = true;
|
||||
Script.update.connect(update);
|
||||
}
|
||||
|
||||
function cleanup() {
|
||||
|
|
Loading…
Reference in a new issue