From f90b128ac3b7e44091ba2450bf38e14206557c9e Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 14 Jan 2015 15:48:05 -0800 Subject: [PATCH] use density instead of mass in scripts/UI --- examples/html/entityProperties.html | 10 +++++----- examples/libraries/ToolTip.js | 2 +- examples/libraries/entityPropertyDialogBox.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index c23a3cd5ab..6b576e557d 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -114,7 +114,7 @@ var elGravityY = document.getElementById("property-grav-y"); var elGravityZ = document.getElementById("property-grav-z"); - var elMass = document.getElementById("property-mass"); + var elDensity = document.getElementById("property-density"); var elIgnoreForCollisions = document.getElementById("property-ignore-for-collisions"); var elCollisionsWillMove = document.getElementById("property-collisions-will-move"); var elLifetime = document.getElementById("property-lifetime"); @@ -219,7 +219,7 @@ elGravityY.value = properties.gravity.y.toFixed(2); elGravityZ.value = properties.gravity.z.toFixed(2); - elMass.value = properties.mass.toFixed(2); + elDensity.value = properties.density.toFixed(2); elIgnoreForCollisions.checked = properties.ignoreForCollisions; elCollisionsWillMove.checked = properties.collisionsWillMove; elLifetime.value = properties.lifetime; @@ -356,7 +356,7 @@ elGravityY.addEventListener('change', gravityChangeFunction); elGravityZ.addEventListener('change', gravityChangeFunction); - elMass.addEventListener('change', createEmitNumberPropertyUpdateFunction('mass')); + elDensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('density')); elIgnoreForCollisions.addEventListener('change', createEmitCheckedPropertyUpdateFunction('ignoreForCollisions')); elCollisionsWillMove.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionsWillMove')); elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime')); @@ -616,9 +616,9 @@ - Mass + Density - + diff --git a/examples/libraries/ToolTip.js b/examples/libraries/ToolTip.js index 590eba36d0..f12525af57 100644 --- a/examples/libraries/ToolTip.js +++ b/examples/libraries/ToolTip.js @@ -68,7 +68,7 @@ function Tooltip() { text += "Lifetime: " + properties.lifetime + "\n" } text += "Age: " + properties.ageAsText + "\n" - text += "Mass: " + properties.mass + "\n" + text += "Density: " + properties.density + "\n" text += "Script: " + properties.script + "\n" diff --git a/examples/libraries/entityPropertyDialogBox.js b/examples/libraries/entityPropertyDialogBox.js index a686ebb0f2..0cb76276d8 100644 --- a/examples/libraries/entityPropertyDialogBox.js +++ b/examples/libraries/entityPropertyDialogBox.js @@ -164,7 +164,7 @@ EntityPropertyDialogBox = (function () { array.push({ label: "Collisions:", type: "header" }); index++; - array.push({ label: "Mass:", value: properties.mass.toFixed(decimals) }); + array.push({ label: "Density:", value: properties.density.toFixed(decimals) }); index++; array.push({ label: "Ignore for Collisions:", type: "checkbox", value: properties.ignoreForCollisions }); index++; @@ -353,7 +353,7 @@ EntityPropertyDialogBox = (function () { properties.gravity.z = array[index++].value; index++; // skip header - properties.mass = array[index++].value; + properties.density = array[index++].value; properties.ignoreForCollisions = array[index++].value; properties.collisionsWillMove = array[index++].value;