Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 13:49:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update scripts with text overlays to use new backgroundAlpha property

Browse source
This commit is contained in:
David Rowe 2014-12-06 11:11:52 -08:00
parent 4ee99ef38a
commit ca62e61579
16 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/ControlACs.js
View file

@ -117,6 +117,7 @@ function setupToolBars() {
leftMargin: TEXT_MARGIN, leftMargin: TEXT_MARGIN,
topMargin: TEXT_MARGIN, topMargin: TEXT_MARGIN,
alpha: ALPHA_OFF, alpha: ALPHA_OFF,
backgroundAlpha: ALPHA_OFF,
visible: true visible: true
})); }));
} }

3
examples/Recorder.js
View file

@ -115,6 +115,7 @@ function setupTimer() {
width: 0, width: 0,
height: 0, height: 0,
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true visible: true
}); });
@ -129,6 +130,7 @@ function setupTimer() {
width: slider.w, width: slider.w,
height: slider.h, height: slider.h,
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true visible: true
}); });
slider.foreground = Overlays.addOverlay("text", { slider.foreground = Overlays.addOverlay("text", {
@ -138,6 +140,7 @@ function setupTimer() {
width: slider.pos * slider.w, width: slider.pos * slider.w,
height: slider.h, height: slider.h,
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true visible: true
}); });

7
examples/editModels.js
View file

@ -206,6 +206,7 @@ var progressDialog = (function () {
height: backgroundHeight, height: backgroundHeight,
imageURL: backgroundUrl, imageURL: backgroundUrl,
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -216,6 +217,7 @@ var progressDialog = (function () {
textColor: textColor, textColor: textColor,
backgroundColor: textBackground, backgroundColor: textBackground,
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -226,6 +228,7 @@ var progressDialog = (function () {
textColor: textColor, textColor: textColor,
backgroundColor: textBackground, backgroundColor: textBackground,
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -1174,6 +1177,7 @@ var toolBar = (function () {
topMargin: menuItemMargin, topMargin: menuItemMargin,
text: "Model URL", text: "Model URL",
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -1183,6 +1187,7 @@ var toolBar = (function () {
topMargin: menuItemMargin, topMargin: menuItemMargin,
text: "Model File", text: "Model File",
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -1489,6 +1494,7 @@ var ExportMenu = function (opts) {
width: scaleViewWidth, width: scaleViewWidth,
height: height, height: height,
alpha: 0.0, alpha: 0.0,
backgroundAlpha: 0.0,
color: { red: 255, green: 255, blue: 255 }, color: { red: 255, green: 255, blue: 255 },
text: "1" text: "1"
}); });
@ -2476,6 +2482,7 @@ function Tooltip() {
text: "", text: "",
color: { red: 228, green: 228, blue: 228 }, color: { red: 228, green: 228, blue: 228 },
alpha: 0.8, alpha: 0.8,
backgroundAlpha: 0.8,
visible: false visible: false
}); });
this.show = function (doShow) { this.show = function (doShow) {

4
examples/fallingSand.js
View file

@ -117,7 +117,7 @@ function ScaleSelector() {
width: this.SECOND_PART, height: this.height, width: this.SECOND_PART, height: this.height,
topMargin: 13, topMargin: 13,
text: this.scale.toString(), text: this.scale.toString(),
alpha: 0.0, backgroundAlpha: 0.0,
visible: editToolsOn, visible: editToolsOn,
color: activeUIColor color: activeUIColor
}); });
@ -126,7 +126,7 @@ function ScaleSelector() {
width: this.SECOND_PART, height: this.height, width: this.SECOND_PART, height: this.height,
leftMargin: 28, leftMargin: 28,
text: this.power.toString(), text: this.power.toString(),
alpha: 0.0, backgroundAlpha: 0.0,
visible: false, visible: false,
color: activeUIColor color: activeUIColor
}); });

4
examples/growTrees.js
View file

@ -116,7 +116,7 @@ function ScaleSelector() {
width: this.SECOND_PART, height: this.height, width: this.SECOND_PART, height: this.height,
topMargin: 13, topMargin: 13,
text: this.scale.toString(), text: this.scale.toString(),
alpha: 0.0, backgroundAlpha: 0.0,
visible: editToolsOn, visible: editToolsOn,
color: activeUIColor color: activeUIColor
}); });
@ -125,7 +125,7 @@ function ScaleSelector() {
width: this.SECOND_PART, height: this.height, width: this.SECOND_PART, height: this.height,
leftMargin: 28, leftMargin: 28,
text: this.power.toString(), text: this.power.toString(),
alpha: 0.0, backgroundAlpha: 0.0,
visible: false, visible: false,
color: activeUIColor color: activeUIColor
}); });

