Skip to content

Commit

Permalink
Fix style issue, add comment
Browse files Browse the repository at this point in the history
  • Loading branch information
peppsac committed Jun 15, 2016
1 parent 5df3fca commit bd48f29
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/Core/Commander/Providers/WMTS_Provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ define('Core/Commander/Providers/WMTS_Provider', [

var promises = [];
var paramMaterial = [];
// Request parent's texture if no texture at all
var lookAtAncestor = tile.material.getLevelLayerColor(1) === -1;

for (var i = 0; i < layerWMTSId.length; i++) {
Expand Down
10 changes: 6 additions & 4 deletions src/Globe/TileMesh.js
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,15 @@ define('Globe/TileMesh', [

TileMesh.prototype.downScaledLayer = function(id)
{
if(id === l_ELEVATION)
if(this.currentElevation === -2)
if(id === l_ELEVATION) {
if(this.currentElevation === -2) {
return false;
else
} else {
return this.currentElevation < this.levelElevation ;
else if(id === l_COLOR)
}
} else if(id === l_COLOR) {
return this.material.getLevelLayerColor(l_COLOR) < this.level + this.material.getDelta();
}

return false;
};
Expand Down

0 comments on commit bd48f29

Please sign in to comment.