From 6a218eaca93d3db7cb47c89fe4ed55078969b946 Mon Sep 17 00:00:00 2001 From: Andrew Lowry Date: Mon, 24 Apr 2017 13:33:43 -0400 Subject: [PATCH] Embeds colpick color picker in dat.GUI for particle explorer. Cleans up eslint for particleExplorer.js. --- .../resources/qml/hifi/tablet/EditTabView.qml | 2 +- .../particle_explorer/particleExplorer.html | 16 +++ .../particle_explorer/particleExplorer.js | 119 +++++++++++------- 3 files changed, 89 insertions(+), 48 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml index 3e63f372e5..302a0d2b9b 100644 --- a/interface/resources/qml/hifi/tablet/EditTabView.qml +++ b/interface/resources/qml/hifi/tablet/EditTabView.qml @@ -65,7 +65,7 @@ TabView { editRoot.sendToScript({ method: "newEntityButtonClicked", params: { buttonName: "newCubeButton" } }); - editBasePage.index = 3 + editTabView.currentIndex = 2 } } diff --git a/scripts/system/particle_explorer/particleExplorer.html b/scripts/system/particle_explorer/particleExplorer.html index d12ceac14b..d0d86d79da 100644 --- a/scripts/system/particle_explorer/particleExplorer.html +++ b/scripts/system/particle_explorer/particleExplorer.html @@ -14,10 +14,13 @@ --> + + +