mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 10:37:35 +02:00
fix property bugs / style issues
This commit is contained in:
parent
615ffebb2c
commit
08d9eda7d7
3 changed files with 46 additions and 35 deletions
|
@ -309,34 +309,6 @@ input[type=number].hover-down::-webkit-inner-spin-button:after {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.draggable-number {
|
|
||||||
position: relative;
|
|
||||||
right: 10px;
|
|
||||||
}
|
|
||||||
.draggable-number span {
|
|
||||||
position: relative;
|
|
||||||
top: -2px;
|
|
||||||
display: inline-block;
|
|
||||||
font-family: hifi-glyphs;
|
|
||||||
font-size: 20px;
|
|
||||||
z-index: 2;
|
|
||||||
}
|
|
||||||
.draggable-number.left-arrow {
|
|
||||||
left: 18px;
|
|
||||||
transform: rotate(180deg);
|
|
||||||
}
|
|
||||||
.draggable-number.right-arrow {
|
|
||||||
right: 18px;
|
|
||||||
}
|
|
||||||
.draggable-number input {
|
|
||||||
}
|
|
||||||
.draggable-number input::selection {
|
|
||||||
}
|
|
||||||
.draggable-number input::-webkit-inner-spin-button {
|
|
||||||
-webkit-appearance: none;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type=range] {
|
input[type=range] {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
background: #2e2e2e;
|
background: #2e2e2e;
|
||||||
|
@ -903,6 +875,33 @@ div.refresh input[type="button"] {
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.draggable-number {
|
||||||
|
position: relative;
|
||||||
|
right: 10px;
|
||||||
|
}
|
||||||
|
.draggable-number span {
|
||||||
|
position: relative;
|
||||||
|
top: -2px;
|
||||||
|
display: inline-block;
|
||||||
|
font-family: hifi-glyphs;
|
||||||
|
font-size: 20px;
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
.draggable-number.left-arrow {
|
||||||
|
left: 17px;
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
.draggable-number.right-arrow {
|
||||||
|
right: 17px;
|
||||||
|
}
|
||||||
|
.draggable-number.fstuple span {
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
.draggable-number input::-webkit-inner-spin-button {
|
||||||
|
-webkit-appearance: none;
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.row .property {
|
.row .property {
|
||||||
width: auto;
|
width: auto;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
|
@ -15,6 +15,7 @@ function DraggableNumber(min, max, step) {
|
||||||
this.max = max;
|
this.max = max;
|
||||||
this.step = step !== undefined ? step : 1;
|
this.step = step !== undefined ? step : 1;
|
||||||
this.startEvent = null;
|
this.startEvent = null;
|
||||||
|
this.inputChangeFunction = null;
|
||||||
this.initialize();
|
this.initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +42,9 @@ DraggableNumber.prototype = {
|
||||||
newValue = this.max;
|
newValue = this.max;
|
||||||
}
|
}
|
||||||
this.elInput.value = newValue;
|
this.elInput.value = newValue;
|
||||||
|
if (this.inputChangeFunction) {
|
||||||
this.inputChangeFunction();
|
this.inputChangeFunction();
|
||||||
|
}
|
||||||
this.startEvent = event;
|
this.startEvent = event;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -53,6 +56,9 @@ DraggableNumber.prototype = {
|
||||||
},
|
},
|
||||||
|
|
||||||
setInputChangeFunction: function(inputChangeFunction) {
|
setInputChangeFunction: function(inputChangeFunction) {
|
||||||
|
if (this.inputChangeFunction) {
|
||||||
|
this.elInput.removeEventListener('change', this.inputChangeFunction);
|
||||||
|
}
|
||||||
this.inputChangeFunction = inputChangeFunction.bind(this.elInput);
|
this.inputChangeFunction = inputChangeFunction.bind(this.elInput);
|
||||||
this.elInput.addEventListener('change', this.inputChangeFunction);
|
this.elInput.addEventListener('change', this.inputChangeFunction);
|
||||||
},
|
},
|
||||||
|
|
|
@ -254,7 +254,7 @@ const GROUPS = [
|
||||||
buttons: [ { id: "copy", label: "Copy from Skybox",
|
buttons: [ { id: "copy", label: "Copy from Skybox",
|
||||||
className: "black", onClick: copySkyboxURLToAmbientURL } ],
|
className: "black", onClick: copySkyboxURLToAmbientURL } ],
|
||||||
propertyID: "copyURLToAmbient",
|
propertyID: "copyURLToAmbient",
|
||||||
showPropertyRule: { "skyboxMode": "enabled" },
|
showPropertyRule: { "ambientLightMode": "enabled" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Haze",
|
label: "Haze",
|
||||||
|
@ -1772,10 +1772,15 @@ function createNumberProperty(property, elProperty) {
|
||||||
let elementID = property.elementID;
|
let elementID = property.elementID;
|
||||||
let propertyData = property.data;
|
let propertyData = property.data;
|
||||||
|
|
||||||
elProperty.className = "property draggable-number";
|
elProperty.className = "draggable-number";
|
||||||
|
|
||||||
let elDraggableNumber = new DraggableNumber(propertyData.min, propertyData.max, propertyData.step);
|
let elDraggableNumber = new DraggableNumber(propertyData.min, propertyData.max, propertyData.step);
|
||||||
|
|
||||||
|
let defaultValue = propertyData.defaultValue;
|
||||||
|
if (defaultValue !== undefined) {
|
||||||
|
elDraggableNumber.elInput.value = defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
let inputChangeFunction = createEmitNumberPropertyUpdateFunction(propertyName, propertyData.multiplier, propertyData.decimals, property.isParticleProperty);
|
let inputChangeFunction = createEmitNumberPropertyUpdateFunction(propertyName, propertyData.multiplier, propertyData.decimals, property.isParticleProperty);
|
||||||
elDraggableNumber.setInputChangeFunction(inputChangeFunction);
|
elDraggableNumber.setInputChangeFunction(inputChangeFunction);
|
||||||
|
|
||||||
|
@ -1839,7 +1844,7 @@ function createVec2Property(property, elProperty) {
|
||||||
let elNumberY = createTupleNumberInput(elProperty, elementID, propertyData.subLabels[VECTOR_ELEMENTS.Y_INPUT],
|
let elNumberY = createTupleNumberInput(elProperty, elementID, propertyData.subLabels[VECTOR_ELEMENTS.Y_INPUT],
|
||||||
propertyData.min, propertyData.max, propertyData.step);
|
propertyData.min, propertyData.max, propertyData.step);
|
||||||
|
|
||||||
let inputChangeFunction = createEmitVec3PropertyUpdateFunction(propertyName, elNumberX.elInput, elNumberY.elInput,
|
let inputChangeFunction = createEmitVec2PropertyUpdateFunction(propertyName, elNumberX.elInput, elNumberY.elInput,
|
||||||
propertyData.multiplier, property.isParticleProperty);
|
propertyData.multiplier, property.isParticleProperty);
|
||||||
elNumberX.setInputChangeFunction(inputChangeFunction);
|
elNumberX.setInputChangeFunction(inputChangeFunction);
|
||||||
elNumberY.setInputChangeFunction(inputChangeFunction);
|
elNumberY.setInputChangeFunction(inputChangeFunction);
|
||||||
|
@ -2055,6 +2060,7 @@ function createTupleNumberInput(elTuple, propertyElementID, subLabel, min, max,
|
||||||
|
|
||||||
let elDraggableNumber = new DraggableNumber(min, max, step);
|
let elDraggableNumber = new DraggableNumber(min, max, step);
|
||||||
elDraggableNumber.elInput.setAttribute("id", elementID);
|
elDraggableNumber.elInput.setAttribute("id", elementID);
|
||||||
|
elDraggableNumber.elDiv.className += " fstuple";
|
||||||
elDraggableNumber.elDiv.insertBefore(elLabel, elDraggableNumber.elLeftArrow);
|
elDraggableNumber.elDiv.insertBefore(elLabel, elDraggableNumber.elLeftArrow);
|
||||||
elTuple.appendChild(elDraggableNumber.elDiv);
|
elTuple.appendChild(elDraggableNumber.elDiv);
|
||||||
|
|
||||||
|
@ -2766,10 +2772,10 @@ function loaded() {
|
||||||
if (propertyData.indentedLabel || propertyData.showPropertyRule !== undefined) {
|
if (propertyData.indentedLabel || propertyData.showPropertyRule !== undefined) {
|
||||||
let elSpan = document.createElement('span');
|
let elSpan = document.createElement('span');
|
||||||
elSpan.className = 'indented';
|
elSpan.className = 'indented';
|
||||||
elSpan.innerText = propertyData.label;
|
elSpan.innerText = propertyData.label !== undefined ? propertyData.label : "";
|
||||||
elLabel.appendChild(elSpan);
|
elLabel.appendChild(elSpan);
|
||||||
} else {
|
} else {
|
||||||
elLabel.innerText = propertyData.label;
|
elLabel.innerText = propertyData.label !== undefined ? propertyData.label : "";
|
||||||
}
|
}
|
||||||
elContainer.appendChild(elLabel);
|
elContainer.appendChild(elLabel);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue