From 8cac61081de0a7d99dd64a0081d5bff8c49e29fb Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 11 May 2016 10:33:06 -0700
Subject: [PATCH] change cuckoo and whiteboard positions
---
.../DomainContent/Home/cuckooClock/wrapper.js | 32 +++++++++----------
.../DomainContent/Home/reset.js | 24 +++++++-------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js
index 6c6704514b..36d06cd8e8 100644
--- a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js
@@ -9,7 +9,7 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js" )
+var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js")
var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx";
var CLOCK_BODY_COLLISION_HULL_URL = "atp:/cuckooClock/clockHull.obj";
var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx";
@@ -38,11 +38,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
},
position: spawnPosition,
rotation: clockRotation,
- dimensions: {
+ dimensions: Vec3.multiply(0.5, {
x: 0.8181,
y: 1.3662,
z: 0.8181
- },
+ }),
userData: JSON.stringify({
hifiHomeKey: {
reset: true
@@ -50,9 +50,9 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
})
})
- var forwardOffset = -0.13
- var upOffset = 0.255;
- var sideOffset = -0.03;
+ var forwardOffset = 0.5 * -0.13;
+ var upOffset = 0.5 * 0.255;
+ var sideOffset = 0.5 * -0.03;
var clockFacePosition = spawnPosition;
clockFacePosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getFront(clockRotation), forwardOffset));
clockFacePosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getUp(clockRotation), upOffset));
@@ -65,11 +65,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
name: "home_model_clockFace",
modelURL: CLOCK_FACE_URL,
position: clockFacePosition,
- dimensions: {
+ dimensions: Vec3.multiply(0.5, {
x: 0.2397,
y: 0.2402,
z: 0.0212
- },
+ }),
userData: JSON.stringify({
hifiHomeKey: {
reset: true
@@ -86,7 +86,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
var myDate = new Date()
// HOUR HAND *************************
- var clockHandForwardOffset = -0.017;
+ var clockHandForwardOffset = (0.5 * -0.017);
var hourHandPosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getFront(clockRotation), clockHandForwardOffset));
@@ -118,11 +118,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
rotation: worldClockHandRotation,
angularDamping: 0,
angularVelocity: worldAngularVelocity,
- dimensions: {
+ dimensions: Vec3.multiply(0.5, {
x: 0.0263,
y: 0.0982,
z: 0.0024
- },
+ }),
userData: JSON.stringify({
hifiHomeKey: {
reset: true
@@ -150,11 +150,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
modelURL: CLOCK_SECOND_HAND_URL,
name: "home_model_clockSecondHand",
position: hourHandPosition,
- dimensions: {
+ dimensions: Vec3.multiply(0.5, {
x: 0.0043,
y: 0.1117,
z: 0.0008
- },
+ }),
color: {
red: 200,
green: 10,
@@ -202,14 +202,14 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
y: 0.05,
z: 0.5
},
- rotation:worldClockHandRotation,
+ rotation: worldClockHandRotation,
angularDamping: 0,
angularVelocity: worldAngularVelocity,
- dimensions: {
+ dimensions: Vec3.multiply(0.5, {
x: 0.0251,
y: 0.1179,
z: 0.0032
- },
+ }),
script: MINUTE_HAND_CLOCK_SCRIPT_URL,
userData: JSON.stringify({
clockBody: clockBody,
diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index 60546e5ae1..376ae843e1 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -198,13 +198,13 @@
});
var whiteboard = new Whiteboard({
- x: 1104,
- y: 460.5,
- z: -77
+ x: 1105.0955,
+ y: 460.5000,
+ z: -77.4409
}, {
- x: 0,
- y: -133,
- z: 0
+ x: -0.0013,
+ y: -133.0056,
+ z: -0.0013
});
var pingPongGun = new HomePingPongGun({
@@ -218,13 +218,13 @@
});
var cuckooClock = new MyCuckooClock({
- x: 1105.267,
- y: 461.44,
- z: -81.9495
+ x: 1105.5237,
+ y: 461.4826,
+ z: -81.7524
}, {
- x: 0,
- y: -57,
- z: 0
+ x: -0.0013,
+ y: -57.0089,
+ z: -0.0013
});
print('HOME after creating scripted entities')