From c3cd733c2f3fb811146b029b8ffd7ead594dc639 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 28 Oct 2014 12:40:17 -0700 Subject: [PATCH] tweaks to edits for lights --- examples/libraries/entityPropertyDialogBox.js | 15 +++++++++++++++ examples/newEditEntities.js | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/examples/libraries/entityPropertyDialogBox.js b/examples/libraries/entityPropertyDialogBox.js index a5d9dd2510..c23f8b0dcc 100644 --- a/examples/libraries/entityPropertyDialogBox.js +++ b/examples/libraries/entityPropertyDialogBox.js @@ -167,6 +167,16 @@ EntityPropertyDialogBox = (function () { index++; array.push({ label: "Specular Blue:", value: properties.specularColor.blue }); index++; + array.push({ label: "Constant Attenuation:", value: properties.constantAttenuation }); + index++; + array.push({ label: "Linear Attenuation:", value: properties.linearAttenuation }); + index++; + array.push({ label: "Quadratic Attenuation:", value: properties.quadraticAttenuation }); + index++; + array.push({ label: "Exponent:", value: properties.exponent }); + index++; + array.push({ label: "Cutoff (in degrees):", value: properties.cutoff }); + index++; } array.push({ button: "Cancel" }); index++; @@ -280,6 +290,11 @@ EntityPropertyDialogBox = (function () { properties.specularColor.red = array[index++].value; properties.specularColor.green = array[index++].value; properties.specularColor.blue = array[index++].value; + properties.constantAttenuation = array[index++].value; + properties.linearAttenuation = array[index++].value; + properties.quadraticAttenuation = array[index++].value; + properties.exponent = array[index++].value; + properties.cutoff = array[index++].value; } Entities.editEntity(editModelID, properties); diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js index edfe8c1b9d..5ecbe2459c 100644 --- a/examples/newEditEntities.js +++ b/examples/newEditEntities.js @@ -159,7 +159,7 @@ var toolBar = (function () { }); newLightButton = toolBar.addTool({ - imageURL: toolIconUrl + "add-fire.svg", + imageURL: toolIconUrl + "light.svg", subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, width: toolWidth, height: toolHeight,