diff --git a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js index 8ea0200ba3..1896bb8a59 100644 --- a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js +++ b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js @@ -72,7 +72,7 @@ type: 'Model', parentID: this.rotatorBlock, modelURL: smallProps.modelURL, - position: this.putTransformerOnRotatorBlock(), + position: this.putTransformerOnRotatorBlock(rotatorProps.position), rotation: rotatorProps.rotation, userData: JSON.stringify({ 'grabbableKey': { @@ -88,8 +88,16 @@ this.putNewVersionOnShelf(); }, - putTransformerOnRotatorBlock: function() { + putTransformerOnRotatorBlock: function(blockPosition) { + var myProps = Entities.getEntityProperties(this.entityID); + var halfHeight = myProps.dimensions.y / 2; + var newPosition = { + x: blockPosition.x, + y: blockPosition.x + halfHeight, + z: blockPosition.z + } + return newPosition }, putNewVersionOnShelf: function() { diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index cae24d9b10..1c47ecf384 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -48,11 +48,11 @@ Script.include(pingPongGunPath); Script.include(transformerPath); - var TRANSFORMER_URL_ARTEMIS = ''; - var TRANSFORMER_URL_ALBERT = ''; - var TRANSFORMER_URL_BEING_OF_LIGHT = ''; - var TRANSFORMER_URL_KATE = ''; - var TRANSFORMER_URL_WILL = ''; + var TRANSFORMER_URL_ARTEMIS = 'http://hifi-public.s3.amazonaws.com/ryan/DefaultAvatarFemale2/0314HiFiFemAviHeightChange.fbx'; + var TRANSFORMER_URL_ALBERT = 'https://s3.amazonaws.com/hifi-public/ozan/avatars/albert/albert/albert.fbx'; + var TRANSFORMER_URL_BEING_OF_LIGHT = 'http://hifi-public.s3.amazonaws.com/ryan/0318HiFiBoL/0318HiFiBoL.fbx'; + var TRANSFORMER_URL_KATE = 'https://hifi-public.s3.amazonaws.com/ozan/avatars/kate/kate/kate.fbx'; + var TRANSFORMER_URL_WILL = 'https://s3.amazonaws.com/hifi-public/models/skeletons/Will/Will.fbx'; Reset.prototype = { tidying: false, @@ -269,14 +269,14 @@ createTransformers: function() { var firstDollPosition: { - x: 0, - y: 0, - z: 0 + x: 1108.2123, + y: 460.7516, + z: -80.9387 } var dollRotation = { x: 0, - y: 0, + y: 28, z: 0, } @@ -325,8 +325,9 @@ }) print('JBP after deleting home entities') }, + unload: function() { - this.findAndDeleteHomeEntities(); + // this.findAndDeleteHomeEntities(); } }