Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 00:13:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pretty stable...

Browse source
This commit is contained in:
Zach Fox 2017-04-24 15:59:19 -07:00
parent 7c5de1e60b
commit f838e87f48
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/system/html/css/SnapshotReview.css
View file

@ -11,6 +11,7 @@
body {
padding: 0;
margin: 0;
overflow: hidden;
}
/*

12
scripts/system/html/js/SnapshotReview.js
View file

@ -23,7 +23,7 @@ function clearImages() {
imageCount = 0;
idCounter = 0;
}
function addImage(image_data, isGifLoading, canSharePreviousImages) {
function addImage(image_data, isGifLoading, isShowingPreviousImages, canSharePreviousImages) {
if (!image_data.localPath) {
return;
}
@ -46,9 +46,9 @@ function addImage(image_data, isGifLoading, canSharePreviousImages) {
document.getElementById("snapshot-images").appendChild(div);
var isGif = img.src.split('.').pop().toLowerCase() === "gif";
paths.push(image_data.localPath);
if (!isGifLoading && !canSharePreviousImages) {
if (!isGifLoading && !isShowingPreviousImages) {
shareForUrl(id);
} else if (canSharePreviousImages) {
} else if (isShowingPreviousImages && canSharePreviousImages) {
appendShareBar(id, image_data.story_id, isGif)
}
}
@ -233,7 +233,7 @@ window.onload = function () {
var messageOptions = message.options;
imageCount = message.image_data.length;
message.image_data.forEach(function (element, idx, array) {
addImage(element, true, message.canShare);
addImage(element, true, true, message.canShare);
});
break;
case 'addImages':
@ -247,7 +247,7 @@ window.onload = function () {
imageCount = message.image_data.length + 1; // "+1" for the GIF that'll finish processing soon
message.image_data.unshift({ localPath: messageOptions.loadingGifPath });
message.image_data.forEach(function (element, idx, array) {
addImage(element, idx === 0);
addImage(element, idx === 0, false, false);
});
} else {
var gifPath = message.image_data[0].localPath;
@ -260,7 +260,7 @@ window.onload = function () {
} else {
imageCount = message.image_data.length;
message.image_data.forEach(function (element, idx, array) {
addImage(element, false);
addImage(element, false, false, false);
});
}
break;

44
scripts/system/snapshot.js
View file

@ -240,6 +240,15 @@ function snapshotUploaded(isError, reply) {
}
var href, domainId;
function takeSnapshot() {
tablet.emitScriptEvent(JSON.stringify({
type: "snapshot",
action: "clearPreviousImages"
}));
Settings.setValue("previousStillSnapPath", "");
Settings.setValue("previousStillSnapStoryID", "");
Settings.setValue("previousAnimatedSnapPath", "");
Settings.setValue("previousAnimatedSnapStoryID", "");
// Raising the desktop for the share dialog at end will interact badly with clearOverlayWhenMoving.
// Turn it off now, before we start futzing with things (and possibly moving).
clearOverlayWhenMoving = MyAvatar.getClearOverlayWhenMoving(); // Do not use Settings. MyAvatar keeps a separate copy.
@ -252,22 +261,22 @@ function takeSnapshot() {
Settings.setValue("previousSnapshotDomainID", domainId);
maybeDeleteSnapshotStories();
tablet.emitScriptEvent(JSON.stringify({
type: "snapshot",
action: "clearPreviousImages"
}));
Settings.setValue("previousStillSnapPath", "");
Settings.setValue("previousStillSnapStoryID", "");
Settings.setValue("previousAnimatedSnapPath", "");
Settings.setValue("previousAnimatedSnapStoryID", "");
// update button states
resetOverlays = Menu.isOptionChecked("Overlays"); // For completness. Certainly true if the button is visible to be clicked.
resetOverlays = Menu.isOptionChecked("Overlays"); // For completeness. Certainly true if the button is visible to be clicked.
reticleVisible = Reticle.visible;
Reticle.visible = false;
Window.stillSnapshotTaken.connect(stillSnapshotTaken);
Window.processingGifStarted.connect(processingGifStarted);
Window.processingGifCompleted.connect(processingGifCompleted);
var includeAnimated = Settings.getValue("alsoTakeAnimatedSnapshot", true);
if (includeAnimated) {
Window.processingGifStarted.connect(processingGifStarted);
} else {
Window.stillSnapshotTaken.connect(stillSnapshotTaken);
}
if (buttonConnected) {
button.clicked.disconnect(openSnapApp);
buttonConnected = false;
}
// hide overlays if they are on
if (resetOverlays) {
@ -278,7 +287,7 @@ function takeSnapshot() {
Script.setTimeout(function () {
HMD.closeTablet();
Script.setTimeout(function () {
Window.takeSnapshot(false, Settings.getValue("alsoTakeAnimatedSnapshot", true), 1.91);
Window.takeSnapshot(false, includeAnimated, 1.91);
}, SNAPSHOT_DELAY);
}, FINISH_SOUND_DELAY);
}
@ -315,6 +324,10 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
Menu.setIsOptionChecked("Overlays", true);
}
Window.stillSnapshotTaken.disconnect(stillSnapshotTaken);
if (!buttonConnected) {
button.clicked.connect(openSnapApp);
buttonConnected = true;
}
// A Snapshot Review dialog might be left open indefinitely after taking the picture,
// during which time the user may have moved. So stash that info in the dialog so that
@ -343,10 +356,7 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
function processingGifStarted(pathStillSnapshot) {
Window.processingGifStarted.disconnect(processingGifStarted);
if (buttonConnected) {
button.clicked.disconnect(openSnapApp);
buttonConnected = false;
}
Window.processingGifCompleted.connect(processingGifCompleted);
// show hud
Reticle.visible = reticleVisible;
// show overlays if they were on