diff --git a/.eslintrc.js b/.eslintrc.js index ecdae56594..82dfe9e9bd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,6 +28,7 @@ module.exports = { "ModelCache": false, "MyAvatar": false, "Overlays": false, + "OverlayWebWindow": false, "Paths": false, "Quat": false, "Rates": false, @@ -43,6 +44,7 @@ module.exports = { "Toolbars": false, "Uuid": false, "UndoStack": false, + "UserActivityLogger": false, "Vec3": false, "WebSocket": false, "WebWindow": false, @@ -56,6 +58,7 @@ module.exports = { "comma-dangle": ["error", "never"], "camelcase": ["error"], "curly": ["error", "all"], + "eqeqeq": ["error", "always"], "indent": ["error", 4, { "SwitchCase": 1 }], "keyword-spacing": ["error", { "before": true, "after": true }], "max-len": ["error", 128, 4], diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml index bd16a33776..544609b478 100644 --- a/interface/resources/qml/controls-uit/CheckBox.qml +++ b/interface/resources/qml/controls-uit/CheckBox.qml @@ -65,6 +65,7 @@ Original.CheckBox { colorScheme: checkBox.colorScheme x: checkBox.boxSize / 2 wrapMode: Text.Wrap + enabled: checkBox.enabled } } } diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml index df3210a20d..eb0c08624b 100644 --- a/interface/resources/qml/controls-uit/ComboBox.qml +++ b/interface/resources/qml/controls-uit/ComboBox.qml @@ -117,19 +117,22 @@ FocusScope { function showList() { var r = desktop.mapFromItem(root, 0, 0, root.width, root.height); - listView.currentIndex = root.currentIndex - scrollView.x = r.x; - scrollView.y = r.y + r.height; - var bottom = scrollView.y + scrollView.height; + var y = r.y + r.height; + var bottom = y + scrollView.height; if (bottom > desktop.height) { - scrollView.y -= bottom - desktop.height + 8; + y -= bottom - desktop.height + 8; } + scrollView.x = r.x; + scrollView.y = y; popup.visible = true; popup.forceActiveFocus(); + listView.currentIndex = root.currentIndex; + scrollView.hoverEnabled = true; } function hideList() { popup.visible = false; + scrollView.hoverEnabled = false; } FocusScope { @@ -161,6 +164,7 @@ FocusScope { id: scrollView height: 480 width: root.width + 4 + property bool hoverEnabled: false; style: ScrollViewStyle { decrementControl: Item { @@ -193,7 +197,8 @@ FocusScope { delegate: Rectangle { width: root.width + 4 height: popupText.implicitHeight * 1.4 - color: popupHover.containsMouse ? hifi.colors.primaryHighlight : (isLightColorScheme ? hifi.colors.dropDownPressedLight : hifi.colors.dropDownPressedDark) + color: (listView.currentIndex === index) ? hifi.colors.primaryHighlight : + (isLightColorScheme ? hifi.colors.dropDownPressedLight : hifi.colors.dropDownPressedDark) FiraSansSemiBold { anchors.left: parent.left anchors.leftMargin: hifi.dimensions.textPadding @@ -206,9 +211,9 @@ FocusScope { MouseArea { id: popupHover anchors.fill: parent; - hoverEnabled: true + hoverEnabled: scrollView.hoverEnabled; onEntered: listView.currentIndex = index; - onClicked: popup.selectSpecificItem(index) + onClicked: popup.selectSpecificItem(index); } } } diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controls-uit/Label.qml index d9d33c1bfa..3b4d757154 100644 --- a/interface/resources/qml/controls-uit/Label.qml +++ b/interface/resources/qml/controls-uit/Label.qml @@ -16,5 +16,6 @@ RalewaySemiBold { property int colorScheme: hifi.colorSchemes.light size: hifi.fontSizes.inputLabel - color: colorScheme == hifi.colorSchemes.light ? hifi.colors.lightGray : hifi.colors.lightGrayText + color: enabled ? (colorScheme == hifi.colorSchemes.light ? hifi.colors.lightGray : hifi.colors.lightGrayText) + : (colorScheme == hifi.colorSchemes.light ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight); } diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml index e5ff849df8..ea2f048c1f 100644 --- a/interface/resources/qml/desktop/Desktop.qml +++ b/interface/resources/qml/desktop/Desktop.qml @@ -35,7 +35,7 @@ FocusScope { } onHeightChanged: d.handleSizeChanged(); - + onWidthChanged: d.handleSizeChanged(); // Controls and windows can trigger this signal to ensure the desktop becomes visible @@ -70,8 +70,8 @@ FocusScope { } var oldRecommendedRect = recommendedRect; var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect(); - var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y, - newRecommendedRectJS.width, + var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y, + newRecommendedRectJS.width, newRecommendedRectJS.height); var oldChildren = expectedChildren; @@ -366,8 +366,8 @@ FocusScope { } var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect(); - var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y, - newRecommendedRectJS.width, + var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y, + newRecommendedRectJS.width, newRecommendedRectJS.height); var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height }; var newX = newRecommendedRect.x + ((newRecommendedRect.width - targetWindow.width) / 2); @@ -402,7 +402,7 @@ FocusScope { repositionWindow(targetWindow, false, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions); } - function repositionWindow(targetWindow, forceReposition, + function repositionWindow(targetWindow, forceReposition, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions) { if (desktop.width === 0 || desktop.height === 0) { @@ -456,6 +456,11 @@ FocusScope { return inputDialogBuilder.createObject(desktop, properties); } + Component { id: customInputDialogBuilder; CustomQueryDialog { } } + function customInputDialog(properties) { + return customInputDialogBuilder.createObject(desktop, properties); + } + Component { id: fileDialogBuilder; FileDialog { } } function fileDialog(properties) { return fileDialogBuilder.createObject(desktop, properties); @@ -487,7 +492,7 @@ FocusScope { } function unfocusWindows() { - // First find the active focus item, and unfocus it, all the way + // First find the active focus item, and unfocus it, all the way // up the parent chain to the window var currentFocus = offscreenWindow.activeFocusItem; var targetWindow = d.getDesktopWindow(currentFocus); diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml new file mode 100644 index 0000000000..d1fb885e0b --- /dev/null +++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml @@ -0,0 +1,300 @@ +// +// CustomQueryDialog.qml +// +// Created by Zander Otavka on 7/14/16 +// Copyright 2016 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +import QtQuick 2.5; +import QtQuick.Controls 1.4; +import QtQuick.Dialogs 1.2 as OriginalDialogs; + +import "../controls-uit"; +import "../styles-uit"; +import "../windows"; + +ModalWindow { + id: root; + HifiConstants { id: hifi; } + implicitWidth: 640; + implicitHeight: 320; + visible: true; + + signal selected(var result); + signal canceled(); + + property int icon: hifi.icons.none; + property string iconText: ""; + property int iconSize: 35; + onIconChanged: updateIcon(); + + property var textInput; + property var comboBox; + property var checkBox; + onTextInputChanged: { + if (textInput && textInput.text !== undefined) { + textField.text = textInput.text; + } + } + onComboBoxChanged: { + if (comboBox && comboBox.index !== undefined) { + comboBoxField.currentIndex = comboBox.index; + } + } + onCheckBoxChanged: { + if (checkBox && checkBox.checked !== undefined) { + checkBoxField.checked = checkBox.checked; + } + } + + property var warning: ""; + property var result; + + property var implicitCheckState: null; + + property int titleWidth: 0; + onTitleWidthChanged: d.resize(); + + function updateIcon() { + if (!root) { + return; + } + iconText = hifi.glyphForIcon(root.icon); + } + + function updateCheckbox() { + if (checkBox.disableForItems) { + var currentItemInDisableList = false; + for (var i in checkBox.disableForItems) { + if (comboBoxField.currentIndex === checkBox.disableForItems[i]) { + currentItemInDisableList = true; + break; + } + } + + if (currentItemInDisableList) { + checkBoxField.enabled = false; + if (checkBox.checkStateOnDisable !== null && checkBox.checkStateOnDisable !== undefined) { + root.implicitCheckState = checkBoxField.checked; + checkBoxField.checked = checkBox.checkStateOnDisable; + } + root.warning = checkBox.warningOnDisable; + } else { + checkBoxField.enabled = true; + if (root.implicitCheckState !== null) { + checkBoxField.checked = root.implicitCheckState; + root.implicitCheckState = null; + } + root.warning = ""; + } + } + } + + Item { + clip: true; + width: pane.width; + height: pane.height; + anchors.margins: 0; + + QtObject { + id: d; + readonly property int minWidth: 480; + readonly property int maxWdith: 1280; + readonly property int minHeight: 120; + readonly property int maxHeight: 720; + + function resize() { + var targetWidth = Math.max(titleWidth, pane.width); + var targetHeight = (textField.visible ? textField.controlHeight + hifi.dimensions.contentSpacing.y : 0) + + (extraInputs.visible ? extraInputs.height + hifi.dimensions.contentSpacing.y : 0) + + (buttons.height + 3 * hifi.dimensions.contentSpacing.y); + root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth); + root.height = (targetHeight < d.minHeight) ? d.minHeight : ((targetHeight > d.maxHeight) ? + d.maxHeight : targetHeight); + if (checkBoxField.visible && comboBoxField.visible) { + checkBoxField.width = extraInputs.width / 2; + comboBoxField.width = extraInputs.width / 2; + } else if (!checkBoxField.visible && comboBoxField.visible) { + comboBoxField.width = extraInputs.width; + } + } + } + + Item { + anchors { + top: parent.top; + bottom: extraInputs.visible ? extraInputs.top : buttons.top; + left: parent.left; + right: parent.right; + margins: 0; + bottomMargin: hifi.dimensions.contentSpacing.y; + } + + // FIXME make a text field type that can be bound to a history for autocompletion + TextField { + id: textField; + label: root.textInput.label; + focus: root.textInput ? true : false; + visible: root.textInput ? true : false; + anchors { + left: parent.left; + right: parent.right; + bottom: parent.bottom; + } + } + } + + Item { + id: extraInputs; + visible: Boolean(root.checkBox || root.comboBox); + anchors { + left: parent.left; + right: parent.right; + bottom: buttons.top; + bottomMargin: hifi.dimensions.contentSpacing.y; + } + height: comboBoxField.controlHeight; + onHeightChanged: d.resize(); + onWidthChanged: d.resize(); + + CheckBox { + id: checkBoxField; + text: root.checkBox.label; + focus: Boolean(root.checkBox); + visible: Boolean(root.checkBox); + anchors { + left: parent.left; + bottom: parent.bottom; + leftMargin: 6; // Magic number to align with warning icon + } + } + + ComboBox { + id: comboBoxField; + label: root.comboBox.label; + focus: Boolean(root.comboBox); + visible: Boolean(root.comboBox); + anchors { + right: parent.right; + bottom: parent.bottom; + } + model: root.comboBox ? root.comboBox.items : []; + onCurrentTextChanged: updateCheckbox(); + } + } + + Row { + id: buttons; + focus: true; + spacing: hifi.dimensions.contentSpacing.x; + layoutDirection: Qt.RightToLeft; + onHeightChanged: d.resize(); + onWidthChanged: { + d.resize(); + resizeWarningText(); + } + + anchors { + bottom: parent.bottom; + left: parent.left; + right: parent.right; + bottomMargin: hifi.dimensions.contentSpacing.y; + } + + function resizeWarningText() { + var rowWidth = buttons.width; + var buttonsWidth = acceptButton.width + cancelButton.width + hifi.dimensions.contentSpacing.x * 2; + var warningIconWidth = warningIcon.width + hifi.dimensions.contentSpacing.x; + warningText.width = rowWidth - buttonsWidth - warningIconWidth; + } + + Button { + id: cancelButton; + action: cancelAction; + } + + Button { + id: acceptButton; + action: acceptAction; + } + + Text { + id: warningText; + visible: Boolean(root.warning); + text: root.warning; + wrapMode: Text.WordWrap; + font.italic: true; + maximumLineCount: 2; + } + + HiFiGlyphs { + id: warningIcon; + visible: Boolean(root.warning); + text: hifi.glyphs.alert; + size: hifi.dimensions.controlLineHeight; + } + } + + Action { + id: cancelAction; + text: qsTr("Cancel"); + shortcut: Qt.Key_Escape; + onTriggered: { + root.result = null; + root.canceled(); + root.destroy(); + } + } + + Action { + id: acceptAction; + text: qsTr("Add"); + shortcut: Qt.Key_Return; + onTriggered: { + var result = {}; + if (textInput) { + result.textInput = textField.text; + } + if (comboBox) { + result.comboBox = comboBoxField.currentIndex; + result.comboBoxText = comboBoxField.currentText; + } + if (checkBox) { + result.checkBox = checkBoxField.enabled ? checkBoxField.checked : null; + } + root.result = JSON.stringify(result); + root.selected(root.result); + root.destroy(); + } + } + } + + Keys.onPressed: { + if (!visible) { + return; + } + + switch (event.key) { + case Qt.Key_Escape: + case Qt.Key_Back: + cancelAction.trigger(); + event.accepted = true; + break; + + case Qt.Key_Return: + case Qt.Key_Enter: + acceptAction.trigger(); + event.accepted = true; + break; + } + } + + Component.onCompleted: { + updateIcon(); + d.resize(); + textField.forceActiveFocus(); + } +} diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d3dbed065e..dc37325ac5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4715,6 +4715,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get().data()); scriptEngine->registerGlobalObject("Window", DependencyManager::get().data()); + qScriptRegisterMetaType(scriptEngine, CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue); scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, LocationScriptingInterface::locationSetter, "Window"); // register `location` on the global object. diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index f0ae221566..b165cda135 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -29,6 +29,20 @@ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStanda static const QString LAST_BROWSE_LOCATION_SETTING = "LastBrowseLocation"; +QScriptValue CustomPromptResultToScriptValue(QScriptEngine* engine, const CustomPromptResult& result) { + if (!result.value.isValid()) { + return QScriptValue::UndefinedValue; + } + + Q_ASSERT(result.value.userType() == qMetaTypeId()); + return engine->toScriptValue(result.value.toMap()); +} + +void CustomPromptResultFromScriptValue(const QScriptValue& object, CustomPromptResult& result) { + result.value = object.toVariant(); +} + + WindowScriptingInterface::WindowScriptingInterface() { const DomainHandler& domainHandler = DependencyManager::get()->getDomainHandler(); connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged); @@ -95,6 +109,14 @@ QScriptValue WindowScriptingInterface::prompt(const QString& message, const QStr return ok ? QScriptValue(result) : QScriptValue::NullValue; } +CustomPromptResult WindowScriptingInterface::customPrompt(const QVariant& config) { + CustomPromptResult result; + bool ok = false; + auto configMap = config.toMap(); + result.value = OffscreenUi::getCustomInfo(OffscreenUi::ICON_NONE, "", configMap, &ok); + return ok ? result : CustomPromptResult(); +} + QString fixupPathForMac(const QString& directory) { // On OS X `directory` does not work as expected unless a file is included in the path, so we append a bogus // filename if the directory is valid. diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 4f26ccd057..9d73111333 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -18,6 +18,18 @@ class WebWindowClass; + +class CustomPromptResult { +public: + QVariant value; +}; + +Q_DECLARE_METATYPE(CustomPromptResult); + +QScriptValue CustomPromptResultToScriptValue(QScriptEngine* engine, const CustomPromptResult& result); +void CustomPromptResultFromScriptValue(const QScriptValue& object, CustomPromptResult& result); + + class WindowScriptingInterface : public QObject, public Dependency { Q_OBJECT Q_PROPERTY(int innerWidth READ getInnerWidth) @@ -38,6 +50,7 @@ public slots: void alert(const QString& message = ""); QScriptValue confirm(const QString& message = ""); QScriptValue prompt(const QString& message = "", const QString& defaultText = ""); + CustomPromptResult customPrompt(const QVariant& config); QScriptValue browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); void copyToClipboard(const QString& text); diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 5b1b5b01d4..4e8ecf3054 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -700,11 +700,12 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) { } info.setParams(type, dimensions, _compoundShapeURL); } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) { - updateModelBounds(); - // should never fall in here when model not fully loaded assert(_model && _model->isLoaded()); + updateModelBounds(); + _model->updateGeometry(); + // compute meshPart local transforms QVector localTransforms; const FBXGeometry& fbxGeometry = _model->getFBXGeometry(); diff --git a/libraries/physics/src/ShapeFactory.cpp b/libraries/physics/src/ShapeFactory.cpp index 944e05e571..137038e133 100644 --- a/libraries/physics/src/ShapeFactory.cpp +++ b/libraries/physics/src/ShapeFactory.cpp @@ -69,7 +69,6 @@ static const btVector3 _unitSphereDirections[NUM_UNIT_SPHERE_DIRECTIONS] = { // util method btConvexHullShape* createConvexHull(const ShapeInfo::PointList& points) { - //std::cout << "adebug createConvexHull() points.size() = " << points.size() << std::endl; // adebug assert(points.size() > 0); btConvexHullShape* hull = new btConvexHullShape(); @@ -241,7 +240,6 @@ void deleteStaticMeshArray(btTriangleIndexVertexArray* dataArray) { btCollisionShape* ShapeFactory::createShapeFromInfo(const ShapeInfo& info) { btCollisionShape* shape = NULL; int type = info.getType(); - //std::cout << "adebug createShapeFromInfo() type = " << type << std::endl; // adebug switch(type) { case SHAPE_TYPE_BOX: { shape = new btBoxShape(glmToBullet(info.getHalfExtents())); diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index aa0c49f720..98e50c66f4 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -84,6 +84,7 @@ public: bool readyToAddToScene(RenderArgs* renderArgs = nullptr) const { return !_needsReload && isRenderable() && isActive(); } + bool needsReload() const { return _needsReload; } bool initWhenReady(render::ScenePointer scene); bool addToScene(std::shared_ptr scene, render::PendingChanges& pendingChanges, @@ -232,6 +233,9 @@ public: const glm::vec3& getRegistrationPoint() const { return _registrationPoint; } + // returns 'true' if needs fullUpdate after geometry change + bool updateGeometry(); + protected: void setPupilDilation(float dilation) { _pupilDilation = dilation; } @@ -297,9 +301,6 @@ protected: std::unordered_set _cauterizeBoneSet; bool _cauterizeBones; - // returns 'true' if needs fullUpdate after geometry change - bool updateGeometry(); - virtual void initJointStates(); void setScaleInternal(const glm::vec3& scale); diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp index 28aba4a365..9e5f6c4e62 100644 --- a/libraries/ui/src/OffscreenUi.cpp +++ b/libraries/ui/src/OffscreenUi.cpp @@ -343,6 +343,23 @@ QString OffscreenUi::getItem(const Icon icon, const QString& title, const QStrin return result.toString(); } +QVariant OffscreenUi::getCustomInfo(const Icon icon, const QString& title, const QVariantMap& config, bool* ok) { + if (ok) { + *ok = false; + } + + QVariant result = DependencyManager::get()->customInputDialog(icon, title, config); + if (result.isValid()) { + // We get a JSON encoded result, so we unpack it into a QVariant wrapping a QVariantMap + result = QVariant(QJsonDocument::fromJson(result.toString().toUtf8()).object().toVariantMap()); + if (ok) { + *ok = true; + } + } + + return result; +} + QVariant OffscreenUi::inputDialog(const Icon icon, const QString& title, const QString& label, const QVariant& current) { if (QThread::currentThread() != thread()) { QVariant result; @@ -358,6 +375,20 @@ QVariant OffscreenUi::inputDialog(const Icon icon, const QString& title, const Q return waitForInputDialogResult(createInputDialog(icon, title, label, current)); } +QVariant OffscreenUi::customInputDialog(const Icon icon, const QString& title, const QVariantMap& config) { + if (QThread::currentThread() != thread()) { + QVariant result; + QMetaObject::invokeMethod(this, "customInputDialog", Qt::BlockingQueuedConnection, + Q_RETURN_ARG(QVariant, result), + Q_ARG(Icon, icon), + Q_ARG(QString, title), + Q_ARG(QVariantMap, config)); + return result; + } + + return waitForInputDialogResult(createCustomInputDialog(icon, title, config)); +} + void OffscreenUi::togglePinned() { bool invokeResult = QMetaObject::invokeMethod(_desktop, "togglePinned"); if (!invokeResult) { @@ -401,6 +432,23 @@ QQuickItem* OffscreenUi::createInputDialog(const Icon icon, const QString& title return qvariant_cast(result); } +QQuickItem* OffscreenUi::createCustomInputDialog(const Icon icon, const QString& title, const QVariantMap& config) { + QVariantMap map = config; + map.insert("title", title); + map.insert("icon", icon); + QVariant result; + bool invokeResult = QMetaObject::invokeMethod(_desktop, "customInputDialog", + Q_RETURN_ARG(QVariant, result), + Q_ARG(QVariant, QVariant::fromValue(map))); + + if (!invokeResult) { + qWarning() << "Failed to create custom message box"; + return nullptr; + } + + return qvariant_cast(result); +} + QVariant OffscreenUi::waitForInputDialogResult(QQuickItem* inputDialog) { if (!inputDialog) { return QVariant(); diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h index 2bd00bf612..36297d76c7 100644 --- a/libraries/ui/src/OffscreenUi.h +++ b/libraries/ui/src/OffscreenUi.h @@ -122,7 +122,9 @@ public: static QString getSaveFileName(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0); Q_INVOKABLE QVariant inputDialog(const Icon icon, const QString& title, const QString& label = QString(), const QVariant& current = QVariant()); + Q_INVOKABLE QVariant customInputDialog(const Icon icon, const QString& title, const QVariantMap& config); QQuickItem* createInputDialog(const Icon icon, const QString& title, const QString& label, const QVariant& current); + QQuickItem* createCustomInputDialog(const Icon icon, const QString& title, const QVariantMap& config); QVariant waitForInputDialogResult(QQuickItem* inputDialog); // Compatibility with QInputDialog::getText @@ -140,6 +142,7 @@ public: static QString getText(const Icon icon, const QString & title, const QString & label, const QString & text = QString(), bool * ok = 0); static QString getItem(const Icon icon, const QString & title, const QString & label, const QStringList & items, int current = 0, bool editable = true, bool * ok = 0); + static QVariant getCustomInfo(const Icon icon, const QString& title, const QVariantMap& config, bool* ok = 0); unsigned int getMenuUserDataId() const; diff --git a/scripts/system/edit.js b/scripts/system/edit.js index f7e44933d7..25c25a9a7e 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -11,11 +11,13 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; +var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; var EDIT_TOGGLE_BUTTON = "com.highfidelity.interface.system.editButton"; -var SYSTEM_TOOLBAR = "com.highfidelity.interface.toolbar.system"; +var SYSTEM_TOOLBAR = "com.highfidelity.interface.toolbar.system"; var EDIT_TOOLBAR = "com.highfidelity.interface.toolbar.edit"; - + +/* globals SelectionDisplay, SelectionManager, LightOverlayManager, CameraManager, Grid, GridTool, EntityListTool, Toolbars, + progressDialog, tooltip, ParticleExplorerTool */ Script.include([ "libraries/stringHelpers.js", "libraries/dataViewHelpers.js", @@ -29,7 +31,7 @@ Script.include([ "libraries/gridTool.js", "libraries/entityList.js", "particle_explorer/particleExplorerTool.js", - "libraries/lightOverlayManager.js", + "libraries/lightOverlayManager.js" ]); var selectionDisplay = SelectionDisplay; @@ -39,15 +41,15 @@ var lightOverlayManager = new LightOverlayManager(); var cameraManager = new CameraManager(); -var grid = Grid(); -gridTool = GridTool({ +var grid = new Grid(); +var gridTool = new GridTool({ horizontalGrid: grid }); gridTool.setVisible(false); -var entityListTool = EntityListTool(); +var entityListTool = new EntityListTool(); -selectionManager.addEventListener(function() { +selectionManager.addEventListener(function () { selectionDisplay.updateHandles(); lightOverlayManager.updatePositions(); }); @@ -89,17 +91,16 @@ var SETTING_SHOW_ZONES_IN_EDIT_MODE = "showZonesInEditMode"; // marketplace info, etc. not quite ready yet. var SHOULD_SHOW_PROPERTY_MENU = false; -var INSUFFICIENT_PERMISSIONS_ERROR_MSG = "You do not have the necessary permissions to edit on this domain." -var INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG = "You do not have the necessary permissions to place items on this domain." +var INSUFFICIENT_PERMISSIONS_ERROR_MSG = "You do not have the necessary permissions to edit on this domain."; +var INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG = "You do not have the necessary permissions to place items on this domain."; var mode = 0; var isActive = false; -IMPORTING_SVO_OVERLAY_WIDTH = 144; -IMPORTING_SVO_OVERLAY_HEIGHT = 30; -IMPORTING_SVO_OVERLAY_MARGIN = 5; -IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34; - +var IMPORTING_SVO_OVERLAY_WIDTH = 144; +var IMPORTING_SVO_OVERLAY_HEIGHT = 30; +var IMPORTING_SVO_OVERLAY_MARGIN = 5; +var IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34; var importingSVOImageOverlay = Overlays.addOverlay("image", { imageURL: Script.resolvePath("assets") + "/images/hourglass.svg", width: 20, @@ -107,7 +108,7 @@ var importingSVOImageOverlay = Overlays.addOverlay("image", { alpha: 1.0, x: Window.innerWidth - IMPORTING_SVO_OVERLAY_WIDTH, y: Window.innerHeight - IMPORTING_SVO_OVERLAY_HEIGHT, - visible: false, + visible: false }); var importingSVOTextOverlay = Overlays.addOverlay("text", { font: { @@ -125,7 +126,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", { blue: 80 }, backgroundAlpha: 0.7, - visible: false, + visible: false }); var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; @@ -163,21 +164,21 @@ function toggleMarketplace() { } } -var toolBar = (function() { +var toolBar = (function () { var EDIT_SETTING = "io.highfidelity.isEditting"; // for communication with other scripts var TOOL_ICON_URL = Script.resolvePath("assets/images/tools/"); var that = {}, toolBar, systemToolbar, activeButton; - + function createNewEntity(properties) { Settings.setValue(EDIT_SETTING, false); var dimensions = properties.dimensions ? properties.dimensions : DEFAULT_DIMENSIONS; var position = getPositionToCreateEntity(); var entityID = null; - if (position != null) { + if (position !== null && position !== undefined) { position = grid.snapToSurface(grid.snapToGrid(position, false, dimensions), dimensions), properties.position = position; entityID = Entities.addEntity(properties); @@ -196,18 +197,18 @@ var toolBar = (function() { that.setActive(false); systemToolbar.removeButton(EDIT_TOGGLE_BUTTON); } - + function addButton(name, image, handler) { var imageUrl = TOOL_ICON_URL + image; var button = toolBar.addButton({ objectName: name, - imageURL: imageUrl, + imageURL: imageUrl, buttonState: 1, alpha: 0.9, - visible: true, + visible: true }); if (handler) { - button.clicked.connect(function() { + button.clicked.connect(function () { Script.setTimeout(handler, 100); }); } @@ -217,13 +218,13 @@ var toolBar = (function() { function initialize() { print("QQQ creating edit toolbar"); Script.scriptEnding.connect(cleanup); - - Window.domainChanged.connect(function() { + + Window.domainChanged.connect(function () { that.setActive(false); that.clearEntityList(); }); - Entities.canAdjustLocksChanged.connect(function(canAdjustLocks) { + Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) { if (isActive && !canAdjustLocks) { that.setActive(false); } @@ -237,9 +238,9 @@ var toolBar = (function() { alpha: 0.9, buttonState: 1, hoverState: 3, - defaultState: 1, + defaultState: 1 }); - activeButton.clicked.connect(function() { + activeButton.clicked.connect(function () { that.setActive(!isActive); activeButton.writeProperty("buttonState", isActive ? 0 : 1); activeButton.writeProperty("defaultState", isActive ? 0 : 1); @@ -249,17 +250,74 @@ var toolBar = (function() { toolBar = Toolbars.getToolbar(EDIT_TOOLBAR); toolBar.writeProperty("shown", false); - addButton("newModelButton", "model-01.svg", function() { - var url = Window.prompt("Model URL"); - if (url !== null && url !== "") { - createNewEntity({ - type: "Model", - modelURL: url - }); + addButton("newModelButton", "model-01.svg", function () { + var SHAPE_TYPE_NONE = 0; + var SHAPE_TYPE_SIMPLE_HULL = 1; + var SHAPE_TYPE_SIMPLE_COMPOUND = 2; + var SHAPE_TYPE_STATIC_MESH = 3; + + var SHAPE_TYPES = []; + SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision"; + SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model"; + SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes"; + SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons"; + + var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH; + var DYNAMIC_DEFAULT = false; + var result = Window.customPrompt({ + textInput: { + label: "Model URL" + }, + comboBox: { + label: "Automatic Collisions", + index: SHAPE_TYPE_DEFAULT, + items: SHAPE_TYPES + }, + checkBox: { + label: "Dynamic", + checked: DYNAMIC_DEFAULT, + disableForItems: [ + SHAPE_TYPE_STATIC_MESH + ], + checkStateOnDisable: false, + warningOnDisable: "Models with automatic collisions set to 'Exact' cannot be dynamic" + } + }); + + if (result) { + var url = result.textInput; + var shapeType; + switch (result.comboBox) { + case SHAPE_TYPE_SIMPLE_HULL: + shapeType = "simple-hull"; + break; + case SHAPE_TYPE_SIMPLE_COMPOUND: + shapeType = "simple-compound"; + break; + case SHAPE_TYPE_STATIC_MESH: + shapeType = "static-mesh"; + break; + default: + shapeType = "none"; + } + + var dynamic = result.checkBox !== null ? result.checkBox : 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."); + } else if (url) { + createNewEntity({ + type: "Model", + modelURL: url, + shapeType: shapeType, + dynamic: dynamic, + gravity: dynamic ? { x: 0, y: -10, z: 0 } : { x: 0, y: 0, z: 0 } + }); + } } }); - addButton("newCubeButton", "cube-01.svg", function() { + addButton("newCubeButton", "cube-01.svg", function () { createNewEntity({ type: "Box", dimensions: DEFAULT_DIMENSIONS, @@ -271,7 +329,7 @@ var toolBar = (function() { }); }); - addButton("newSphereButton", "sphere-01.svg", function() { + addButton("newSphereButton", "sphere-01.svg", function () { createNewEntity({ type: "Sphere", dimensions: DEFAULT_DIMENSIONS, @@ -283,7 +341,7 @@ var toolBar = (function() { }); }); - addButton("newLightButton", "light-01.svg", function() { + addButton("newLightButton", "light-01.svg", function () { createNewEntity({ type: "Light", dimensions: DEFAULT_LIGHT_DIMENSIONS, @@ -298,11 +356,11 @@ var toolBar = (function() { linearAttenuation: 0, quadraticAttenuation: 0, exponent: 0, - cutoff: 180, // in degrees + cutoff: 180 // in degrees }); }); - addButton("newTextButton", "text-01.svg", function() { + addButton("newTextButton", "text-01.svg", function () { createNewEntity({ type: "Text", dimensions: { @@ -325,7 +383,7 @@ var toolBar = (function() { }); }); - addButton("newWebButton", "web-01.svg", function() { + addButton("newWebButton", "web-01.svg", function () { createNewEntity({ type: "Web", dimensions: { @@ -333,26 +391,25 @@ var toolBar = (function() { y: 0.9, z: 0.01 }, - sourceUrl: "https://highfidelity.com/", + sourceUrl: "https://highfidelity.com/" }); }); - addButton("newZoneButton", "zone-01.svg", function() { + addButton("newZoneButton", "zone-01.svg", function () { createNewEntity({ type: "Zone", dimensions: { x: 10, y: 10, z: 10 - }, + } }); }); - addButton("newParticleButton", "particle-01.svg", function() { + addButton("newParticleButton", "particle-01.svg", function () { createNewEntity({ type: "ParticleEffect", isEmitting: true, - particleRadius: 0.1, emitAcceleration: { x: 0, y: -1, @@ -368,19 +425,19 @@ var toolBar = (function() { particleRadius: 0.025, alphaFinish: 0, emitRate: 100, - textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png", + textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png" }); }); that.setActive(false); } - - that.clearEntityList = function() { + + that.clearEntityList = function () { entityListTool.clearEntityList(); }; - that.setActive = function(active) { - if (active == isActive) { + that.setActive = function (active) { + if (active === isActive) { return; } if (active && !Entities.canRez() && !Entities.canRezTmp()) { @@ -402,7 +459,6 @@ var toolBar = (function() { selectionDisplay.triggerMapping.disable(); } else { UserActivityLogger.enabledEdit(); - hasShownPropertiesTool = false; entityListTool.setVisible(true); gridTool.setVisible(true); grid.setEnabled(true); @@ -415,11 +471,11 @@ var toolBar = (function() { // Sets visibility of tool buttons, excluding the power button toolBar.writeProperty("shown", active); var visible = toolBar.readProperty("visible"); - if (active && !visible) { + if (active && !visible) { toolBar.writeProperty("shown", false); toolBar.writeProperty("shown", true); } - //toolBar.selectTool(activeButton, isActive); + // toolBar.selectTool(activeButton, isActive); lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE)); Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE)); }; @@ -431,8 +487,8 @@ var toolBar = (function() { function isLocked(properties) { // special case to lock the ground plane model in hq. - if (location.hostname == "hq.highfidelity.io" && - properties.modelURL == HIFI_PUBLIC_BUCKET + "ozan/Terrain_Reduce_forAlpha.fbx") { + if (location.hostname === "hq.highfidelity.io" && + properties.modelURL === HIFI_PUBLIC_BUCKET + "ozan/Terrain_Reduce_forAlpha.fbx") { return true; } return false; @@ -629,9 +685,10 @@ function mouseReleaseEvent(event) { function mouseClickEvent(event) { var wantDebug = false; + var result, properties; if (isActive && event.isLeftButton) { - var result = findClickedEntity(event); - if (result === null) { + result = findClickedEntity(event); + if (result === null || result === undefined) { if (!event.isShifted) { selectionManager.clearSelections(); } @@ -641,7 +698,7 @@ function mouseClickEvent(event) { var pickRay = result.pickRay; var foundEntity = result.entityID; - var properties = Entities.getEntityProperties(foundEntity); + properties = Entities.getEntityProperties(foundEntity); if (isLocked(properties)) { if (wantDebug) { print("Model locked " + properties.id); @@ -660,7 +717,7 @@ function mouseClickEvent(event) { // x x - distance from A // // |X-A| = (P-A).B - // X == A + ((P-A).B)B + // X === A + ((P-A).B)B // d = |P-X| var A = pickRay.origin; @@ -668,16 +725,14 @@ function mouseClickEvent(event) { var P = properties.position; var x = Vec3.dot(Vec3.subtract(P, A), B); - var X = Vec3.sum(A, Vec3.multiply(B, x)); - var d = Vec3.length(Vec3.subtract(P, X)); - var halfDiagonal = Vec3.length(properties.dimensions) / 2.0; - var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(), properties.position)) * 180 / 3.14; + var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(), properties.position)) * + 180 / Math.PI; - var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE) && (allowSmallModels || angularSize > MIN_ANGULAR_SIZE); + var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE) && + (allowSmallModels || angularSize > MIN_ANGULAR_SIZE); if (0 < x && sizeOK) { - entitySelected = true; selectedEntityID = foundEntity; orientation = MyAvatar.orientation; intersection = rayPlaneIntersection(pickRay, P, Quat.getFront(orientation)); @@ -702,12 +757,12 @@ function mouseClickEvent(event) { } } } else if (event.isRightButton) { - var result = findClickedEntity(event); + result = findClickedEntity(event); if (result) { if (SHOULD_SHOW_PROPERTY_MENU !== true) { return; } - var properties = Entities.getEntityProperties(result.entityID); + properties = Entities.getEntityProperties(result.entityID); if (properties.marketplaceID) { propertyMenu.marketplaceID = properties.marketplaceID; propertyMenu.updateMenuItemText(showMenuItem, "Show in Marketplace"); @@ -833,7 +888,7 @@ function setupModelMenus() { menuName: "Edit", menuItemName: MENU_AUTO_FOCUS_ON_SELECT, isCheckable: true, - isChecked: Settings.getValue(SETTING_AUTO_FOCUS_ON_SELECT) == "true", + isChecked: Settings.getValue(SETTING_AUTO_FOCUS_ON_SELECT) === "true", grouping: "Advanced" }); Menu.addMenuItem({ @@ -841,7 +896,7 @@ function setupModelMenus() { menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_AUTO_FOCUS_ON_SELECT, isCheckable: true, - isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true", + isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) === "true", grouping: "Advanced" }); Menu.addMenuItem({ @@ -849,7 +904,7 @@ function setupModelMenus() { menuItemName: MENU_SHOW_LIGHTS_IN_EDIT_MODE, afterItem: MENU_EASE_ON_FOCUS, isCheckable: true, - isChecked: Settings.getValue(SETTING_SHOW_LIGHTS_IN_EDIT_MODE) == "true", + isChecked: Settings.getValue(SETTING_SHOW_LIGHTS_IN_EDIT_MODE) === "true", grouping: "Advanced" }); Menu.addMenuItem({ @@ -857,7 +912,7 @@ function setupModelMenus() { menuItemName: MENU_SHOW_ZONES_IN_EDIT_MODE, afterItem: MENU_SHOW_LIGHTS_IN_EDIT_MODE, isCheckable: true, - isChecked: Settings.getValue(SETTING_SHOW_ZONES_IN_EDIT_MODE) == "true", + isChecked: Settings.getValue(SETTING_SHOW_ZONES_IN_EDIT_MODE) === "true", grouping: "Advanced" }); @@ -890,7 +945,7 @@ function cleanupModelMenus() { Menu.removeMenuItem("Edit", MENU_SHOW_ZONES_IN_EDIT_MODE); } -Script.scriptEnding.connect(function() { +Script.scriptEnding.connect(function () { Settings.setValue(SETTING_AUTO_FOCUS_ON_SELECT, Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)); Settings.setValue(SETTING_EASE_ON_FOCUS, Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); Settings.setValue(SETTING_SHOW_LIGHTS_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE)); @@ -910,7 +965,7 @@ var lastOrientation = null; var lastPosition = null; // Do some stuff regularly, like check for placement of various overlays -Script.update.connect(function(deltaTime) { +Script.update.connect(function (deltaTime) { progressDialog.move(); selectionDisplay.checkMove(); var dOrientation = Math.abs(Quat.dot(Camera.orientation, lastOrientation) - 1); @@ -927,7 +982,9 @@ Script.update.connect(function(deltaTime) { }); function insideBox(center, dimensions, point) { - return (Math.abs(point.x - center.x) <= (dimensions.x / 2.0)) && (Math.abs(point.y - center.y) <= (dimensions.y / 2.0)) && (Math.abs(point.z - center.z) <= (dimensions.z / 2.0)); + return (Math.abs(point.x - center.x) <= (dimensions.x / 2.0)) && + (Math.abs(point.y - center.y) <= (dimensions.y / 2.0)) && + (Math.abs(point.z - center.z) <= (dimensions.z / 2.0)); } function selectAllEtitiesInCurrentSelectionBox(keepIfTouching) { @@ -939,12 +996,12 @@ function selectAllEtitiesInCurrentSelectionBox(keepIfTouching) { if (!keepIfTouching) { var isValid; - if (selectionManager.localPosition === null) { - isValid = function(position) { + if (selectionManager.localPosition === null || selectionManager.localPosition === undefined) { + isValid = function (position) { return insideBox(selectionManager.worldPosition, selectionManager.worldDimensions, position); - } + }; } else { - isValid = function(position) { + isValid = function (position) { var localPosition = Vec3.multiplyQbyV(Quat.inverse(selectionManager.localRotation), Vec3.subtract(position, selectionManager.localPosition)); @@ -953,7 +1010,7 @@ function selectAllEtitiesInCurrentSelectionBox(keepIfTouching) { y: 0, z: 0 }, selectionManager.localDimensions, localPosition); - } + }; } for (var i = 0; i < entities.length; ++i) { var properties = Entities.getEntityProperties(entities[i]); @@ -1019,19 +1076,19 @@ function toggleSelectedEntitiesVisible() { } function handeMenuEvent(menuItem) { - if (menuItem == "Allow Selecting of Small Models") { + if (menuItem === "Allow Selecting of Small Models") { allowSmallModels = Menu.isOptionChecked("Allow Selecting of Small Models"); - } else if (menuItem == "Allow Selecting of Large Models") { + } else if (menuItem === "Allow Selecting of Large Models") { allowLargeModels = Menu.isOptionChecked("Allow Selecting of Large Models"); - } else if (menuItem == "Allow Selecting of Lights") { + } else if (menuItem === "Allow Selecting of Lights") { Entities.setLightsArePickable(Menu.isOptionChecked("Allow Selecting of Lights")); - } else if (menuItem == "Delete") { + } else if (menuItem === "Delete") { deleteSelectedEntities(); - } else if (menuItem == "Export Entities") { + } else if (menuItem === "Export Entities") { if (!selectionManager.hasSelection()) { Window.alert("No entities have been selected."); } else { - var filename = Window.save("Select Where to Save", "", "*.json") + var filename = Window.save("Select Where to Save", "", "*.json"); if (filename) { var success = Clipboard.exportEntities(filename, selectionManager.selections); if (!success) { @@ -1039,10 +1096,10 @@ function handeMenuEvent(menuItem) { } } } - } else if (menuItem == "Import Entities" || menuItem == "Import Entities from URL") { + } else if (menuItem === "Import Entities" || menuItem === "Import Entities from URL") { var importURL = null; - if (menuItem == "Import Entities") { + if (menuItem === "Import Entities") { var fullPath = Window.browse("Select Model to Import", "", "*.json"); if (fullPath) { importURL = "file:///" + fullPath; @@ -1054,15 +1111,15 @@ function handeMenuEvent(menuItem) { if (importURL) { importSVO(importURL); } - } else if (menuItem == "Entity List...") { + } else if (menuItem === "Entity List...") { entityListTool.toggleVisible(); - } else if (menuItem == "Select All Entities In Box") { + } else if (menuItem === "Select All Entities In Box") { selectAllEtitiesInCurrentSelectionBox(false); - } else if (menuItem == "Select All Entities Touching Box") { + } else if (menuItem === "Select All Entities Touching Box") { selectAllEtitiesInCurrentSelectionBox(true); - } else if (menuItem == MENU_SHOW_LIGHTS_IN_EDIT_MODE) { + } else if (menuItem === MENU_SHOW_LIGHTS_IN_EDIT_MODE) { lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE)); - } else if (menuItem == MENU_SHOW_ZONES_IN_EDIT_MODE) { + } else if (menuItem === MENU_SHOW_ZONES_IN_EDIT_MODE) { Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE)); } tooltip.show(false); @@ -1081,8 +1138,11 @@ function getPositionToCreateEntity() { var HALF_TREE_SCALE = 16384; - var cameraOutOfBounds = Math.abs(cameraPosition.x) > HALF_TREE_SCALE || Math.abs(cameraPosition.y) > HALF_TREE_SCALE || Math.abs(cameraPosition.z) > HALF_TREE_SCALE; - var placementOutOfBounds = Math.abs(placementPosition.x) > HALF_TREE_SCALE || Math.abs(placementPosition.y) > HALF_TREE_SCALE || Math.abs(placementPosition.z) > HALF_TREE_SCALE; + var cameraOutOfBounds = Math.abs(cameraPosition.x) > HALF_TREE_SCALE || Math.abs(cameraPosition.y) > HALF_TREE_SCALE || + Math.abs(cameraPosition.z) > HALF_TREE_SCALE; + var placementOutOfBounds = Math.abs(placementPosition.x) > HALF_TREE_SCALE || + Math.abs(placementPosition.y) > HALF_TREE_SCALE || + Math.abs(placementPosition.z) > HALF_TREE_SCALE; if (cameraOutOfBounds && placementOutOfBounds) { return null; @@ -1096,7 +1156,7 @@ function getPositionToCreateEntity() { } function importSVO(importURL) { - print("Import URL requested: " + importURL) + print("Import URL requested: " + importURL); if (!Entities.canAdjustLocks()) { Window.alert(INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG); return; @@ -1121,7 +1181,7 @@ function importSVO(importURL) { if (Clipboard.getClipboardContentsLargestDimension() < VERY_LARGE) { position = getPositionToCreateEntity(); } - if (position != null) { + if (position !== null && position !== undefined) { var pastedEntityIDs = Clipboard.pasteEntities(position); if (isActive) { @@ -1147,24 +1207,24 @@ Window.svoImportRequested.connect(importSVO); Menu.menuItemEvent.connect(handeMenuEvent); -Controller.keyPressEvent.connect(function(event) { +Controller.keyPressEvent.connect(function (event) { if (isActive) { cameraManager.keyPressEvent(event); } }); -Controller.keyReleaseEvent.connect(function(event) { +Controller.keyReleaseEvent.connect(function (event) { if (isActive) { cameraManager.keyReleaseEvent(event); } // since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items - if (event.text == "BACKSPACE" || event.text == "DELETE") { + if (event.text === "BACKSPACE" || event.text === "DELETE") { deleteSelectedEntities(); - } else if (event.text == "ESC") { + } else if (event.text === "ESC") { selectionManager.clearSelections(); - } else if (event.text == "TAB") { + } else if (event.text === "TAB") { selectionDisplay.toggleSpaceMode(); - } else if (event.text == "f") { + } else if (event.text === "f") { if (isActive) { if (selectionManager.hasSelection()) { cameraManager.enable(); @@ -1173,11 +1233,11 @@ Controller.keyReleaseEvent.connect(function(event) { Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); } } - } else if (event.text == '[') { + } else if (event.text === '[') { if (isActive) { cameraManager.enable(); } - } else if (event.text == 'g') { + } else if (event.text === 'g') { if (isActive && selectionManager.hasSelection()) { var newPosition = selectionManager.worldPosition; newPosition = Vec3.subtract(newPosition, { @@ -1193,30 +1253,31 @@ Controller.keyReleaseEvent.connect(function(event) { // When an entity has been deleted we need a way to "undo" this deletion. Because it's not currently // possible to create an entity with a specific id, earlier undo commands to the deleted entity // will fail if there isn't a way to find the new entity id. -DELETED_ENTITY_MAP = {} +var DELETED_ENTITY_MAP = {}; function applyEntityProperties(data) { var properties = data.setProperties; var selectedEntityIDs = []; - for (var i = 0; i < properties.length; i++) { - var entityID = properties[i].entityID; + var i, entityID; + for (i = 0; i < properties.length; i++) { + entityID = properties[i].entityID; if (DELETED_ENTITY_MAP[entityID] !== undefined) { entityID = DELETED_ENTITY_MAP[entityID]; } Entities.editEntity(entityID, properties[i].properties); selectedEntityIDs.push(entityID); } - for (var i = 0; i < data.createEntities.length; i++) { - var entityID = data.createEntities[i].entityID; - var properties = data.createEntities[i].properties; - var newEntityID = Entities.addEntity(properties); + for (i = 0; i < data.createEntities.length; i++) { + entityID = data.createEntities[i].entityID; + var entityProperties = data.createEntities[i].properties; + var newEntityID = Entities.addEntity(entityProperties); DELETED_ENTITY_MAP[entityID] = newEntityID; if (data.selectCreated) { selectedEntityIDs.push(newEntityID); } } - for (var i = 0; i < data.deleteEntities.length; i++) { - var entityID = data.deleteEntities[i].entityID; + for (i = 0; i < data.deleteEntities.length; i++) { + entityID = data.deleteEntities[i].entityID; if (DELETED_ENTITY_MAP[entityID] !== undefined) { entityID = DELETED_ENTITY_MAP[entityID]; } @@ -1224,7 +1285,7 @@ function applyEntityProperties(data) { } selectionManager.setSelections(selectedEntityIDs); -}; +} // For currently selected entities, push a command to the UndoStack that uses the current entity properties for the // redo command, and the saved properties for the undo command. Also, include create and delete entity data. @@ -1233,13 +1294,13 @@ function pushCommandForSelections(createdEntityData, deletedEntityData) { setProperties: [], createEntities: deletedEntityData || [], deleteEntities: createdEntityData || [], - selectCreated: true, + selectCreated: true }; var redoData = { setProperties: [], createEntities: createdEntityData || [], deleteEntities: deletedEntityData || [], - selectCreated: false, + selectCreated: false }; for (var i = 0; i < SelectionManager.selections.length; i++) { var entityID = SelectionManager.selections[i]; @@ -1253,22 +1314,22 @@ function pushCommandForSelections(createdEntityData, deletedEntityData) { properties: { position: initialProperties.position, rotation: initialProperties.rotation, - dimensions: initialProperties.dimensions, - }, + dimensions: initialProperties.dimensions + } }); redoData.setProperties.push({ entityID: entityID, properties: { position: currentProperties.position, rotation: currentProperties.rotation, - dimensions: currentProperties.dimensions, - }, + dimensions: currentProperties.dimensions + } }); } UndoStack.pushCommand(applyEntityProperties, undoData, applyEntityProperties, redoData); } -PropertiesTool = function(opts) { +var PropertiesTool = function (opts) { var that = {}; var url = Script.resolvePath('html/entityProperties.html'); @@ -1282,14 +1343,14 @@ PropertiesTool = function(opts) { webView.setVisible(visible); - that.setVisible = function(newVisible) { + that.setVisible = function (newVisible) { visible = newVisible; webView.setVisible(visible); }; - selectionManager.addEventListener(function() { - data = { - type: 'update', + selectionManager.addEventListener(function () { + var data = { + type: 'update' }; var selections = []; for (var i = 0; i < selectionManager.selections.length; i++) { @@ -1300,7 +1361,8 @@ PropertiesTool = function(opts) { entity.properties.rotation = Quat.safeEulerAngles(entity.properties.rotation); } if (entity.properties.keyLight !== undefined && entity.properties.keyLight.direction !== undefined) { - entity.properties.keyLight.direction = Vec3.multiply(RADIANS_TO_DEGREES, Vec3.toPolar(entity.properties.keyLight.direction)); + entity.properties.keyLight.direction = Vec3.multiply(RADIANS_TO_DEGREES, + Vec3.toPolar(entity.properties.keyLight.direction)); entity.properties.keyLight.direction.z = 0.0; } selections.push(entity); @@ -1309,20 +1371,21 @@ PropertiesTool = function(opts) { webView.emitScriptEvent(JSON.stringify(data)); }); - webView.webEventReceived.connect(function(data) { + webView.webEventReceived.connect(function (data) { data = JSON.parse(data); - if (data.type == "print") { + var i, properties, dY, diff, newPosition; + if (data.type === "print") { if (data.message) { print(data.message); } - } else if (data.type == "update") { + } else if (data.type === "update") { selectionManager.saveProperties(); if (selectionManager.selections.length > 1) { properties = { locked: data.properties.locked, - visible: data.properties.visible, + visible: data.properties.visible }; - for (var i = 0; i < selectionManager.selections.length; i++) { + for (i = 0; i < selectionManager.selections.length; i++) { Entities.editEntity(selectionManager.selections[i], properties); } } else { @@ -1345,100 +1408,105 @@ PropertiesTool = function(opts) { } if (data.properties.keyLight !== undefined && data.properties.keyLight.direction !== undefined) { data.properties.keyLight.direction = Vec3.fromPolar( - data.properties.keyLight.direction.x * DEGREES_TO_RADIANS, data.properties.keyLight.direction.y * DEGREES_TO_RADIANS); + data.properties.keyLight.direction.x * DEGREES_TO_RADIANS, + data.properties.keyLight.direction.y * DEGREES_TO_RADIANS + ); } Entities.editEntity(selectionManager.selections[0], data.properties); - if (data.properties.name !== undefined || data.properties.modelURL !== undefined || data.properties.visible !== undefined || data.properties.locked !== undefined) { + if (data.properties.name !== undefined || data.properties.modelURL !== undefined || + data.properties.visible !== undefined || data.properties.locked !== undefined) { entityListTool.sendUpdate(); } } pushCommandForSelections(); selectionManager._update(); - } else if (data.type == "showMarketplace") { + } else if (data.type === "showMarketplace") { showMarketplace(); - } else if (data.type == "action") { - if (data.action == "moveSelectionToGrid") { + } else if (data.type === "action") { + if (data.action === "moveSelectionToGrid") { if (selectionManager.hasSelection()) { selectionManager.saveProperties(); - var dY = grid.getOrigin().y - (selectionManager.worldPosition.y - selectionManager.worldDimensions.y / 2); - var diff = { + dY = grid.getOrigin().y - (selectionManager.worldPosition.y - selectionManager.worldDimensions.y / 2); + diff = { x: 0, y: dY, z: 0 }; - for (var i = 0; i < selectionManager.selections.length; i++) { - var properties = selectionManager.savedProperties[selectionManager.selections[i]]; - var newPosition = Vec3.sum(properties.position, diff); + for (i = 0; i < selectionManager.selections.length; i++) { + properties = selectionManager.savedProperties[selectionManager.selections[i]]; + newPosition = Vec3.sum(properties.position, diff); Entities.editEntity(selectionManager.selections[i], { - position: newPosition, + position: newPosition }); } pushCommandForSelections(); selectionManager._update(); } - } else if (data.action == "moveAllToGrid") { + } else if (data.action === "moveAllToGrid") { if (selectionManager.hasSelection()) { selectionManager.saveProperties(); - for (var i = 0; i < selectionManager.selections.length; i++) { - var properties = selectionManager.savedProperties[selectionManager.selections[i]]; + for (i = 0; i < selectionManager.selections.length; i++) { + properties = selectionManager.savedProperties[selectionManager.selections[i]]; var bottomY = properties.boundingBox.center.y - properties.boundingBox.dimensions.y / 2; - var dY = grid.getOrigin().y - bottomY; - var diff = { + dY = grid.getOrigin().y - bottomY; + diff = { x: 0, y: dY, z: 0 }; - var newPosition = Vec3.sum(properties.position, diff); + newPosition = Vec3.sum(properties.position, diff); Entities.editEntity(selectionManager.selections[i], { - position: newPosition, + position: newPosition }); } pushCommandForSelections(); selectionManager._update(); } - } else if (data.action == "resetToNaturalDimensions") { + } else if (data.action === "resetToNaturalDimensions") { if (selectionManager.hasSelection()) { selectionManager.saveProperties(); - for (var i = 0; i < selectionManager.selections.length; i++) { - var properties = selectionManager.savedProperties[selectionManager.selections[i]]; + for (i = 0; i < selectionManager.selections.length; i++) { + properties = selectionManager.savedProperties[selectionManager.selections[i]]; var naturalDimensions = properties.naturalDimensions; // If any of the natural dimensions are not 0, resize - if (properties.type == "Model" && naturalDimensions.x == 0 && naturalDimensions.y == 0 && naturalDimensions.z == 0) { - Window.alert("Cannot reset entity to its natural dimensions: Model URL" + " is invalid or the model has not yet been loaded."); + if (properties.type === "Model" && naturalDimensions.x === 0 && naturalDimensions.y === 0 && + naturalDimensions.z === 0) { + Window.alert("Cannot reset entity to its natural dimensions: Model URL" + + " is invalid or the model has not yet been loaded."); } else { Entities.editEntity(selectionManager.selections[i], { - dimensions: properties.naturalDimensions, + dimensions: properties.naturalDimensions }); } } pushCommandForSelections(); selectionManager._update(); } - } else if (data.action == "previewCamera") { + } else if (data.action === "previewCamera") { if (selectionManager.hasSelection()) { Camera.mode = "entity"; Camera.cameraEntity = selectionManager.selections[0]; } - } else if (data.action == "rescaleDimensions") { + } else if (data.action === "rescaleDimensions") { var multiplier = data.percentage / 100; if (selectionManager.hasSelection()) { selectionManager.saveProperties(); - for (var i = 0; i < selectionManager.selections.length; i++) { - var properties = selectionManager.savedProperties[selectionManager.selections[i]]; + for (i = 0; i < selectionManager.selections.length; i++) { + properties = selectionManager.savedProperties[selectionManager.selections[i]]; Entities.editEntity(selectionManager.selections[i], { - dimensions: Vec3.multiply(multiplier, properties.dimensions), + dimensions: Vec3.multiply(multiplier, properties.dimensions) }); } pushCommandForSelections(); selectionManager._update(); } - } else if (data.action == "reloadScript") { + } else if (data.action === "reloadScript") { if (selectionManager.hasSelection()) { var timestamp = Date.now(); - for (var i = 0; i < selectionManager.selections.length; i++) { + for (i = 0; i < selectionManager.selections.length; i++) { Entities.editEntity(selectionManager.selections[i], { - scriptTimestamp: timestamp, + scriptTimestamp: timestamp }); } } @@ -1449,7 +1517,7 @@ PropertiesTool = function(opts) { return that; }; -PopupMenu = function() { +var PopupMenu = function () { var self = this; var MENU_ITEM_HEIGHT = 21; @@ -1475,9 +1543,9 @@ PopupMenu = function() { blue: 128 }; - self.onSelectMenuItem = function() {}; + self.onSelectMenuItem = function () {}; - self.addMenuItem = function(name) { + self.addMenuItem = function (name) { var id = Overlays.addOverlay("text", { text: name, backgroundAlpha: 1.0, @@ -1489,7 +1557,7 @@ PopupMenu = function() { font: { size: 12 }, - visible: false, + visible: false }); overlays.push(id); overlayInfo[id] = { @@ -1498,28 +1566,28 @@ PopupMenu = function() { return id; }; - self.updateMenuItemText = function(id, newText) { + self.updateMenuItemText = function (id, newText) { Overlays.editOverlay(id, { text: newText }); }; - self.setPosition = function(x, y) { + self.setPosition = function (x, y) { for (var key in overlayInfo) { Overlays.editOverlay(key, { x: x, - y: y, + y: y }); y += MENU_ITEM_HEIGHT + MENU_ITEM_SPACING; } }; - self.onSelected = function() {}; + self.onSelected = function () {}; var pressingOverlay = null; var hoveringOverlay = null; - self.mousePressEvent = function(event) { + self.mousePressEvent = function (event) { if (event.isLeftButton) { var overlay = Overlays.getOverlayAtPoint({ x: event.x, @@ -1536,20 +1604,20 @@ PopupMenu = function() { return false; } }; - self.mouseMoveEvent = function(event) { + self.mouseMoveEvent = function (event) { if (visible) { var overlay = Overlays.getOverlayAtPoint({ x: event.x, y: event.y }); if (!pressingOverlay) { - if (hoveringOverlay != null && overlay != hoveringOverlay) { + if (hoveringOverlay !== null && hoveringOverlay !== null && overlay !== hoveringOverlay) { Overlays.editOverlay(hoveringOverlay, { backgroundColor: upColor }); hoveringOverlay = null; } - if (overlay != hoveringOverlay && overlay in overlayInfo) { + if (overlay !== hoveringOverlay && overlay in overlayInfo) { Overlays.editOverlay(overlay, { backgroundColor: overColor }); @@ -1559,13 +1627,13 @@ PopupMenu = function() { } return false; }; - self.mouseReleaseEvent = function(event) { + self.mouseReleaseEvent = function (event) { var overlay = Overlays.getOverlayAtPoint({ x: event.x, y: event.y }); - if (pressingOverlay != null) { - if (overlay == pressingOverlay) { + if (pressingOverlay !== null && pressingOverlay !== undefined) { + if (overlay === pressingOverlay) { self.onSelectMenuItem(overlayInfo[overlay].name); } Overlays.editOverlay(pressingOverlay, { @@ -1578,8 +1646,8 @@ PopupMenu = function() { var visible = false; - self.setVisible = function(newVisible) { - if (newVisible != visible) { + self.setVisible = function (newVisible) { + if (newVisible !== visible) { visible = newVisible; for (var key in overlayInfo) { Overlays.editOverlay(key, { @@ -1587,13 +1655,13 @@ PopupMenu = function() { }); } } - } - self.show = function() { + }; + self.show = function () { self.setVisible(true); - } - self.hide = function() { + }; + self.hide = function () { self.setVisible(false); - } + }; function cleanup() { for (var i = 0; i < overlays.length; i++) { @@ -1610,9 +1678,9 @@ PopupMenu = function() { }; -var propertyMenu = PopupMenu(); +var propertyMenu = new PopupMenu(); -propertyMenu.onSelectMenuItem = function(name) { +propertyMenu.onSelectMenuItem = function (name) { if (propertyMenu.marketplaceID) { showMarketplace(propertyMenu.marketplaceID); @@ -1621,12 +1689,12 @@ propertyMenu.onSelectMenuItem = function(name) { var showMenuItem = propertyMenu.addMenuItem("Show in Marketplace"); -propertiesTool = PropertiesTool(); -var particleExplorerTool = ParticleExplorerTool(); +var propertiesTool = new PropertiesTool(); +var particleExplorerTool = new ParticleExplorerTool(); var selectedParticleEntity = 0; -entityListTool.webView.webEventReceived.connect(function(data) { - var data = JSON.parse(data); - if (data.type == "selectionUpdate") { +entityListTool.webView.webEventReceived.connect(function (data) { + data = JSON.parse(data); + if (data.type === "selectionUpdate") { var ids = data.entityIds; if (ids.length === 1) { if (Entities.getEntityProperties(ids[0], "type").type === "ParticleEffect") { @@ -1645,8 +1713,8 @@ entityListTool.webView.webEventReceived.connect(function(data) { selectedParticleEntity = ids[0]; particleExplorerTool.setActiveParticleEntity(ids[0]); - particleExplorerTool.webView.webEventReceived.connect(function(data) { - var data = JSON.parse(data); + particleExplorerTool.webView.webEventReceived.connect(function (data) { + data = JSON.parse(data); if (data.messageType === "page_loaded") { particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData)); }