archive-gh-me/WebWorldWind
1
0
Fork 0
mirror of https://github.com/NASAWorldWind/WebWorldWind.git synced 2026-02-01 16:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Removed unnecessary complexity in SurfaceShapeTileBuilder

Browse Source 
- Removed unnecessary logic from SurfaceShapeTileBuilder.addIntersectingShapes
- Removed unnecessary methods from SurfaceShapeTile
- Fixes #83
This commit is contained in:
pdavidc 2017-02-24 12:22:01 -08:00
parent 3ffedbf613
commit 8ab0f910e7
2 changed files with 30 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shapes/SurfaceShapeTile.js
View File

@ -129,17 +129,6 @@ define([
this.surfaceShapeStateKeys.push(surfaceShape.stateKey);
};
/**
* Add multiple surface shapes to this tile's collection.
* @param {SurfaceShape[]} shapes A collection of surface shapes to add to the collection of this tile.
*/
SurfaceShapeTile.prototype.addAllSurfaceShapes = function (shapes) {
for (var idx = 0, len = shapes.length; idx < len; idx += 1) {
var shape = shapes[idx];
this.addAllSurfaceShapes(shape);
}
};
// Internal use only. Intentionally not documented.
SurfaceShapeTile.prototype.needsUpdate = function (dc) {
var idx, len, surfaceShape, surfaceShapeStateKey;
@ -196,12 +185,11 @@ define([
return false;
}
var gpuResourceCache = dc.gpuResourceCache;
if (!this.gpuCacheKey) {
this.gpuCacheKey = this.getCacheKey();
}
var gpuResourceCache = dc.gpuResourceCache;
var texture = gpuResourceCache.resourceForKey(this.gpuCacheKey);
return !!texture;
@ -214,13 +202,12 @@ define([
*/
SurfaceShapeTile.prototype.updateTexture = function (dc) {
var gl = dc.currentGlContext,
canvas = SurfaceShapeTile.canvas;
canvas = SurfaceShapeTile.canvas,
ctx2D = SurfaceShapeTile.ctx2D;
canvas.width = this.tileWidth;
canvas.height = this.tileHeight;
var ctx2D = SurfaceShapeTile.ctx2D;
// Mapping from lat/lon to x/y:
// lon = minlon => x = 0
// lon = maxLon => x = 256
@ -242,12 +229,10 @@ define([
shape.renderToTexture(dc, ctx2D, xScale, yScale, xOffset, yOffset);
}
var texture = new Texture(gl, canvas);
var gpuResourceCache = dc.gpuResourceCache;
this.gpuCacheKey = this.getCacheKey();
var gpuResourceCache = dc.gpuResourceCache;
var texture = new Texture(gl, canvas);
gpuResourceCache.putResource(this.gpuCacheKey, texture, texture.size);
return texture;

70
src/shapes/SurfaceShapeTileBuilder.js
View File

@ -127,7 +127,7 @@ define([
/**
* Insert a surface shape to be rendered into the surface shape tile builder.
*
*
* @param {SurfaceShape} surfaceShape A surfave shape to be processed.
*/
SurfaceShapeTileBuilder.prototype.insertSurfaceShape = function(surfaceShape) {
@ -137,7 +137,7 @@ define([
/**
* Perform the rendering of any accumulated surface shapes by building the surface shape tiles that contain these
* shapes and then rendering those tiles.
*
*
* @param {DrawContext} dc The drawing context.
*/
SurfaceShapeTileBuilder.prototype.doRender = function(dc) {
@ -256,7 +256,7 @@ define([
/**
* Assembles the surface tiles and draws any surface shapes that have been accumulated into those offscreen tiles. The
* surface tiles are assembled to meet the necessary resolution of to the draw context's.
* surface tiles are assembled to meet the necessary resolution of to the draw context's.
* <p/>
* This does nothing if there are no surface shapes associated with this builder.
*
@ -363,10 +363,10 @@ define([
*
* @param {DrawContext} dc The current DrawContext.
* @param {LevelSet} levels The tile's LevelSet.
* @param {SurfaceShapeTile} parent The tile's parent, or null if the tile is a top level tile.
* @param {SurfaceShapeTile} parentTile The tile's parent, or null if the tile is a top level tile.
* @param {SurfaceShapeTile} tile The tile to add.
*/
SurfaceShapeTileBuilder.prototype.addTileOrDescendants = function (dc, levels, parent, tile) {
SurfaceShapeTileBuilder.prototype.addTileOrDescendants = function (dc, levels, parentTile, tile) {
// Ignore this tile if it falls completely outside the frustum. This may be the viewing frustum or the pick
// frustum, depending on the implementation.
if (!this.intersectsFrustum(dc, tile)) {
@ -377,8 +377,8 @@ define([
}
// If the parent tile is not null, add any parent surface shapes that intersect this tile.
if (parent != null) {
this.addIntersectingShapes(dc, parent, tile);
if (parentTile != null) {
this.addIntersectingShapes(dc, parentTile, tile);
}
// Ignore tiles that do not intersect any surface shapes.
@ -408,51 +408,31 @@ define([
};
/**
* Adds surface shapes from the parent's object list to the specified tile's object list. If the tile's sector
* does not intersect the sector bounding the parent's object list, this does nothing. Otherwise, this adds any of
* the parent's surface shapes that intersect the tile's sector to the tile's object list.
* Adds surface shapes from the parent's object list to the specified tile's object list. Adds any of the
* parent's surface shapes that intersect the tile's sector to the tile's object list.
*
* @param {DrawContext} dc The current DrawContext.
* @param {SurfaceShapeTile} parent The tile's parent.
* @param {SurfaceShapeTile} parentTile The tile's parent.
* @param {SurfaceShapeTile} tile The tile to add intersecting surface shapes to.
*/
SurfaceShapeTileBuilder.prototype.addIntersectingShapes = function(dc, parent, tile) {
// If the parent has no objects, then there's nothing to add to this tile and we exit immediately.
if (!parent.hasShapes())
return;
SurfaceShapeTileBuilder.prototype.addIntersectingShapes = function (dc, parentTile, tile) {
var shapes = parentTile.getShapes();
for (var idxShape = 0, lenShapes = shapes.length; idxShape < lenShapes; idxShape += 1) {
var shape = shapes[idxShape];
// If this tile does not intersect the parent's object bounding sector, then none of the parent's objects
// intersect this tile. Therefore we exit immediately, and do not add any objects to this tile.
if (!tile.sector.intersects(parent.sector))
return;
var sectors = shape.computeSectors(dc);
if (!sectors) {
continue;
}
// If this tile contains the parent's object bounding sector, then all of the parent's objects intersect this
// tile. Therefore we just add all of the parent's objects to this tile. Additionally, the parent's object
// bounding sector becomes this tile's object bounding sector.
if (tile.getSector().contains(parent.sector)) {
tile.addAllSurfaceShapes(parent.getShapes());
}
// Otherwise, the tile may intersect some of the parent's object list. Compute which objects intersect this
// tile, and compute this tile's bounding sector as the union of those object's sectors.
else {
var shapes = parent.getShapes();
for (var idxShape = 0, lenShapes = shapes.length; idxShape < lenShapes; idxShape += 1) {
var shape = shapes[idxShape];
// Test intersection against each of the surface shape's sectors. We break after finding an
// intersection to avoid adding the same object to the tile more than once.
for (var idxSector = 0, lenSectors = sectors.length; idxSector < lenSectors; idxSector += 1) {
var sector = sectors[idxSector];
var sectors = shape.computeSectors(dc);
if (!sectors) {
continue;
}
// Test intersection against each of the surface shape's sectors. We break after finding an
// intersection to avoid adding the same object to the tile more than once.
for (var idxSector = 0, lenSectors = sectors.length; idxSector < lenSectors; idxSector += 1) {
var sector = sectors[idxSector];
if (tile.getSector().intersects(sector)) {
tile.addSurfaceShape(shape);
break;
}
if (tile.getSector().intersects(sector)) {
tile.addSurfaceShape(shape);
break;
}
}
}