From e971da7dcbf706c75c379ecb004bc85e0e54689b Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 2 May 2016 16:54:32 -0700
Subject: [PATCH 1/2] move dice GUI
---
scripts/tutorials/createDice.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/scripts/tutorials/createDice.js b/scripts/tutorials/createDice.js
index 527735da57..8d6e6df816 100644
--- a/scripts/tutorials/createDice.js
+++ b/scripts/tutorials/createDice.js
@@ -13,6 +13,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+
+
var isDice = false;
var NUMBER_OF_DICE = 4;
var LIFETIME = 10000; // Dice will live for about 3 hours
@@ -29,14 +31,14 @@ var screenSize = Controller.getViewportDimensions();
var BUTTON_SIZE = 32;
var PADDING = 3;
-
+var BOTTOM_PADDING = 50;
//a helper library for creating toolbars
Script.include("http://hifi-production.s3.amazonaws.com/tutorials/dice/toolBars.js");
-var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.dice.toolbar", function(screenSize) {
+var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.toolbars.dice7", function(screenSize) {
return {
- x: (screenSize.x / 2 - BUTTON_SIZE * 2 + PADDING),
- y: (screenSize.y - (BUTTON_SIZE + PADDING))
+ x: (screenSize.x - BUTTON_SIZE*3),
+ y: (screenSize.y - 100)
};
});
@@ -54,7 +56,7 @@ var offButton = toolBar.addOverlay("image", {
var deleteButton = toolBar.addOverlay("image", {
x: screenSize.x / 2 - BUTTON_SIZE,
- y: screenSize.y - (BUTTON_SIZE + PADDING),
+ y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING,
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: "http://hifi-production.s3.amazonaws.com/tutorials/dice/delete.png",
@@ -69,7 +71,7 @@ var deleteButton = toolBar.addOverlay("image", {
var diceIconURL = "http://hifi-production.s3.amazonaws.com/tutorials/dice/dice.png"
var diceButton = toolBar.addOverlay("image", {
x: screenSize.x / 2 + PADDING,
- y: screenSize.y - (BUTTON_SIZE + PADDING),
+ y: screenSize.y - (BUTTON_SIZE + PADDING)+BOTTOM_PADDING,
width: BUTTON_SIZE,
height: BUTTON_SIZE,
imageURL: diceIconURL,
From a9ab531e273d8ddf54b91bec3f90c3ad58ef381b Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 2 May 2016 17:01:44 -0700
Subject: [PATCH 2/2] clear up toolbar name
---
scripts/tutorials/createDice.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/tutorials/createDice.js b/scripts/tutorials/createDice.js
index 8d6e6df816..00ec1184bc 100644
--- a/scripts/tutorials/createDice.js
+++ b/scripts/tutorials/createDice.js
@@ -35,7 +35,7 @@ var BOTTOM_PADDING = 50;
//a helper library for creating toolbars
Script.include("http://hifi-production.s3.amazonaws.com/tutorials/dice/toolBars.js");
-var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.toolbars.dice7", function(screenSize) {
+var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.toolbars-dice", function(screenSize) {
return {
x: (screenSize.x - BUTTON_SIZE*3),
y: (screenSize.y - 100)