From bc11bf0a69fc25c56c3bc3816d7a0895315ab637 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 8 Feb 2017 14:09:50 -0800
Subject: [PATCH] Update position and orientation of stopwatch

---
 .../marketplace/stopwatch/spawnStopwatch.js     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js b/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
index 4203db37fa..d8a5305b4b 100644
--- a/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
+++ b/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
@@ -8,22 +8,27 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var positionToSpawn = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.rotation));
+var forward = Quat.getFront(MyAvatar.orientation);
+Vec3.print("Forward: ", forward);
+var positionToSpawn = Vec3.sum(MyAvatar.position, Vec3.multiply(3, forward));
+var scale = 0.5;
+positionToSpawn.y += 0.5;
 
 var stopwatchID = Entities.addEntity({
     type: "Model",
     name: "stopwatch/base",
     position: positionToSpawn,
     modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch.fbx",
-    dimensions: {"x":4.129462242126465,"y":1.058512806892395,"z":5.773681640625}
+    dimensions: Vec3.multiply(scale, {"x":4.129462242126465,"y":1.058512806892395,"z":5.773681640625}),
+    rotation: Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0))
 });
 
 var secondHandID = Entities.addEntity({
     type: "Model",
     name: "stopwatch/seconds",
     parentID: stopwatchID,
-    localPosition: {"x":-0.004985813982784748,"y":0.39391064643859863,"z":0.8312804698944092},
-    dimensions: {"x":0.14095762372016907,"y":0.02546107769012451,"z":1.6077008247375488},
+    localPosition: Vec3.multiply(scale, {"x":-0.004985813982784748,"y":0.39391064643859863,"z":0.8312804698944092}),
+    dimensions: Vec3.multiply(scale, {"x":0.14095762372016907,"y":0.02546107769012451,"z":1.6077008247375488}),
     registrationPoint: {"x":0.5,"y":0.5,"z":1},
     modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch-sec-hand.fbx",
 });
@@ -32,8 +37,8 @@ var minuteHandID = Entities.addEntity({
     type: "Model",
     name: "stopwatch/minutes",
     parentID: stopwatchID,
-    localPosition: {"x":-0.0023056098725646734,"y":0.3308190703392029,"z":0.21810021996498108},
-    dimensions: {"x":0.045471154153347015,"y":0.015412690117955208,"z":0.22930574417114258},
+    localPosition: Vec3.multiply(scale, {"x":-0.0023056098725646734,"y":0.3308190703392029,"z":0.21810021996498108}),
+    dimensions: Vec3.multiply(scale, {"x":0.045471154153347015,"y":0.015412690117955208,"z":0.22930574417114258}),
     registrationPoint: {"x":0.5,"y":0.5,"z":1},
     modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch-min-hand.fbx",
 });