Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 23:01:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix syntax and duplicate event handlers in entityList.js

Browse source
This commit is contained in:
Ryan Huffman 2018-09-10 16:44:13 -07:00
parent 5aa5552727
commit 4b8f5ea6b9
2 changed files with 45 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/system/html/js/entityList.js
View file

@ -137,7 +137,7 @@ function loaded() {
let clickedItemFound = -1; let clickedItemFound = -1;
for (let i = 0, len = visibleEntities.length; i < len; ++i) { for (let i = 0, len = visibleEntities.length; i < len; ++i) {
let entity = visibleEntities[i]; let entity = visibleEntities[i];
if (clickedItemFound === -1 && entityID == entity.id) { if (clickedItemFound === -1 && entityID === entity.id) {
clickedItemFound = i; clickedItemFound = i;
} else if (previousItemFound === -1 && selectedEntities[0] === entity.id) { } else if (previousItemFound === -1 && selectedEntities[0] === entity.id) {
previousItemFound = i; previousItemFound = i;
@ -201,10 +201,6 @@ function loaded() {
return urlParts[urlParts.length - 1]; return urlParts[urlParts.length - 1];
} }
elFilter.onkeyup = refreshEntityList;
elFilter.onpaste = refreshEntityList;
elFilter.onchange = refreshEntityList;
// Update the entity list with the new set of data sent from edit.js // Update the entity list with the new set of data sent from edit.js
function updateEntityList(entityData) { function updateEntityList(entityData) {
const IMAGE_MODEL_NAME = 'default-image-model.fbx'; const IMAGE_MODEL_NAME = 'default-image-model.fbx';
@ -482,7 +478,7 @@ function loaded() {
} else if (data.type === "update" && data.selectedIDs !== undefined) { } else if (data.type === "update" && data.selectedIDs !== undefined) {
PROFILE("update", function() { PROFILE("update", function() {
var newEntities = data.entities; var newEntities = data.entities;
if (newEntities && newEntities.length == 0) { if (newEntities && newEntities.length === 0) {
elNoEntitiesMessage.style.display = "block"; elNoEntitiesMessage.style.display = "block";
elFooter.firstChild.nodeValue = "0 entities found"; elFooter.firstChild.nodeValue = "0 entities found";
} else if (newEntities) { } else if (newEntities) {
@ -540,7 +536,13 @@ function loaded() {
}; };
window.onresize = resize; window.onresize = resize;
elFilter.onchange = resize;
elFilter.onkeyup = refreshEntityList;
elFilter.onpaste = refreshEntityList;
elFilter.onchange = function() {
refreshEntityList();
resize();
};
elFilter.onblur = refreshFooter; elFilter.onblur = refreshFooter;

72
scripts/system/libraries/entityList.js
View file

@ -142,49 +142,49 @@ EntityListTool = function(shouldUseEditTabletApp) {
var ids; var ids;
PROFILE("findEntities", function() { PROFILE("findEntities", function() {
if (filterInView) { if (filterInView) {
ids = Entities.findEntitiesInFrustum(Camera.frustum); ids = Entities.findEntitiesInFrustum(Camera.frustum);
} else { } else {
ids = Entities.findEntities(MyAvatar.position, searchRadius); ids = Entities.findEntities(MyAvatar.position, searchRadius);
} }
}); });
var cameraPosition = Camera.position; var cameraPosition = Camera.position;
PROFILE("getProperties", function() { PROFILE("getProperties", function() {
for (var i = 0; i < ids.length; i++) { for (var i = 0; i < ids.length; i++) {
var id = ids[i]; var id = ids[i];
var properties = Entities.getEntityProperties(id, ['name', 'type', 'locked', var properties = Entities.getEntityProperties(id, ['name', 'type', 'locked',
'visible', 'renderInfo', 'type', 'modelURL', 'materialURL', 'script']); 'visible', 'renderInfo', 'type', 'modelURL', 'materialURL', 'script']);
if (!filterInView || Vec3.distance(properties.position, cameraPosition) <= searchRadius) { if (!filterInView || Vec3.distance(properties.position, cameraPosition) <= searchRadius) {
var url = ""; var url = "";
if (properties.type === "Model") { if (properties.type === "Model") {
url = properties.modelURL; url = properties.modelURL;
} else if (properties.type === "Material") { } else if (properties.type === "Material") {
url = properties.materialURL; url = properties.materialURL;
}
entities.push({
id: id,
name: properties.name,
type: properties.type,
url: url,
locked: properties.locked,
visible: properties.visible,
verticesCount: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.verticesCount) : ""),
texturesCount: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.texturesCount) : ""),
texturesSize: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.texturesSize) : ""),
hasTransparent: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.hasTransparent) : ""),
isBaked: properties.type === "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
drawCalls: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.drawCalls) : ""),
hasScript: properties.script !== ""
});
} }
entities.push({
id: id,
name: properties.name,
type: properties.type,
url: url,
locked: properties.locked,
visible: properties.visible,
verticesCount: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.verticesCount) : ""),
texturesCount: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.texturesCount) : ""),
texturesSize: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.texturesSize) : ""),
hasTransparent: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.hasTransparent) : ""),
isBaked: properties.type === "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
drawCalls: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.drawCalls) : ""),
hasScript: properties.script !== ""
});
} }
}
}); });
var selectedIDs = []; var selectedIDs = [];