From 504faf430d6b9a7f3d66ba3573534b5197939438 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 19 May 2017 12:50:29 +1200 Subject: [PATCH] Fix rotation axes of stopwatch hands --- .../marketplace/stopwatch/stopwatchServer.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js b/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js index 8b36b48cde..925db565c3 100644 --- a/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js +++ b/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js @@ -67,11 +67,11 @@ self.tickIntervalID = null; } Entities.editEntity(self.secondHandID, { - rotation: Quat.fromPitchYawRollDegrees(0, 0, 0), + localRotation: Quat.fromPitchYawRollDegrees(0, 0, 0), angularVelocity: { x: 0, y: 0, z: 0 }, }); Entities.editEntity(self.minuteHandID, { - rotation: Quat.fromPitchYawRollDegrees(0, 0, 0), + localRotation: Quat.fromPitchYawRollDegrees(0, 0, 0), angularVelocity: { x: 0, y: 0, z: 0 }, }); self.isActive = false; @@ -100,11 +100,12 @@ seconds++; const degreesPerTick = -360 / 60; Entities.editEntity(self.secondHandID, { - rotation: Quat.fromPitchYawRollDegrees(0, seconds * degreesPerTick, 0), + localRotation: Quat.fromPitchYawRollDegrees(0, seconds * degreesPerTick, 0), }); + if (seconds % 60 == 0) { Entities.editEntity(self.minuteHandID, { - rotation: Quat.fromPitchYawRollDegrees(0, (seconds / 60) * degreesPerTick, 0), + localRotation: Quat.fromPitchYawRollDegrees(0, (seconds / 60) * degreesPerTick, 0), }); Audio.playSound(self.chimeSound, { position: self.getStopwatchPosition(),