From 9933690ed6d0d3cf83be64ae6b346d8f32b7c499 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 17 Mar 2016 10:36:35 -0700 Subject: [PATCH] whitebrd --- unpublishedScripts/DomainContent/Home/reset.js | 6 ++++-- unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 1aeb81736d..8664019848 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -148,11 +148,13 @@ x: 1101.2123, y: 460.2328, z: -65.8513 - }, { + }, + { x: 97.3683, y: 179.0293, z: 89.9698 - }); + } + ); diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js index 3c27331854..ec95c1058a 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js @@ -16,11 +16,11 @@ var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?" + Math.rando Whiteboard = function(spawnPosition, spawnRotation) { - var orientation = Quat.fromPitchYawRollDegrees(spawnRotation.x,spawnRotation.y,spawnRotation.z); + var orientation = Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z); var markers = []; - var whiteboardPosition = spawnPosition; + var whiteboardRotation = orientation; var WHITEBOARD_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/Whiteboard-4.fbx"; var WHITEBOARD_COLLISION_HULL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/whiteboardCollisionHull.obj"; var whiteboard = Entities.addEntity({