From 3dace325b3c8e02536f7e7e4469f4eea1022854a Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 18 Mar 2016 15:57:13 -0700 Subject: [PATCH] dressing room lights toggling on and off --- .../Home/switches/dressingRoomDiscLights.js | 12 +++++------- .../Home/switches/livingRoomDiscLights.js | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js index f207241dd4..c269c27151 100644 --- a/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js +++ b/unpublishedScripts/DomainContent/Home/switches/dressingRoomDiscLights.js @@ -28,17 +28,15 @@ }, modelEmitOn: function(glowDisc) { - print("EBL TURN ON EMIT TEXTURE"); - Entities.editEntity(glowDisc, { - textures: 'emissive:' + EMISSIVE_TEXTURE_URL + ',\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' + Entities.editEntity(glowDisc, { + textures: 'Metal-brushed-light.jpg:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/Metal-brushed-light.jpg",\nTex.CeilingLight-Emit:"http://hifi-content.s3.amazonaws.com/alan/dev/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/CielingLight-On-Diffuse.jpg",\nTexCeilingLight.Diffuse:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/CielingLight-Base.jpg"' }); }, modelEmitOff: function(glowDisc) { - print("EBL TURN OFF EMIT TEXTURE"); - Entities.editEntity(glowDisc, { - textures: 'emissive:"",\ndiffuse:"' + DIFFUSE_TEXTURE_URL + '"' - }) + Entities.editEntity(glowDisc, { + textures: 'Metal-brushed-light.jpg:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/Metal-brushed-light.jpg",\nTex.CeilingLight-Emit:"",\nTexCeilingLight.Diffuse:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/CielingLight-Base.jpg"' + }); }, masterLightOn: function(masterLight) { diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js index ffaff780e2..167d4672df 100644 --- a/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js +++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomDiscLights.js @@ -28,14 +28,12 @@ }, modelEmitOn: function(glowDisc) { - print("EBL TURN ON EMIT TEXTURE"); Entities.editEntity(glowDisc, { textures: 'Metal-brushed-light.jpg:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",\nTex.CeilingLight.Emit:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-On-Diffuse.jpg",\nTexCeilingLight.Diffuse:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"' }) }, modelEmitOff: function(glowDisc) { - print("EBL TURN OFF EMIT TEXTURE"); Entities.editEntity(glowDisc, { textures: 'Metal-brushed-light.jpg:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",\nTex.CeilingLight.Emit:"",\nTexCeilingLight.Diffuse:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"' })