Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-05 11:27:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath

Browse source 
Fix paths to various Snapshot resource files
This commit is contained in:
Zach Fox 2018-04-18 13:44:53 -07:00 committed by GitHub
commit e0012ed5dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
interface/resources/sounds/snap.wav → interface/resources/sounds/snapshot/snap.wav
View file

0
scripts/system/assets/sounds/sound-print-photo.wav → interface/resources/sounds/snapshot/sound-print-photo.wav
View file

10
scripts/system/snapshot.js
View file

@ -275,7 +275,7 @@ function onMessage(message) {
} }
} }
var POLAROID_PRINT_SOUND = SoundCache.getSound(Script.resolvePath("assets/sounds/sound-print-photo.wav")); var POLAROID_PRINT_SOUND = SoundCache.getSound(Script.resourcesPath() + "sounds/snapshot/sound-print-photo.wav");
var POLAROID_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx'; var POLAROID_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx';
function printToPolaroid(image_url) { function printToPolaroid(image_url) {
@ -347,7 +347,7 @@ function fillImageDataFromPrevious() {
story_id: previousStillSnapStoryID, story_id: previousStillSnapStoryID,
blastButtonDisabled: previousStillSnapBlastingDisabled, blastButtonDisabled: previousStillSnapBlastingDisabled,
hifiButtonDisabled: previousStillSnapHifiSharingDisabled, hifiButtonDisabled: previousStillSnapHifiSharingDisabled,
errorPath: Script.resolvePath(Script.resourcesPath() + 'snapshot/img/no-image.jpg') errorPath: Script.resourcesPath() + 'snapshot/img/no-image.jpg'
}); });
} }
if (previousAnimatedSnapPath !== "") { if (previousAnimatedSnapPath !== "") {
@ -356,7 +356,7 @@ function fillImageDataFromPrevious() {
story_id: previousAnimatedSnapStoryID, story_id: previousAnimatedSnapStoryID,
blastButtonDisabled: previousAnimatedSnapBlastingDisabled, blastButtonDisabled: previousAnimatedSnapBlastingDisabled,
hifiButtonDisabled: previousAnimatedSnapHifiSharingDisabled, hifiButtonDisabled: previousAnimatedSnapHifiSharingDisabled,
errorPath: Script.resolvePath(Script.resourcesPath() + 'snapshot/img/no-image.jpg') errorPath: Script.resourcesPath() + 'snapshot/img/no-image.jpg'
}); });
} }
} }
@ -473,7 +473,7 @@ function takeSnapshot() {
Menu.setIsOptionChecked("Overlays", false); Menu.setIsOptionChecked("Overlays", false);
} }
var snapActivateSound = SoundCache.getSound(Script.resolvePath("../../resources/sounds/snap.wav")); var snapActivateSound = SoundCache.getSound(Script.resourcesPath() + "sounds/snapshot/snap.wav");
// take snapshot (with no notification) // take snapshot (with no notification)
Script.setTimeout(function () { Script.setTimeout(function () {
@ -596,7 +596,7 @@ function processingGifStarted(pathStillSnapshot) {
snapshotOptions = { snapshotOptions = {
containsGif: true, containsGif: true,
processingGif: true, processingGif: true,
loadingGifPath: Script.resolvePath(Script.resourcesPath() + 'icons/loadingDark.gif'), loadingGifPath: Script.resourcesPath() + 'icons/loadingDark.gif',
canShare: canShare, canShare: canShare,
isLoggedIn: isLoggedIn isLoggedIn: isLoggedIn
}; };