mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 19:59:28 +02:00
21324: Implementation of last feedback
- If properties are expanded, the animation wrapper should now use the values - Decimal Values from filled in data now automatically get reduced the 1000th. The fields however will allow one to set smaller values and show it, until the entity is selected again - If particle is locked, keep fields locked.
This commit is contained in:
parent
bdcf9a0070
commit
e76dfe4182
1 changed files with 20 additions and 12 deletions
|
@ -45,6 +45,10 @@ and If there is any changes to either the Entities or properties of
|
||||||
|
|
||||||
var RADIAN = Math.PI / 180;
|
var RADIAN = Math.PI / 180;
|
||||||
|
|
||||||
|
var roundFloat = function (input) {
|
||||||
|
return Math.floor(parseFloat(input) * 1000)/1000;
|
||||||
|
};
|
||||||
|
|
||||||
function HifiEntityUI(parent) {
|
function HifiEntityUI(parent) {
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
|
|
||||||
|
@ -140,15 +144,19 @@ HifiEntityUI.prototype = {
|
||||||
},
|
},
|
||||||
fillFields: function(currentProperties) {
|
fillFields: function(currentProperties) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
var fields = document.getElementsByTagName("input");
|
var fields = document.getElementsByTagName("input");
|
||||||
for (var i = 0; i < fields.length; i++) {
|
|
||||||
fields[i].removeAttribute("disabled");
|
if (!currentProperties.locked) {
|
||||||
|
for (var i = 0; i < fields.length; i++) {
|
||||||
|
fields[i].removeAttribute("disabled");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (self.onSelect) {
|
if (self.onSelect) {
|
||||||
self.onSelect();
|
self.onSelect();
|
||||||
}
|
}
|
||||||
var keys = Object.keys(currentProperties);
|
var keys = Object.keys(currentProperties);
|
||||||
|
|
||||||
|
|
||||||
for (var e in keys) {
|
for (var e in keys) {
|
||||||
var value = keys[e];
|
var value = keys[e];
|
||||||
|
|
||||||
|
@ -178,9 +186,9 @@ HifiEntityUI.prototype = {
|
||||||
var red = document.getElementById(value + "-red");
|
var red = document.getElementById(value + "-red");
|
||||||
var blue = document.getElementById(value + "-blue");
|
var blue = document.getElementById(value + "-blue");
|
||||||
var green = document.getElementById(value + "-green");
|
var green = document.getElementById(value + "-green");
|
||||||
red.value = property.red;
|
red.value = roundFloat(property.red);
|
||||||
blue.value = property.blue;
|
blue.value = roundFloat(property.blue);
|
||||||
green.value = property.green;
|
green.value = roundFloat(property.green);
|
||||||
|
|
||||||
red.oninput({
|
red.oninput({
|
||||||
target: red
|
target: red
|
||||||
|
@ -190,17 +198,17 @@ HifiEntityUI.prototype = {
|
||||||
var y = document.getElementById(value + "-y");
|
var y = document.getElementById(value + "-y");
|
||||||
var z = document.getElementById(value + "-z");
|
var z = document.getElementById(value + "-z");
|
||||||
// crashes here.
|
// crashes here.
|
||||||
x.value = property.x;
|
x.value = roundFloat(property.x);
|
||||||
y.value = property.y;
|
y.value = roundFloat(property.y);
|
||||||
z.value = property.z;
|
z.value = roundFloat(property.z);
|
||||||
} else if (field.className.indexOf("pyr") !== -1) {
|
} else if (field.className.indexOf("pyr") !== -1) {
|
||||||
var pitch = document.getElementById(value + "-Pitch");
|
var pitch = document.getElementById(value + "-Pitch");
|
||||||
var yaw = document.getElementById(value + "-Yaw");
|
var yaw = document.getElementById(value + "-Yaw");
|
||||||
var roll = document.getElementById(value + "-Roll");
|
var roll = document.getElementById(value + "-Roll");
|
||||||
// crashes here.
|
// crashes here.
|
||||||
pitch.value = property.x;
|
pitch.value = roundFloat(property.x);
|
||||||
yaw.value = property.y;
|
yaw.value = roundFloat(property.y);
|
||||||
roll.value = property.z;
|
roll.value = roundFloat(property.z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue