Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:37:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

try hard coding doll sizesw

Browse source
This commit is contained in:
James B. Pollack 2016-03-28 10:42:17 -07:00
parent ca4931e6ce
commit 054b910e20
2 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
unpublishedScripts/DomainContent/Home/dressingRoom/wrapper.js
View file

@ -1,6 +1,6 @@
var TRANSFORMER_SCRIPT = Script.resolvePath('transformer.js?' + Math.random()); var TRANSFORMER_SCRIPT = Script.resolvePath('transformer.js?' + Math.random());
var SHRINK_AMOUNT = 1 / 2; // var SHRINK_AMOUNT = 1 / 2;
TransformerDoll = function(modelURL, spawnPosition, spawnRotation) { TransformerDoll = function(modelURL, spawnPosition, spawnRotation, dimensions) {
print('SCRIPT REF AT TRANSFORMER CREATE::' + TRANSFORMER_SCRIPT); print('SCRIPT REF AT TRANSFORMER CREATE::' + TRANSFORMER_SCRIPT);
var transformerProps = { var transformerProps = {
name: 'hifi-home-dressing-room-little-transformer', name: 'hifi-home-dressing-room-little-transformer',
@ -15,36 +15,37 @@
y: -5, y: -5,
z: 0 z: 0
}, },
visible:false, visible: false,
damping:0.8, damping: 0.8,
userData: JSON.stringify({ userData: JSON.stringify({
'grabbableKey': { 'grabbableKey': {
'grabbable': true 'grabbable': true
}, },
'hifiHomeTransformerKey': { 'hifiHomeTransformerKey': {
'basePosition': spawnPosition, 'basePosition': spawnPosition,
'baseRotation':Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z), 'baseRotation': Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
}, },
'hifiHomeKey': { 'hifiHomeKey': {
'reset': true 'reset': true
} }
}), }),
dimensions: dimensions,
script: TRANSFORMER_SCRIPT script: TRANSFORMER_SCRIPT
} }
var transformer = Entities.addEntity(transformerProps); var transformer = Entities.addEntity(transformerProps);
Script.setTimeout(function() { // Script.setTimeout(function() {
var actualProps = Entities.getEntityProperties(transformer); // var actualProps = Entities.getEntityProperties(transformer);
var quarterSize = Vec3.multiply(SHRINK_AMOUNT, actualProps.naturalDimensions); // var quarterSize = Vec3.multiply(SHRINK_AMOUNT, actualProps.naturalDimensions);
Entities.editEntity(transformer, { // Entities.editEntity(transformer, {
dimensions: quarterSize, // dimensions: quarterSize,
visible:true, // visible:true,
// velocity: { // // velocity: {
// x: 0, // // x: 0,
// y: -0.1, // // y: -0.1,
// z: 0 // // z: 0
// } // // }
}); // });
}, 1000) // }, 1000)
print('CREATED TRANSFORMER' + transformer); print('CREATED TRANSFORMER' + transformer);
print('at location: ' + JSON.stringify(transformerProps.position)) print('at location: ' + JSON.stringify(transformerProps.position))

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

@ -289,6 +289,32 @@
TRANSFORMER_URL_WILL TRANSFORMER_URL_WILL
]; ];
var dollDimensions = [{
//artemis
x: 0.8120,
y: 0.8824,
z: 0.1358
}, {
//albert
x: 0.9283,
y: 0.9178,
z: 0.2097
}, {
//being of light
x: 0.9419,
y: 0.8932,
z: 0.1383
}, {
//kate
x: 0.8387,
y: 0.9009,
z: 0.1731
}, {
//will
x: 0.8163,
y: 0.8382,
z: 0.1303
}];
var dollLateralSeparation = 1.0; var dollLateralSeparation = 1.0;
dolls.forEach(function(doll, index) { dolls.forEach(function(doll, index) {
@ -297,7 +323,8 @@
var left = Quat.getRight(rotationAsQuat); var left = Quat.getRight(rotationAsQuat);
var distanceToLeft = Vec3.multiply(separation, left); var distanceToLeft = Vec3.multiply(separation, left);
var dollPosition = Vec3.sum(firstDollPosition, distanceToLeft) var dollPosition = Vec3.sum(firstDollPosition, distanceToLeft)
var transformer = new TransformerDoll(doll, dollPosition, dollRotation); var transformer = new TransformerDoll(doll, dollPosition, dollRotation,
dollDimensions[index]);
}); });