Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4448 from huffman/loading-image

Browse source 
Add hourglass image to loading svo overlay
This commit is contained in:
Clément Brisset 2015-03-16 06:25:41 -07:00
commit dfd39ca1e1
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
examples/edit.js
View file

@ -103,12 +103,24 @@ var isActive = false;
var placingEntityID = null; var placingEntityID = null;
IMPORTING_SVO_OVERLAY_WIDTH = 130; IMPORTING_SVO_OVERLAY_WIDTH = 144;
IMPORTING_SVO_OVERLAY_HEIGHT = 30; IMPORTING_SVO_OVERLAY_HEIGHT = 30;
IMPORTING_SVO_OVERLAY_MARGIN = 6; IMPORTING_SVO_OVERLAY_MARGIN = 5;
var importingSVOOverlay = Overlays.addOverlay("text", { IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34;
var importingSVOImageOverlay = Overlays.addOverlay("image", {
imageURL: HIFI_PUBLIC_BUCKET + "images/hourglass.svg",
width: 20,
height: 20,
alpha: 1.0,
color: { red: 255, green: 255, blue: 255 },
x: Window.innerWidth - IMPORTING_SVO_OVERLAY_WIDTH,
y: Window.innerHeight - IMPORTING_SVO_OVERLAY_HEIGHT,
visible: false,
});
var importingSVOTextOverlay = Overlays.addOverlay("text", {
font: { size: 14 }, font: { size: 14 },
text: "Importing SVO...", text: "Importing SVO...",
leftMargin: IMPORTING_SVO_OVERLAY_LEFT_MARGIN,
x: Window.innerWidth - IMPORTING_SVO_OVERLAY_WIDTH - IMPORTING_SVO_OVERLAY_MARGIN, x: Window.innerWidth - IMPORTING_SVO_OVERLAY_WIDTH - IMPORTING_SVO_OVERLAY_MARGIN,
y: Window.innerHeight - IMPORTING_SVO_OVERLAY_HEIGHT - IMPORTING_SVO_OVERLAY_MARGIN, y: Window.innerHeight - IMPORTING_SVO_OVERLAY_HEIGHT - IMPORTING_SVO_OVERLAY_MARGIN,
width: IMPORTING_SVO_OVERLAY_WIDTH, width: IMPORTING_SVO_OVERLAY_WIDTH,
@ -807,7 +819,8 @@ Script.scriptEnding.connect(function() {
selectionDisplay.cleanup(); selectionDisplay.cleanup();
Entities.setLightsArePickable(originalLightsArePickable); Entities.setLightsArePickable(originalLightsArePickable);
Overlays.deleteOverlay(importingSVOOverlay); Overlays.deleteOverlay(importingSVOImageOverlay);
Overlays.deleteOverlay(importingSVOTextOverlay);
}); });
// Do some stuff regularly, like check for placement of various overlays // Do some stuff regularly, like check for placement of various overlays
@ -882,7 +895,8 @@ function handeMenuEvent(menuItem) {
} }
function importSVO(importURL) { function importSVO(importURL) {
Overlays.editOverlay(importingSVOOverlay, { visible: true }); Overlays.editOverlay(importingSVOTextOverlay, { visible: true });
Overlays.editOverlay(importingSVOImageOverlay, { visible: true });
var success = Clipboard.importEntities(importURL); var success = Clipboard.importEntities(importURL);
@ -907,7 +921,8 @@ function importSVO(importURL) {
Window.alert("There was an error importing the entity file."); Window.alert("There was an error importing the entity file.");
} }
Overlays.editOverlay(importingSVOOverlay, { visible: false }); Overlays.editOverlay(importingSVOTextOverlay, { visible: false });
Overlays.editOverlay(importingSVOImageOverlay, { visible: false });
} }
Window.svoImportRequested.connect(importSVO); Window.svoImportRequested.connect(importSVO);