make reset buttons invisible entities instead of text

This commit is contained in:
James B. Pollack 2015-10-26 17:51:55 -07:00
parent 90131f1291
commit 2d873012a3
2 changed files with 31 additions and 90 deletions

View file

@ -339,39 +339,24 @@
function createBasketballResetter() { function createBasketballResetter() {
var position = { var position = {
x: 542.86, x: 543.58,
y: 494.44, y: 495.47,
z: 475.06 z: 469.59
}; };
var dimensions = { var dimensions = {
x: 0.5, x: 1.65,
y: 0.1, y: 1.71,
z: 0.01 z: 1.75
}; };
var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
var resetter = Entities.addEntity({ var resetter = Entities.addEntity({
type: "Text", type: "Text",
position: position, position: position,
name: "Basketball Resetter", name: "Basketball Resetter",
script: basketballResetterScriptURL, script: basketballResetterScriptURL,
rotation: rotation,
dimensions: dimensions, dimensions: dimensions,
backgroundColor: { visible: false,
red: 0,
green: 0,
blue: 0
},
textColor: {
red: 255,
green: 255,
blue: 255
},
text: "RESET BALLS",
lineHeight: 0.07,
faceCamera: true,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -387,39 +372,24 @@
function createTargetResetter() { function createTargetResetter() {
var dimensions = { var dimensions = {
x: 1, x: 0.21,
y: 0.1, y: 0.61,
z: 0.01 z: 0.21
}; };
var position = { var position = {
x: 548.68, x: 548.42,
y: 495.30, y: 496.40,
z: 509.74 z: 509.61
}; };
var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
var resetter = Entities.addEntity({ var resetter = Entities.addEntity({
type: "Text", type: "Box",
position: position, position: position,
name: "Target Resetter", name: "Target Resetter",
script: targetsResetterScriptURL, script: targetsResetterScriptURL,
rotation: rotation,
dimensions: dimensions, dimensions: dimensions,
backgroundColor: { visible: false,
red: 0,
green: 0,
blue: 0
},
textColor: {
red: 255,
green: 255,
blue: 255
},
faceCamera: true,
text: "RESET TARGETS",
lineHeight: 0.07,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -433,6 +403,7 @@
} }
function createTargets() { function createTargets() {
var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx'; var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';

View file

@ -317,39 +317,24 @@ MasterReset = function() {
function createBasketballResetter() { function createBasketballResetter() {
var position = { var position = {
x: 542.86, x: 543.58,
y: 494.44, y: 495.47,
z: 475.06 z: 469.59
}; };
var dimensions = { var dimensions = {
x: 0.5, x: 1.65,
y: 0.1, y: 1.71,
z: 0.01 z: 1.75
}; };
var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
var resetter = Entities.addEntity({ var resetter = Entities.addEntity({
type: "Text", type: "Text",
position: position, position: position,
name: "Basketball Resetter", name: "Basketball Resetter",
script: basketballResetterScriptURL, script: basketballResetterScriptURL,
rotation: rotation,
dimensions: dimensions, dimensions: dimensions,
backgroundColor: { visible:false,
red: 0,
green: 0,
blue: 0
},
textColor: {
red: 255,
green: 255,
blue: 255
},
text: "RESET BALLS",
lineHeight: 0.07,
faceCamera: true,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -365,39 +350,24 @@ MasterReset = function() {
function createTargetResetter() { function createTargetResetter() {
var dimensions = { var dimensions = {
x: 1, x: 0.21,
y: 0.1, y: 0.61,
z: 0.01 z: 0.21
}; };
var position = { var position = {
x: 548.68, x: 548.42,
y: 495.30, y: 496.40,
z: 509.74 z: 509.61
}; };
var rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
var resetter = Entities.addEntity({ var resetter = Entities.addEntity({
type: "Text", type: "Box",
position: position, position: position,
name: "Target Resetter", name: "Target Resetter",
script: targetsResetterScriptURL, script: targetsResetterScriptURL,
rotation: rotation,
dimensions: dimensions, dimensions: dimensions,
backgroundColor: { visible:false,
red: 0,
green: 0,
blue: 0
},
textColor: {
red: 255,
green: 255,
blue: 255
},
faceCamera: true,
text: "RESET TARGETS",
lineHeight: 0.07,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true