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

Improve paramater names in model dialog window

Browse source
This commit is contained in:
Ryan Huffman 2018-10-20 11:26:12 -07:00
parent f1258e4445
commit 9d13902cd3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/hifi/tablet/NewModelDialog.qml
View file

@ -222,9 +222,9 @@ Rectangle {
newModelDialog.sendToScript({ newModelDialog.sendToScript({
method: "newModelDialogAdd", method: "newModelDialogAdd",
params: { params: {
textInput: modelURL.text, url: modelURL.text,
checkBox: dynamic.checked, dynamic: dynamic.checked,
comboBox: collisionType.currentIndex, collisionShapeIndex: collisionType.currentIndex,
grabbable: grabbable.checked grabbable: grabbable.checked
} }
}); });

6
scripts/system/edit.js
View file

@ -442,9 +442,9 @@ var toolBar = (function () {
function handleNewModelDialogResult(result) { function handleNewModelDialogResult(result) {
if (result) { if (result) {
var url = result.textInput; var url = result.url;
var shapeType; var shapeType;
switch (result.comboBox) { switch (result.collisionShapeIndex) {
case SHAPE_TYPE_SIMPLE_HULL: case SHAPE_TYPE_SIMPLE_HULL:
shapeType = "simple-hull"; shapeType = "simple-hull";
break; break;
@ -464,7 +464,7 @@ var toolBar = (function () {
shapeType = "none"; shapeType = "none";
} }
var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT; var dynamic = result.dynamic !== null ? result.dynamic : DYNAMIC_DEFAULT;
if (shapeType === "static-mesh" && dynamic) { if (shapeType === "static-mesh" && dynamic) {
// The prompt should prevent this case // The prompt should prevent this case
print("Error: model cannot be both static mesh and dynamic. This should never happen."); print("Error: model cannot be both static mesh and dynamic. This should never happen.");