From 4a3650b30938c60e44cdb45f28fc625dd919d77d Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 30 Mar 2016 10:05:16 -0700 Subject: [PATCH] reset atp --- unpublishedScripts/DomainContent/Home/reset.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 1c103cdcb7..930bdc0181 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -291,11 +291,7 @@ }, collisionless: true, angularDamping: 0, - angularVelocity: { - x: 0, - y: 6, - z: 0 - }, + angularVelocity: Quat.fromPitchYawRollDegrees(0,6,0), dynamic: false, userData: JSON.stringify({ 'hifiHomeKey': { @@ -314,8 +310,8 @@ }, createTransformingDais: function() { - var DAIS_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/dressingRoom/Dressing-Dais.fbx'; - var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/dressingRoom/Dressing-Dais.obj'; + var DAIS_MODEL_URL = 'atp:/dressingRoom/Dressing-Dais.fbx'; + var COLLISION_HULL_URL = 'atp:/dressingRoom/Dressing-Dais.obj'; var DAIS_DIMENSIONS = { x: 1.0654, @@ -351,7 +347,7 @@ createTransformers: function() { var firstDollPosition = { x: 1107.61, - y: 460.5, + y: 460.6, z: -77.34 }