2
examples/libraries/ExportMenu.js
View file

@ -81,7 +81,7 @@ ExportMenu = function (opts) {
y: pos.y + margin, y: pos.y + margin,
width: scaleViewWidth, width: scaleViewWidth,
height: height, height: height,
alpha: 0.0, backgroundAlpha: 0.0,
color: { red: 255, green: 255, blue: 255 }, color: { red: 255, green: 255, blue: 255 },
text: "1" text: "1"
}); });

1
examples/libraries/ToolTip.js
View file

@ -26,6 +26,7 @@ function Tooltip() {
text: "", text: "",
color: { red: 128, green: 128, blue: 128 }, color: { red: 128, green: 128, blue: 128 },
alpha: 0.2, alpha: 0.2,
backgroundAlpha: 0.2,
visible: false visible: false
}); });
this.show = function (doShow) { this.show = function (doShow) {

8
examples/libraries/entityCameraTool.js
View file

@ -390,6 +390,7 @@ var ZoomTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "+", text: "+",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
var decreaseButton = Overlays.addOverlay("text", { var decreaseButton = Overlays.addOverlay("text", {
@ -403,6 +404,7 @@ var ZoomTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "-", text: "-",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
var zoomBar = Overlays.addOverlay("text", { var zoomBar = Overlays.addOverlay("text", {
@ -416,6 +418,7 @@ var ZoomTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "", text: "",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
var zoomHandle = Overlays.addOverlay("text", { var zoomHandle = Overlays.addOverlay("text", {
@ -428,6 +431,7 @@ var ZoomTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "", text: "",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
@ -501,6 +505,7 @@ var ArrowTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "^", text: "^",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
var leftButton = Overlays.addOverlay("text", { var leftButton = Overlays.addOverlay("text", {
@ -514,6 +519,7 @@ var ArrowTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "<", text: "<",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
var rightButton = Overlays.addOverlay("text", { var rightButton = Overlays.addOverlay("text", {
@ -540,6 +546,7 @@ var ArrowTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "v", text: "v",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });
var centerButton = Overlays.addOverlay("text", { var centerButton = Overlays.addOverlay("text", {
@ -553,6 +560,7 @@ var ArrowTool = function(opts) {
leftMargin: 4, leftMargin: 4,
text: "", text: "",
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: true, visible: true,
}); });

1
examples/libraries/entitySelectionTool.js
View file

@ -368,6 +368,7 @@ SelectionDisplay = (function () {
color: { red: 0, green: 0, blue: 0}, color: { red: 0, green: 0, blue: 0},
backgroundColor: { red: 255, green: 255, blue: 255 }, backgroundColor: { red: 255, green: 255, blue: 255 },
alpha: 0.7, alpha: 0.7,
backgroundAlpha: 0.7,
visible: false, visible: false,
isFacingAvatar: true, isFacingAvatar: true,
drawInFront: true, drawInFront: true,

2
examples/libraries/progressDialog.js
View file

@ -40,6 +40,7 @@ progressDialog = (function () {
textColor: textColor, textColor: textColor,
backgroundColor: textBackground, backgroundColor: textBackground,
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -50,6 +51,7 @@ progressDialog = (function () {
textColor: textColor, textColor: textColor,
backgroundColor: textBackground, backgroundColor: textBackground,
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });

8
examples/libraries/toolBars.js
View file

@ -138,6 +138,7 @@ ToolBar = function(x, y, direction) {
width: this.width, width: this.width,
height: this.height, height: this.height,
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
visible: false visible: false
}); });
this.spacing = []; this.spacing = [];
@ -243,7 +244,10 @@ ToolBar = function(x, y, direction) {
this.tools[tool].setAlpha(alpha); this.tools[tool].setAlpha(alpha);
} }
if (this.back != null) { if (this.back != null) {
Overlays.editOverlay(this.back, { alpha: alpha}); Overlays.editOverlay(this.back, {
alpha: alpha,
backgroundAlpha: alpha
});
} }
} else { } else {
this.tools[tool].setAlpha(alpha); this.tools[tool].setAlpha(alpha);
@ -263,7 +267,7 @@ ToolBar = function(x, y, direction) {
((direction == ToolBar.VERTICAL) ? 1 : 2) * ToolBar.SPACING, ((direction == ToolBar.VERTICAL) ? 1 : 2) * ToolBar.SPACING,
visible: true, visible: true,
backgroundColor: color, backgroundColor: color,
alpha: alpha backgroundAlpha: alpha
}); });
} }
} }

1
examples/lobby.js
View file

@ -113,6 +113,7 @@ function drawLobby() {
text: "", text: "",
lineHeight: lineHeight, lineHeight: lineHeight,
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
ignoreRayIntersection: true, ignoreRayIntersection: true,
visible: false, visible: false,
isFacingAvatar: true isFacingAvatar: true

2
examples/newEditEntities.js
View file

@ -145,6 +145,7 @@ var toolBar = (function () {
topMargin: menuItemMargin, topMargin: menuItemMargin,
text: "Model URL", text: "Model URL",
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });
@ -154,6 +155,7 @@ var toolBar = (function () {
topMargin: menuItemMargin, topMargin: menuItemMargin,
text: "Model File", text: "Model File",
alpha: 0.9, alpha: 0.9,
backgroundAlpha: 0.9,
visible: false visible: false
}); });

5
examples/notifications.js
View file

@ -115,6 +115,7 @@ function createNotification(text) {
color: textColor, color: textColor,
backgroundColor: backColor, backgroundColor: backColor,
alpha: backgroundAlpha, alpha: backgroundAlpha,
backgroundAlpha: backgroundAlpha,
topMargin: topMargin, topMargin: topMargin,
leftMargin: leftMargin, leftMargin: leftMargin,
font: {size: fontSize}, font: {size: fontSize},
@ -160,7 +161,7 @@ function fadeIn(noticeIn, buttonIn) {
pauseTimer = Script.setInterval(function() { pauseTimer = Script.setInterval(function() {
q++; q++;
qFade = q / 10.0; qFade = q / 10.0;
Overlays.editOverlay(noticeIn, {alpha: qFade}); Overlays.editOverlay(noticeIn, {alpha: qFade, backgroundAlpha: qFade});
Overlays.editOverlay(buttonIn, {alpha: qFade}); Overlays.editOverlay(buttonIn, {alpha: qFade});
if (q >= 9.0) { if (q >= 9.0) {
Script.clearInterval(pauseTimer); Script.clearInterval(pauseTimer);
@ -344,7 +345,7 @@ function fadeOut(noticeOut, buttonOut, arraysOut) {
pauseTimer = Script.setInterval(function() { pauseTimer = Script.setInterval(function() {
r--; r--;
rFade = r / 10.0; rFade = r / 10.0;
Overlays.editOverlay(noticeOut, {alpha: rFade}); Overlays.editOverlay(noticeOut, {alpha: rFade, backgroundAlpha: rFade});
Overlays.editOverlay(buttonOut, {alpha: rFade}); Overlays.editOverlay(buttonOut, {alpha: rFade});
if (r < 0) { if (r < 0) {
dismiss(noticeOut, buttonOut, arraysOut); dismiss(noticeOut, buttonOut, arraysOut);

1
examples/testModelOverlaySubMeshes.js
View file

@ -57,6 +57,7 @@ var statusText = Overlays.addOverlay("text", {
height: 20, height: 20,
backgroundColor: { red: 0, green: 0, blue: 0}, backgroundColor: { red: 0, green: 0, blue: 0},
alpha: 1.0, alpha: 1.0,
backgroundAlpha: 1.0,
color: { red: 255, green: 255, blue: 255}, color: { red: 255, green: 255, blue: 255},
topMargin: 4, topMargin: 4,
leftMargin: 4, leftMargin: 4,

1
examples/textInputOverlayExample.js
View file

@ -44,6 +44,7 @@ var inputWindow = Overlays.addOverlay("text", {
color: textColor, color: textColor,
backgroundColor: backColor, backgroundColor: backColor,
alpha: backgroundAlpha, alpha: backgroundAlpha,
backgroundAlpha: backgroundAlpha,
topMargin: topMargin, topMargin: topMargin,
leftMargin: leftMargin, leftMargin: leftMargin,
font: {size: fontSize}, font: {size: fontSize},