Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 14:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fans, avatars, desk lamp, reset script

Browse source
This commit is contained in:
James B. Pollack 2016-04-08 17:22:35 -07:00
parent 4961b38aef
commit ce670fbd21
4 changed files with 59 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,34 +5,30 @@
(function() {
//full size dimensions
var ARTEMIS_DIMENSIONS = {
x: 1.6241,
y: 1.7649,
z: 0.2715
};
var ALBERT_DIMENSIONS = {
x: 1.8567,
y: 1.8356,
z: 0.4193
var STYLIZED_FEMALE_DIMENSIONS = {
x: 1.6323,
y: 1.7705,
z: 0.2851
};
var BEING_OF_LIGHT_DIMENSIONS = {
x: 1.8838,
y: 1.7865,
z: 0.2766
z: 0.2955
}
var ROBOT_DIMENSIONS = {
//robot
x: 1.4439,
y: 0.6224,
z: 0.4998
}
var KATE_DIMENSIONS = {
x: 1.6775,
y: 1.8018,
z: 0.3461
};
var WILL_DIMENSIONS = {
x: 1.6326,
y: 1.6764,
z: 0.2606
};
// var TRANSFORMATION_SOUND_URL = '';
var _this;
function Transformer() {
@ -114,25 +110,19 @@
var rotatorProps = Entities.getEntityProperties(_this.rotatorBlock);
var dimensions;
if (smallProps.modelURL.indexOf('Will') > -1) {
if (smallProps.modelURL.indexOf('will') > -1) {
print('TRANSFORMER IS WILL')
dimensions = WILL_DIMENSIONS;
} else if (smallProps.modelURL.indexOf('albert') > -1) {
print('TRANSFORMER IS ALBERT')
dimensions = ALBERT_DIMENSIONS;
} else if (smallProps.modelURL.indexOf('kate') > -1) {
print('TRANSFORMER IS KATE')
dimensions = KATE_DIMENSIONS;
} else if (smallProps.modelURL.indexOf('BoL') > -1) {
} else if (smallProps.modelURL.indexOf('being_of_light') > -1) {
print('TRANSFORMER IS BEING OF LIGHT')
dimensions = BEING_OF_LIGHT_DIMENSIONS;
} else if (smallProps.modelURL.indexOf('FemAvi') > -1) {
print('TRANSFORMER IS ARTMIS')
dimensions = ARTEMIS_DIMENSIONS;
} else if (smallProps.modelURL.indexOf('stylized_female') > -1) {
print('TRANSFORMER IS ARTEMIS')
dimensions = STYLIZED_FEMALE_DIMENSIONS;
} else if (smallProps.modelURL.indexOf('simple_robot') > -1) {
print('TRANSFORMER IS A ROBOT')
dimensions = ROBOT_DIMENSIONS;
} else {
print('TRANSFORMER IS SOME OTHER');
dimensions = smallProps.naturalDimensions;

18
unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json
View file

@ -1,26 +1,26 @@
{
"Entities": [{
"color": {
"blue": 68,
"green": 252,
"red": 243
"blue": 83,
"green": 199,
"red": 252
},
"created": "2016-03-24T22:21:38Z",
"cutoff": 90,
"dimensions": {
"x": 4,
"y": 4,
"z": 4
"x": 11,
"y": 11,
"z": 11
},
"falloffRadius": 0.30000001192092896,
"falloffRadius": 0.2,
"id": "{47e2c415-854c-4b6a-b71e-06c760675afd}",
"intensity": 20,
"intensity": 33,
"isSpotlight": 0,
"name": "home_light_livingRoomLight",
"parentID": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}",
"position": {
"x": 0,
"y": -0.14917388558387756,
"y": -0.075,
"z": 0
},
"queryAACube": {

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

@ -51,12 +51,16 @@
// Script.include(musicBoxPath);
Script.include(transformerPath);
var TRANSFORMER_URL_ARTEMIS = 'atp:/dressingRoom/0314HiFiFemAviHeightChange.fbx';
var TRANSFORMER_URL_ALBERT = 'atp:/dressingRoom/albert.fbx';
var TRANSFORMER_URL_BEING_OF_LIGHT = 'atp:/dressingRoom/0318HiFiBoL.fbx';
var TRANSFORMER_URL_KATE = 'atp:/dressingRoom/kate.fbx';
var TRANSFORMER_URL_WILL = 'atp:/dressingRoom/Will.fbx';
var TRANSFORMER_URL_ROBOT = 'atp:/dressingRoom/simple_robot.fbx';
var TRANSFORMER_URL_BEING_OF_LIGHT = 'atp:/dressingRoom/being_of_light.fbx';
var TRANSFORMER_URL_WILL = 'atp:/dressingRoom/will_T.fbx';
var TRANSFORMER_URL_STYLIZED_FEMALE = 'atp:/dressingRoom/stylized_female.fbx';
var TRANSFORMER_URL_REALISTIC_MALE = '';
var TRANSFORMER_URL_REALISTIC_FEMALE = '';
Reset.prototype = {
tidying: false,
@ -387,41 +391,35 @@
var rotationAsQuat = Quat.fromPitchYawRollDegrees(dollRotation.x, dollRotation.y, dollRotation.z);
var dolls = [
TRANSFORMER_URL_ARTEMIS,
TRANSFORMER_URL_ALBERT,
TRANSFORMER_URL_STYLIZED_FEMALE,
TRANSFORMER_URL_ROBOT,
TRANSFORMER_URL_BEING_OF_LIGHT,
TRANSFORMER_URL_KATE,
TRANSFORMER_URL_WILL
];
var dollDimensions = [{
//artemis
x: 0.8120,
y: 0.8824,
z: 0.1358
//stylized female artemis
x: 1.6323,
y: 1.7705,
z: 0.2851
}, {
//albert
x: 0.9283,
y: 0.9178,
z: 0.2097
//robot
x: 1.4439,
y: 0.6224,
z: 0.4998
}, {
//being of light
x: 0.9419,
y: 0.8932,
z: 0.1383
}, {
//kate
x: 0.8387,
y: 0.9009,
z: 0.1731
x: 1.8838,
y: 1.7865,
z: 0.2955
}, {
//will
x: 0.8163,
y: 0.8382,
z: 0.1303
x: 1.6326,
y: 1.6764,
z: 0.2606
}];
var TRANSFORMER_SCALE = 0.5;
var TRANSFORMER_SCALE = 0.25;
dollDimensions.forEach(function(vector, index) {
var scaled = Vec3.multiply(vector, TRANSFORMER_SCALE);

16
unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js
View file

@ -7,11 +7,11 @@
_this = this;
this.switchSound = SoundCache.getSound("atp:/switches/lamp_switch_2.wav");
_this.FAN_VOLUME = 0.1;
_this.FAN_SOUND_ENTITY_NAME = "home_sfx _ceiling_fan";
_this.FAN_SOUND_ENTITY_NAME = "home_sfx_ceiling_fan";
};
Switch.prototype = {
prefix: 'hifi-home-living-room-',
prefix: 'home_living_room',
clickReleaseOnEntity: function(entityID, mouseEvent) {
if (!mouseEvent.isLeftButton) {
return;
@ -69,20 +69,12 @@
setEntityCustomData("soundKey", _this.fanSoundEntity, soundUserData);
},
ventSoundOn: function() {
},
ventSoundOff: function() {
},
findFan: function() {
var found = [];
var results = Entities.findEntities(this.position, SEARCH_RADIUS);
results.forEach(function(result) {
var properties = Entities.getEntityProperties(result);
if (properties.name === _this.prefix + "ceiling-fan") {
if (properties.name === _this.prefix + "_model_ceiling_fan_blades") {
found.push(result);
}
});
@ -112,7 +104,6 @@
if (this._switch.state === 'off') {
this.fanRotationOn();
this.fanSoundOn();
this.ventSoundOn();
setEntityCustomData('home-switch', this.entityID, {
state: 'on'
});
@ -120,7 +111,6 @@
} else {
this.fanRotationOff();
this.fanSoundOff();
this.ventSoundOff();
setEntityCustomData('home-switch', this.entityID, {
state: 'off'