From 3bb65edafb542b070e4750d48ccab2189b2bbecb Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 2 Nov 2019 09:51:21 +1300 Subject: [PATCH 1/5] Fix Cmd-click multi-select in entity list on Mac --- scripts/system/create/entityList/html/js/entityList.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js index b15c4e6703..cda38b879c 100644 --- a/scripts/system/create/entityList/html/js/entityList.js +++ b/scripts/system/create/entityList/html/js/entityList.js @@ -541,8 +541,9 @@ function loaded() { function onRowClicked(clickEvent) { let entityID = this.dataset.entityID; let selection = [entityID]; + let controlKey = window.navigator.platform.startsWith("Mac") ? clickeEvent.metaKey : clickEvent.ctrlKey; - if (clickEvent.ctrlKey) { + if (controlKey) { let selectedIndex = selectedEntities.indexOf(entityID); if (selectedIndex >= 0) { selection = []; @@ -573,7 +574,7 @@ function loaded() { selection.reverse(); } } - } else if (!clickEvent.ctrlKey && !clickEvent.shiftKey && selectedEntities.length === 1) { + } else if (!controlKey && !clickEvent.shiftKey && selectedEntities.length === 1) { // if reselecting the same entity then start renaming it if (selectedEntities[0] === entityID) { if (renameLastBlur && renameLastEntityID === entityID && (Date.now() - renameLastBlur) < RENAME_COOLDOWN) { From 4e127502555e7b231376461a1707882a6c54d2e2 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 2 Nov 2019 11:00:16 +1300 Subject: [PATCH 2/5] Typo --- scripts/system/create/entityList/html/js/entityList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js index cda38b879c..c845a7dad4 100644 --- a/scripts/system/create/entityList/html/js/entityList.js +++ b/scripts/system/create/entityList/html/js/entityList.js @@ -541,7 +541,7 @@ function loaded() { function onRowClicked(clickEvent) { let entityID = this.dataset.entityID; let selection = [entityID]; - let controlKey = window.navigator.platform.startsWith("Mac") ? clickeEvent.metaKey : clickEvent.ctrlKey; + let controlKey = window.navigator.platform.startsWith("Mac") ? clickEvent.metaKey : clickEvent.ctrlKey; if (controlKey) { let selectedIndex = selectedEntities.indexOf(entityID); From a8173e94776d45571513a02297c5999043471cc5 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 5 Nov 2019 13:55:31 +1300 Subject: [PATCH 3/5] Remove "user" icon from Entity List --- scripts/system/create/entityList/entityList.js | 17 ----------------- .../create/entityList/html/entityList.html | 1 - .../create/entityList/html/js/entityList.js | 5 ----- 3 files changed, 23 deletions(-) diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js index 06e100f457..54a39bd165 100644 --- a/scripts/system/create/entityList/entityList.js +++ b/scripts/system/create/entityList/entityList.js @@ -275,23 +275,6 @@ EntityListTool = function(shouldUseEditTabletApp) { Window.saveFileChanged.connect(onFileSaveChanged); Window.saveAsync("Select Where to Save", "", "*.json"); } - } else if (data.type === "pal") { - var sessionIds = {}; // Collect the sessionsIds of all selected entities, w/o duplicates. - selectionManager.selections.forEach(function (id) { - var lastEditedBy = Entities.getEntityProperties(id, 'lastEditedBy').lastEditedBy; - if (lastEditedBy) { - sessionIds[lastEditedBy] = true; - } - }); - var dedupped = Object.keys(sessionIds); - if (!selectionManager.selections.length) { - Window.alert('No objects selected.'); - } else if (!dedupped.length) { - Window.alert('There were no recent users of the ' + selectionManager.selections.length + ' selected objects.'); - } else { - // No need to subscribe if we're just sending. - Messages.sendMessage('com.highfidelity.pal', JSON.stringify({method: 'select', params: [dedupped, true, false]}), 'local'); - } } else if (data.type === "delete") { deleteSelectedEntities(); } else if (data.type === "toggleLocked") { diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html index 3e17a66df5..b7ff7cd4e4 100644 --- a/scripts/system/create/entityList/html/entityList.html +++ b/scripts/system/create/entityList/html/entityList.html @@ -29,7 +29,6 @@ - diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js index b15c4e6703..e4dc40e44a 100644 --- a/scripts/system/create/entityList/html/js/entityList.js +++ b/scripts/system/create/entityList/html/js/entityList.js @@ -209,7 +209,6 @@ let elEntityTable, elFilterInView, elFilterRadius, elExport, - elPal, elSelectedEntitiesCount, elVisibleEntitiesCount, elNoEntitiesMessage, @@ -254,7 +253,6 @@ function loaded() { elFilterInView = document.getElementById("filter-in-view"); elFilterRadius = document.getElementById("filter-radius"); elExport = document.getElementById("export"); - elPal = document.getElementById("pal"); elSelectedEntitiesCount = document.getElementById("selected-entities-count"); elVisibleEntitiesCount = document.getElementById("visible-entities-count"); elNoEntitiesMessage = document.getElementById("no-entities"); @@ -272,9 +270,6 @@ function loaded() { elExport.onclick = function() { EventBridge.emitWebEvent(JSON.stringify({ type: 'export'})); }; - elPal.onclick = function() { - EventBridge.emitWebEvent(JSON.stringify({ type: 'pal' })); - }; elDelete.onclick = function() { EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' })); }; From 6e7f2226083a4c4455ea9302fe01f254726e6a90 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 5 Nov 2019 14:16:10 -0800 Subject: [PATCH 4/5] Fix for assert in AnimBlendDirectional on startup Specifically, std::vector subscript out of range. --- libraries/animation/src/AnimBlendDirectional.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/animation/src/AnimBlendDirectional.cpp b/libraries/animation/src/AnimBlendDirectional.cpp index 4e7c67f276..4cc67683da 100644 --- a/libraries/animation/src/AnimBlendDirectional.cpp +++ b/libraries/animation/src/AnimBlendDirectional.cpp @@ -96,7 +96,9 @@ const AnimPoseVec& AnimBlendDirectional::evaluate(const AnimVariantMap& animVars } } _poses.resize(minSize); - blend4(minSize, &poseVecs[0][0], &poseVecs[1][0], &poseVecs[2][0], &poseVecs[3][0], &alphas[0], &_poses[0]); + if (minSize > 0) { + blend4(minSize, &poseVecs[0][0], &poseVecs[1][0], &poseVecs[2][0], &poseVecs[3][0], &alphas[0], &_poses[0]); + } // animation stack debug stats for (int i = 0; i < 9; i++) { From 86b62f921d40c45790f0646a63df16b708010b2c Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 7 Nov 2019 14:01:50 -0800 Subject: [PATCH 5/5] Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it --- libraries/render-utils/src/RenderShadowTask.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp index 0d0b776074..22decb47a7 100755 --- a/libraries/render-utils/src/RenderShadowTask.cpp +++ b/libraries/render-utils/src/RenderShadowTask.cpp @@ -257,7 +257,9 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con ShapeKey::Builder(), ShapeKey::Builder().withFade(), ShapeKey::Builder().withDeformed(), ShapeKey::Builder().withDeformed().withFade(), ShapeKey::Builder().withDeformed().withDualQuatSkinned(), ShapeKey::Builder().withDeformed().withDualQuatSkinned().withFade(), - ShapeKey::Builder().withOwnPipeline(), ShapeKey::Builder().withOwnPipeline().withFade() + ShapeKey::Builder().withOwnPipeline(), ShapeKey::Builder().withOwnPipeline().withFade(), + ShapeKey::Builder().withDeformed().withOwnPipeline(), ShapeKey::Builder().withDeformed().withOwnPipeline().withFade(), + ShapeKey::Builder().withDeformed().withDualQuatSkinned().withOwnPipeline(), ShapeKey::Builder().withDeformed().withDualQuatSkinned().withOwnPipeline().withFade(), }; std::vector> sortedShapeKeys(keys.size());