From 9d13902cd3c9f89b3f9bf2e3f1ad9e35fb5326e7 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Sat, 20 Oct 2018 11:26:12 -0700 Subject: [PATCH] Improve paramater names in model dialog window --- interface/resources/qml/hifi/tablet/NewModelDialog.qml | 6 +++--- scripts/system/edit.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/interface/resources/qml/hifi/tablet/NewModelDialog.qml index 0359f429c1..553a4fd59f 100644 --- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml +++ b/interface/resources/qml/hifi/tablet/NewModelDialog.qml @@ -222,9 +222,9 @@ Rectangle { newModelDialog.sendToScript({ method: "newModelDialogAdd", params: { - textInput: modelURL.text, - checkBox: dynamic.checked, - comboBox: collisionType.currentIndex, + url: modelURL.text, + dynamic: dynamic.checked, + collisionShapeIndex: collisionType.currentIndex, grabbable: grabbable.checked } }); diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 12b8f4521b..1720cb8278 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -442,9 +442,9 @@ var toolBar = (function () { function handleNewModelDialogResult(result) { if (result) { - var url = result.textInput; + var url = result.url; var shapeType; - switch (result.comboBox) { + switch (result.collisionShapeIndex) { case SHAPE_TYPE_SIMPLE_HULL: shapeType = "simple-hull"; break; @@ -464,7 +464,7 @@ var toolBar = (function () { 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) { // The prompt should prevent this case print("Error: model cannot be both static mesh and dynamic. This should never happen.");