Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add urls

Browse source
This commit is contained in:
James B. Pollack 2016-03-27 09:51:13 -07:00
parent 8083eedcb0
commit c7a709414b
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js
View file

@ -72,7 +72,7 @@
type: 'Model', type: 'Model',
parentID: this.rotatorBlock, parentID: this.rotatorBlock,
modelURL: smallProps.modelURL, modelURL: smallProps.modelURL,
position: this.putTransformerOnRotatorBlock(), position: this.putTransformerOnRotatorBlock(rotatorProps.position),
rotation: rotatorProps.rotation, rotation: rotatorProps.rotation,
userData: JSON.stringify({ userData: JSON.stringify({
'grabbableKey': { 'grabbableKey': {
@ -88,8 +88,16 @@
this.putNewVersionOnShelf(); 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() { putNewVersionOnShelf: function() {

21
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -48,11 +48,11 @@
Script.include(pingPongGunPath); Script.include(pingPongGunPath);
Script.include(transformerPath); Script.include(transformerPath);
var TRANSFORMER_URL_ARTEMIS = ''; var TRANSFORMER_URL_ARTEMIS = 'http://hifi-public.s3.amazonaws.com/ryan/DefaultAvatarFemale2/0314HiFiFemAviHeightChange.fbx';
var TRANSFORMER_URL_ALBERT = ''; var TRANSFORMER_URL_ALBERT = 'https://s3.amazonaws.com/hifi-public/ozan/avatars/albert/albert/albert.fbx';
var TRANSFORMER_URL_BEING_OF_LIGHT = ''; var TRANSFORMER_URL_BEING_OF_LIGHT = 'http://hifi-public.s3.amazonaws.com/ryan/0318HiFiBoL/0318HiFiBoL.fbx';
var TRANSFORMER_URL_KATE = ''; var TRANSFORMER_URL_KATE = 'https://hifi-public.s3.amazonaws.com/ozan/avatars/kate/kate/kate.fbx';
var TRANSFORMER_URL_WILL = ''; var TRANSFORMER_URL_WILL = 'https://s3.amazonaws.com/hifi-public/models/skeletons/Will/Will.fbx';
Reset.prototype = { Reset.prototype = {
tidying: false, tidying: false,
@ -269,14 +269,14 @@
createTransformers: function() { createTransformers: function() {
var firstDollPosition: { var firstDollPosition: {
x: 0, x: 1108.2123,
y: 0, y: 460.7516,
z: 0 z: -80.9387
} }
var dollRotation = { var dollRotation = {
x: 0, x: 0,
y: 0, y: 28,
z: 0, z: 0,
} }
@ -325,8 +325,9 @@
}) })
print('JBP after deleting home entities') print('JBP after deleting home entities')
}, },
unload: function() { unload: function() {
this.findAndDeleteHomeEntities(); // this.findAndDeleteHomeEntities();
} }
} }