Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 10:07:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use density instead of mass in scripts/UI

Browse source
This commit is contained in:
Andrew Meadows 2015-01-14 15:48:05 -08:00
parent ccc50dd94f
commit f90b128ac3
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/html/entityProperties.html
View file

@ -114,7 +114,7 @@
var elGravityY = document.getElementById("property-grav-y"); var elGravityY = document.getElementById("property-grav-y");
var elGravityZ = document.getElementById("property-grav-z"); 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 elIgnoreForCollisions = document.getElementById("property-ignore-for-collisions");
var elCollisionsWillMove = document.getElementById("property-collisions-will-move"); var elCollisionsWillMove = document.getElementById("property-collisions-will-move");
var elLifetime = document.getElementById("property-lifetime"); var elLifetime = document.getElementById("property-lifetime");
@ -219,7 +219,7 @@
elGravityY.value = properties.gravity.y.toFixed(2); elGravityY.value = properties.gravity.y.toFixed(2);
elGravityZ.value = properties.gravity.z.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; elIgnoreForCollisions.checked = properties.ignoreForCollisions;
elCollisionsWillMove.checked = properties.collisionsWillMove; elCollisionsWillMove.checked = properties.collisionsWillMove;
elLifetime.value = properties.lifetime; elLifetime.value = properties.lifetime;
@ -356,7 +356,7 @@
elGravityY.addEventListener('change', gravityChangeFunction); elGravityY.addEventListener('change', gravityChangeFunction);
elGravityZ.addEventListener('change', gravityChangeFunction); elGravityZ.addEventListener('change', gravityChangeFunction);
elMass.addEventListener('change', createEmitNumberPropertyUpdateFunction('mass')); elDensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('density'));
elIgnoreForCollisions.addEventListener('change', createEmitCheckedPropertyUpdateFunction('ignoreForCollisions')); elIgnoreForCollisions.addEventListener('change', createEmitCheckedPropertyUpdateFunction('ignoreForCollisions'));
elCollisionsWillMove.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionsWillMove')); elCollisionsWillMove.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionsWillMove'));
elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime')); elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));
@ -616,9 +616,9 @@
</tr> </tr>
<tr> <tr>
<td class="label">Mass</td> <td class="label">Density</td>
<td> <td>
<input type='number' id="property-mass"></input> <input type='number' id="property-density"></input>
</td> </td>
</tr> </tr>

2
examples/libraries/ToolTip.js
View file

@ -68,7 +68,7 @@ function Tooltip() {
text += "Lifetime: " + properties.lifetime + "\n" text += "Lifetime: " + properties.lifetime + "\n"
} }
text += "Age: " + properties.ageAsText + "\n" text += "Age: " + properties.ageAsText + "\n"
text += "Mass: " + properties.mass + "\n" text += "Density: " + properties.density + "\n"
text += "Script: " + properties.script + "\n" text += "Script: " + properties.script + "\n"

4
examples/libraries/entityPropertyDialogBox.js
View file

@ -164,7 +164,7 @@ EntityPropertyDialogBox = (function () {
array.push({ label: "Collisions:", type: "header" }); array.push({ label: "Collisions:", type: "header" });
index++; index++;
array.push({ label: "Mass:", value: properties.mass.toFixed(decimals) }); array.push({ label: "Density:", value: properties.density.toFixed(decimals) });
index++; index++;
array.push({ label: "Ignore for Collisions:", type: "checkbox", value: properties.ignoreForCollisions }); array.push({ label: "Ignore for Collisions:", type: "checkbox", value: properties.ignoreForCollisions });
index++; index++;
@ -353,7 +353,7 @@ EntityPropertyDialogBox = (function () {
properties.gravity.z = array[index++].value; properties.gravity.z = array[index++].value;
index++; // skip header index++; // skip header
properties.mass = array[index++].value; properties.density = array[index++].value;
properties.ignoreForCollisions = array[index++].value; properties.ignoreForCollisions = array[index++].value;
properties.collisionsWillMove = array[index++].value; properties.collisionsWillMove = array[index++].value;