phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

render fields, links and portals in separate passes

Browse Source 
this keeps the display order close to correct while data loads
This commit is contained in:
Jon Atkins 2014-01-28 02:07:30 +00:00
parent 9754af9e67
commit a168991f74
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
code/map_data_render.js
View File

@ -107,24 +107,35 @@ window.Render.prototype.processDeletedGameEntityGuids = function(deleted) {
window.Render.prototype.processGameEntities = function(entities) { window.Render.prototype.processGameEntities = function(entities) {
// we loop through the entities three times - for fields, links and portals separately
// this is a reasonably efficient work-around for leafletjs limitations on svg render order
for (var i in entities) { for (var i in entities) {
var ent = entities[i]; var ent = entities[i];
// don't create entities in the 'deleted' list if (ent[2].type == 'region' && !(ent[0] in this.deletedGuid)) {
if (!(ent[0] in this.deletedGuid)) { this.createFieldEntity(ent);
this.createEntity(ent); }
}
for (var i in entities) {
var ent = entities[i];
if (ent[2].type == 'edge' && !(ent[0] in this.deletedGuid)) {
this.createLinkEntity(ent);
}
}
for (var i in entities) {
var ent = entities[i];
if (ent[2].type == 'portal' && !(ent[0] in this.deletedGuid)) {
this.createPortalEntity(ent);
} }
} }
//TODO: better method to bring portals to front during rendering
//as it stands, rendering from cache causes multiple passes through bringToFront - which is a waste
//possible options:
//1. add fields, links and portals in the order they should be rendered. will be close to right while rendering, and
// a final bringPortalsToFront call can fix up any errors
//2. run bringPortalsToFront on a short timer, so it's not immediate after render.
// // reorder portals to be after links/fields
// this.bringPortalsToFront();
} }
@ -227,32 +238,6 @@ window.Render.prototype.deleteFieldEntity = function(guid) {
} }
window.Render.prototype.createEntity = function(ent) {
// ent[0] == guid
// ent[1] == mtime
// ent[2] == data
// logic on detecting entity type based on the stock site javascript.
switch (ent[2].type) {
case 'portal':
this.createPortalEntity(ent);
break;
case 'edge':
this.createLinkEntity(ent);
break;
case 'region':
this.createFieldEntity(ent);
break;
default:
console.warn('unknown entity found: '+JSON.stringify(ent));
break;
}
}
window.Render.prototype.createPortalEntity = function(ent) { window.Render.prototype.createPortalEntity = function(ent) {