From bdcc621996fd1b2a9d4a445844fd6bfac05e47f6 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 17 Mar 2016 10:32:24 -0700 Subject: [PATCH] rotate whiteboard --- unpublishedScripts/DomainContent/Home/reset.js | 6 +++++- .../DomainContent/Home/whiteboard/wrapper.js | 15 +-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 58c4563c54..1aeb81736d 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -130,8 +130,12 @@ var whiteboard = new Whiteboard({ x: 1104, - y: 460, + y: 460.5, z: -77 + },{ + x:0, + y:-133, + z:0 }); var myPlant = new Plant({ diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js index 8e839c3ffb..3c27331854 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js @@ -16,20 +16,7 @@ var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?" + Math.rando Whiteboard = function(spawnPosition, spawnRotation) { - var orientation = MyAvatar.orientation; - orientation = Quat.safeEulerAngles(orientation); - var markerRotation = Quat.fromVec3Degrees({ - x: orientation.x + 10, - y: orientation.y - 90, - z: orientation.z - }) - orientation.x = 0; - var whiteboardRotation = Quat.fromVec3Degrees({ - x: 0, - y: orientation.y, - z: 0 - }); - orientation = Quat.fromVec3Degrees(orientation); + var orientation = Quat.fromPitchYawRollDegrees(spawnRotation.x,spawnRotation.y,spawnRotation.z); var markers = [];