From 0aab01d774f7a76972ca4c35a577afc635753a7d Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 12:37:28 -0700 Subject: [PATCH] remove switches to prep for next merge --- .../Home/pingPongGun/pingPongGun.js | 6 + .../Home/switches/dressingRoomDiscLights.js | 180 ------------------ .../Home/switches/livingRoomDiscLights.js | 180 ------------------ .../Home/switches/livingRoomFan.js | 136 ------------- 4 files changed, 6 insertions(+), 496 deletions(-) delete mode 100644 unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js delete mode 100644 unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js delete mode 100644 unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js index 9e0f5eb47f..c769f53768 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js @@ -33,6 +33,12 @@ z: 0 }; + var PING_PONG_GUN_GRAVITY = { + x: 0, + y: -5, + z: 0 + }; + var BALL_DIMENSIONS = { x: 0.04, y: 0.04, diff --git a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js deleted file mode 100644 index 4719b9ee5a..0000000000 --- a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js +++ /dev/null @@ -1,180 +0,0 @@ -(function() { - - var SEARCH_RADIUS = 100; - - var EMISSIVE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelitysign_white_emissive.png"; - - var DIFFUSE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelity_diffusebaked.png"; - - var _this; - var utilitiesScript = Script.resolvePath('../../../../libraries/utils.js'); - Script.include(utilitiesScript); - Switch = function() { - _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); - }; - - Switch.prototype = { - prefix: 'hifi-home-dressing-room-disc-light', - clickReleaseOnEntity: function(entityID, mouseEvent) { - if (!mouseEvent.isLeftButton) { - return; - } - this.toggleLights(); - }, - - startNearTrigger: function() { - this.toggleLights(); - }, - - modelEmitOn: function(discModel) { - Entities.editEntity(glowDisc, { - textures: 'emissive:' + EMISSIVE_TEXTURE_URL ',\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' - }) - }, - - modelEmitOff: function(discModel) { - Entities.editEntity(glowDisc, { - textures: 'emissive:"",\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' - }) - }, - - masterLightOn: function(masterLight) { - Entities.editEntity(masterLight, { - visible: true - }); - }, - - masterLightOff: function() { - Entities.editEntity(masterLight, { - visible: false - }); - }, - - glowLightOn: function(glowLight) { - Entities.editEntity(glowLight, { - visible: true - }); - }, - - glowLightOff: function(glowLight) { - Entities.editEntity(glowLight, { - visible: false - }); - }, - - findGlowLights: 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 + "light-glow") { - found.push(result); - } - }); - return found; - }, - - findMasterLights: 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 + "light-master") { - found.push(result); - } - }); - return found; - }, - - findEmitModels: 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 + "light-model") { - found.push(result); - } - }); - return found; - }, - - toggleLights: function() { - - this.switch = getEntityCustomData('home-switch', this.entityID, { - state: 'off' - }); - - var glowLights = this.findGlowLights(); - var masterLights = this.findMasterLights(); - var emitModels = this.findEmitModels(); - - if (this.switch.state === 'off') { - glowLights.forEach(function(glowLight) { - _this.glowLightOn(glowLight); - }); - masterLights.forEach(function(masterLight) { - _this.masterLightOn(masterLight); - }); - emitModels.forEach(function(emitModel) { - _this.modelEmitOn(emitModel); - }); - setEntityCustomData('home-switch', this.entityID, { - state: 'on' - }); - - } else { - glowLights.forEach(function(glowLight) { - _this.glowLightOff(glowLight); - }); - masterLights.forEach(function(masterLight) { - _this.masterLightOff(masterLight); - }); - emitModels.forEach(function(emitModel) { - _this.modelEmitOff(emitModel); - }); - setEntityCustomData('home-switch', this.entityID, { - state: 'off' - }); - } - - this.flipSwitch(); - Audio.playSound(this.switchSound, { - volume: 0.5, - position: this.position - }); - - }, - - flipSwitch: function() { - var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation; - var axis = { - x: 0, - y: 1, - z: 0 - }; - var dQ = Quat.angleAxis(180, axis); - rotation = Quat.multiply(rotation, dQ); - - Entities.editEntity(this.entityID, { - rotation: rotation - }); - }, - - preload: function(entityID) { - this.entityID = entityID; - setEntityCustomData('grabbableKey', this.entityID, { - wantsTrigger: true - }); - - var properties = Entities.getEntityProperties(this.entityID); - - - //The light switch is static, so just cache its position once - this.position = Entities.getEntityProperties(this.entityID, "position").position; - } - }; - - // entity scripts always need to return a newly constructed object of our type - return new Switch(); -}); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js deleted file mode 100644 index c342e9d16a..0000000000 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js +++ /dev/null @@ -1,180 +0,0 @@ -(function() { - - var SEARCH_RADIUS = 100; - - var EMISSIVE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelitysign_white_emissive.png"; - - var DIFFUSE_TEXTURE_URL = "http://hifi-content.s3.amazonaws.com/highfidelity_diffusebaked.png"; - - var _this; - var utilitiesScript = Script.resolvePath('../../../../libraries/utils.js'); - Script.include(utilitiesScript); - Switch = function() { - _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); - }; - - Switch.prototype = { - prefix: 'hifi-home-living-room-disc-light', - clickReleaseOnEntity: function(entityID, mouseEvent) { - if (!mouseEvent.isLeftButton) { - return; - } - this.toggleLights(); - }, - - startNearTrigger: function() { - this.toggleLights(); - }, - - modelEmitOn: function(discModel) { - Entities.editEntity(glowDisc, { - textures: 'emissive:' + EMISSIVE_TEXTURE_URL ',\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' - }) - }, - - modelEmitOff: function(discModel) { - Entities.editEntity(glowDisc, { - textures: 'emissive:"",\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' - }) - }, - - masterLightOn: function(masterLight) { - Entities.editEntity(masterLight, { - visible: true - }); - }, - - masterLightOff: function() { - Entities.editEntity(masterLight, { - visible: false - }); - }, - - glowLightOn: function(glowLight) { - Entities.editEntity(glowLight, { - visible: true - }); - }, - - glowLightOff: function(glowLight) { - Entities.editEntity(glowLight, { - visible: false - }); - }, - - findGlowLights: 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 + "glow") { - found.push(result); - } - }); - return found; - }, - - findMasterLights: 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 + "master") { - found.push(result); - } - }); - return found; - }, - - findEmitModels: 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 + "model") { - found.push(result); - } - }); - return found; - }, - - toggleLights: function() { - - this.switch = getEntityCustomData('home-switch', this.entityID, { - state: 'off' - }); - - var glowLights = this.findGlowLights(); - var masterLights = this.findMasterLights(); - var emitModels = this.findEmitModels(); - - if (this.switch.state === 'off') { - glowLights.forEach(function(glowLight) { - _this.glowLightOn(glowLight); - }); - masterLights.forEach(function(masterLight) { - _this.masterLightOn(masterLight); - }); - emitModels.forEach(function(emitModel) { - _this.modelEmitOn(emitModel); - }); - setEntityCustomData('home-switch', this.entityID, { - state: 'on' - }); - - } else { - glowLights.forEach(function(glowLight) { - _this.glowLightOff(glowLight); - }); - masterLights.forEach(function(masterLight) { - _this.masterLightOff(masterLight); - }); - emitModels.forEach(function(emitModel) { - _this.modelEmitOff(emitModel); - }); - setEntityCustomData('home-switch', this.entityID, { - state: 'off' - }); - } - - this.flipSwitch(); - Audio.playSound(this.switchSound, { - volume: 0.5, - position: this.position - }); - - }, - - flipSwitch: function() { - var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation; - var axis = { - x: 0, - y: 1, - z: 0 - }; - var dQ = Quat.angleAxis(180, axis); - rotation = Quat.multiply(rotation, dQ); - - Entities.editEntity(this.entityID, { - rotation: rotation - }); - }, - - preload: function(entityID) { - this.entityID = entityID; - setEntityCustomData('grabbableKey', this.entityID, { - wantsTrigger: true - }); - - var properties = Entities.getEntityProperties(this.entityID); - - - //The light switch is static, so just cache its position once - this.position = Entities.getEntityProperties(this.entityID, "position").position; - } - }; - - // entity scripts always need to return a newly constructed object of our type - return new Switch(); -}); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js deleted file mode 100644 index 6498807e47..0000000000 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomFan.js +++ /dev/null @@ -1,136 +0,0 @@ -(function() { - var SEARCH_RADIUS = 100; - var _this; - var utilitiesScript = Script.resolvePath('../../../../libraries/utils.js'); - Script.include(utilitiesScript); - Switch = function() { - _this = this; - this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav"); - }; - - Switch.prototype = { - prefix: 'hifi-home-living-room-fan', - clickReleaseOnEntity: function(entityID, mouseEvent) { - if (!mouseEvent.isLeftButton) { - return; - } - this.toggle(); - }, - - startNearTrigger: function() { - this.toggle(); - }, - - fanRotationOn: function() { - Entities.editEntity(this.fan, { - damping: 0, - angularVelocity: { - x: 0, - y: 0.25, - z: 0 - } - }) - }, - - fanRotationOff: function() { - Entities.editEntity(this.fan, { - damping: 1.0, - // angularVelocity:{ - // x:0, - // y:0, - // z:0 - // } - }) - }, - - fanSoundOn: function() { - - }, - - fanSoundOff: function() { - - }, - - 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) { - found.push(result); - } - }); - return found; - }, - - toggle: function() { - this.fan = this.findFan(); - this.switch = getEntityCustomData('home-switch', this.entityID, { - state: 'off' - }); - - if (this.switch.state === 'off') { - this.fanRotationOn(); - this.fanSoundOn(); - this.ventSoundOn(); - setEntityCustomData('home-switch', this.entityID, { - state: 'on' - }); - - } else { - this.fanRotationOff(); - this.fanSoundOff(); - this.ventSoundOff(); - - setEntityCustomData('home-switch', this.entityID, { - state: 'off' - }); - } - - this.flipSwitch(); - Audio.playSound(this.switchSound, { - volume: 0.5, - position: this.position - }); - - }, - - flipSwitch: function() { - var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation; - var axis = { - x: 0, - y: 1, - z: 0 - }; - var dQ = Quat.angleAxis(180, axis); - rotation = Quat.multiply(rotation, dQ); - - Entities.editEntity(this.entityID, { - rotation: rotation - }); - }, - - preload: function(entityID) { - this.entityID = entityID; - setEntityCustomData('grabbableKey', this.entityID, { - wantsTrigger: true - }); - - var properties = Entities.getEntityProperties(this.entityID); - - //The light switch is static, so just cache its position once - this.position = Entities.getEntityProperties(this.entityID, "position").position; - } - }; - - // entity scripts always need to return a newly constructed object of our type - return new Switch(); -}); \ No newline at end of file