From 1880b263d43effe80eca2522c2606dffd5097a7a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 27 Aug 2015 11:09:55 -0700 Subject: [PATCH 1/5] Add entity search radius field to entities list --- examples/html/entityList.html | 1 + examples/html/style.css | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/examples/html/entityList.html b/examples/html/entityList.html index 62bbbd08a6..9554ba7c02 100644 --- a/examples/html/entityList.html +++ b/examples/html/entityList.html @@ -226,6 +226,7 @@
+  m
diff --git a/examples/html/style.css b/examples/html/style.css index e63b6338fc..3614ea821b 100644 --- a/examples/html/style.css +++ b/examples/html/style.css @@ -102,13 +102,23 @@ input[type=button] { } #search-area { - width: 100%; padding: 0.5em; box-sizing: border-box; + padding-right: 6em; } -#search-area input { - width: 100%; +#filter { + width: 99%; +} + +#radius-and-unit { + width: 6em; + float: right; + margin-right: -6em; +} + +#radius { + width: 4em; } textarea, input { From d628a88f5219c36e2f594ab1310eebf78172bf16 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 27 Aug 2015 11:10:20 -0700 Subject: [PATCH 2/5] Fix some invalid HTML --- examples/html/entityList.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/html/entityList.html b/examples/html/entityList.html index 9554ba7c02..9d53d3c12d 100644 --- a/examples/html/entityList.html +++ b/examples/html/entityList.html @@ -218,9 +218,9 @@
- - - + + +
From a553022adf6287af5c72839e1eb62e86e5f7eeb2 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 27 Aug 2015 11:11:05 -0700 Subject: [PATCH 3/5] Update entities list as search radius value is changed --- examples/html/entityList.html | 11 ++++++++++- examples/libraries/entityList.js | 7 ++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/examples/html/entityList.html b/examples/html/entityList.html index 9d53d3c12d..d7524c199c 100644 --- a/examples/html/entityList.html +++ b/examples/html/entityList.html @@ -20,7 +20,9 @@ elRefresh = document.getElementById("refresh"); elDelete = document.getElementById("delete"); elTeleport = document.getElementById("teleport"); + elRadius = document.getElementById("radius"); elNoEntitiesMessage = document.getElementById("no-entities"); + elNoEntitiesRadius = document.getElementById("no-entities-radius"); document.getElementById("entity-name").onclick = function() { setSortColumn('name'); @@ -186,6 +188,13 @@ } }, false); + elRadius.onchange = function () { + elRadius.value = Math.max(elRadius.value, 0); + EventBridge.emitWebEvent(JSON.stringify({ type: 'radius', radius: elRadius.value })); + refreshEntities(); + elNoEntitiesRadius.firstChild.nodeValue = elRadius.value; + } + if (window.EventBridge !== undefined) { EventBridge.scriptEventReceived.connect(function(data) { data = JSON.parse(data); @@ -247,7 +256,7 @@
- No entities found within 50 meter radius. Try moving to a different location and refreshing. + No entities found within a 50 meter radius. Try moving to a different location and refreshing.
diff --git a/examples/libraries/entityList.js b/examples/libraries/entityList.js index 241ffb2766..e6bca9e7e1 100644 --- a/examples/libraries/entityList.js +++ b/examples/libraries/entityList.js @@ -4,6 +4,8 @@ EntityListTool = function(opts) { var url = Script.resolvePath('html/entityList.html'); var webView = new WebWindow('Entities', url, 200, 280, true); + var searchDiameter = 100; + var visible = false; webView.setVisible(visible); @@ -33,7 +35,7 @@ EntityListTool = function(opts) { that.sendUpdate = function() { var entities = []; - var ids = Entities.findEntities(MyAvatar.position, 100); + var ids = Entities.findEntities(MyAvatar.position, searchDiameter); for (var i = 0; i < ids.length; i++) { var id = ids[i]; var properties = Entities.getEntityProperties(id); @@ -80,6 +82,9 @@ EntityListTool = function(opts) { } } else if (data.type == "delete") { deleteSelectedEntities(); + } else if (data.type === "radius") { + searchDiameter = 2 * data.radius; + that.sendUpdate(); } }); From 005851a74a3e66d520cefe120b8dad811f56cf7d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 27 Aug 2015 12:13:04 -0700 Subject: [PATCH 4/5] Increase default entity search radius to 100m --- examples/html/entityList.html | 4 ++-- examples/libraries/entityList.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/html/entityList.html b/examples/html/entityList.html index d7524c199c..2e3fdb1874 100644 --- a/examples/html/entityList.html +++ b/examples/html/entityList.html @@ -235,7 +235,7 @@
-  m +  m
@@ -256,7 +256,7 @@
- No entities found within a 50 meter radius. Try moving to a different location and refreshing. + No entities found within a 100 meter radius. Try moving to a different location and refreshing.
diff --git a/examples/libraries/entityList.js b/examples/libraries/entityList.js index e6bca9e7e1..55262c745d 100644 --- a/examples/libraries/entityList.js +++ b/examples/libraries/entityList.js @@ -4,7 +4,7 @@ EntityListTool = function(opts) { var url = Script.resolvePath('html/entityList.html'); var webView = new WebWindow('Entities', url, 200, 280, true); - var searchDiameter = 100; + var searchDiameter = 200; var visible = false; From e2ee074b7a5890aa28e9ce1634aed78b5af6181e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 31 Aug 2015 13:51:03 -0700 Subject: [PATCH 5/5] Entity search uses radius, not diameter --- examples/libraries/entityList.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/libraries/entityList.js b/examples/libraries/entityList.js index 55262c745d..12d325db50 100644 --- a/examples/libraries/entityList.js +++ b/examples/libraries/entityList.js @@ -4,7 +4,7 @@ EntityListTool = function(opts) { var url = Script.resolvePath('html/entityList.html'); var webView = new WebWindow('Entities', url, 200, 280, true); - var searchDiameter = 200; + var searchRadius = 100; var visible = false; @@ -35,7 +35,7 @@ EntityListTool = function(opts) { that.sendUpdate = function() { var entities = []; - var ids = Entities.findEntities(MyAvatar.position, searchDiameter); + var ids = Entities.findEntities(MyAvatar.position, searchRadius); for (var i = 0; i < ids.length; i++) { var id = ids[i]; var properties = Entities.getEntityProperties(id); @@ -83,7 +83,7 @@ EntityListTool = function(opts) { } else if (data.type == "delete") { deleteSelectedEntities(); } else if (data.type === "radius") { - searchDiameter = 2 * data.radius; + searchRadius = data.radius; that.sendUpdate(); } });