root
/
cesium
mirror of https://github.com/CesiumGS/cesium.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Water mask testing.

This commit is contained in:
Kevin Ring 2018-12-17 10:38:49 +11:00
parent d0e63aa62c
commit ac2c792207
4 changed files with 106 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Renderer/Texture.js
View File

@ -264,6 +264,10 @@ define([
this.sampler = defined(options.sampler) ? options.sampler : new Sampler();
}
Texture.create = function(options) {
return new Texture(options);
};
/**
* Creates a texture, and copies a subimage of the framebuffer to it. When called without arguments,
* the texture is the same width and height as the framebuffer and contains its contents.

6
Source/Scene/GlobeSurfaceTile.js
View File

@ -581,7 +581,7 @@ define([
var data = context.cache.tile_waterMaskData;
if (!defined(data)) {
var allWaterTexture = new Texture({
var allWaterTexture = Texture.create({
context : context,
pixelFormat : PixelFormat.LUMINANCE,
pixelDatatype : PixelDatatype.UNSIGNED_BYTE,
@ -631,7 +631,7 @@ define([
}
} else {
var textureSize = Math.sqrt(waterMaskLength);
texture = new Texture({
texture = Texture.create({
context : context,
pixelFormat : PixelFormat.LUMINANCE,
pixelDatatype : PixelDatatype.UNSIGNED_BYTE,
@ -658,7 +658,7 @@ define([
// Find the nearest ancestor with loaded terrain.
var sourceTile = tile.parent;
while (defined(sourceTile) && !defined(sourceTile.data.terrainData) || sourceTile.data.terrainData.wasCreatedByUpsampling()) {
while (defined(sourceTile) && (!defined(sourceTile.data) || !defined(sourceTile.data.terrainData) || sourceTile.data.terrainData.wasCreatedByUpsampling())) {
sourceTile = sourceTile.parent;
}

33
Specs/MockTerrainProvider.js
View File

@ -1,12 +1,12 @@
define([
'Core/defaultValue',
'Core/defined',
'Core/GeographicTilingScheme',
'Core/RuntimeError',
'Core/TerrainProvider',
'./createTileKey',
'./runLater'
], function(
defaultValue,
defined,
GeographicTilingScheme,
RuntimeError,
TerrainProvider,
@ -19,9 +19,11 @@ define([
this.heightmapWidth = 65;
this.levelZeroMaximumGeometricError = TerrainProvider.getEstimatedLevelZeroGeometricErrorForAHeightmap(this.tilingScheme.ellipsoid, this.heightmapWidth, this.tilingScheme.getNumberOfXTilesAtLevel(0));
this.ready = true;
this.hasWaterMask = true;
this._tileDataAvailable = {};
this._requestTileGeometryWillSucceed = {};
this._willHaveWaterMask = {};
this._createMeshWillSucceed = {};
this._upsampleWillSucceed = {};
this._nearestBvhLevel = {};
@ -36,7 +38,24 @@ define([
var that = this;
return runLater(function() {
if (willSucceed) {
return createTerrainData(that, x, y, level, false);
var terrainData = createTerrainData(that, x, y, level, false);
var willHaveWaterMask = that._willHaveWaterMask[createTileKey(x, y, level)];
if (defined(willHaveWaterMask)) {
if (willHaveWaterMask.includeLand && willHaveWaterMask.includeWater) {
terrainData.waterMask = new Uint8Array(4);
terrainData.waterMask[0] = 1;
terrainData.waterMask[1] = 1;
terrainData.waterMask[2] = 0;
terrainData.waterMask[3] = 0;
} else if (willHaveWaterMask.includeLand) {
terrainData.waterMask = new Uint8Array(1);
terrainData.waterMask[0] = 0;
} else if (willHaveWaterMask.includeWater) {
terrainData.waterMask = new Uint8Array(1);
terrainData.waterMask[0] = 1;
}
}
return terrainData;
}
throw new RuntimeError('requestTileGeometry failed as requested.');
});
@ -69,6 +88,14 @@ define([
return this;
};
MockTerrainProvider.prototype.willHaveWaterMask = function(includeLand, includeWater, xOrTile, y, level) {
this._willHaveWaterMask[createTileKey(xOrTile, y, level)] = includeLand || includeWater ? {
includeLand: includeLand,
includeWater: includeWater
} : undefined;
return this;
};
MockTerrainProvider.prototype.createMeshWillSucceed = function(xOrTile, y, level) {
this._createMeshWillSucceed[createTileKey(xOrTile, y, level)] = true;
return this;

243
Specs/Scene/GlobeSurfaceTileSpec.js
View File

@ -3,6 +3,7 @@ defineSuite([
'Core/Cartesian3',
'Core/Cartesian4',
'Core/CesiumTerrainProvider',
'Core/clone',
'Core/createWorldTerrain',
'Core/defined',
'Core/Ellipsoid',
@ -15,6 +16,7 @@ defineSuite([
'Core/TerrainMesh',
'Core/TileAvailability',
'Renderer/Buffer',
'Renderer/Texture',
'Scene/Imagery',
'Scene/ImageryLayer',
'Scene/ImageryLayerCollection',
@ -33,6 +35,7 @@ defineSuite([
Cartesian3,
Cartesian4,
CesiumTerrainProvider,
clone,
createWorldTerrain,
defined,
Ellipsoid,
@ -45,6 +48,7 @@ defineSuite([
TerrainMesh,
TileAvailability,
Buffer,
Texture,
Imagery,
ImageryLayer,
ImageryLayerCollection,
@ -60,6 +64,27 @@ defineSuite([
MockTerrainProvider) {
'use strict';
var tilingScheme;
var rootTiles;
var rootTile;
var imageryLayerCollection;
var mockTerrain;
beforeEach(function() {
tilingScheme = new GeographicTilingScheme();
rootTiles = QuadtreeTile.createLevelZeroTiles(tilingScheme);
rootTile = rootTiles[0];
imageryLayerCollection = new ImageryLayerCollection();
mockTerrain = new MockTerrainProvider();
});
afterEach(function() {
for (var i = 0; i < rootTiles.length; ++i) {
rootTiles[i].freeResources();
}
});
describe('processStateMachine', function() {
var frameState = {
context: {
@ -67,39 +92,8 @@ defineSuite([
_gl: {}
}
};
var terrainProvider;
var tilingScheme;
var rootTiles;
var rootTile;
var imageryLayerCollection;
var mockTerrain;
beforeEach(function() {
tilingScheme = new GeographicTilingScheme();
rootTiles = QuadtreeTile.createLevelZeroTiles(tilingScheme);
rootTile = rootTiles[0];
imageryLayerCollection = new ImageryLayerCollection();
terrainProvider = {
requestTileGeometry : function(x, y, level) {
return undefined;
},
tilingScheme : tilingScheme,
availability : new TileAvailability(tilingScheme, 10),
hasWaterMask : function() {
return true;
},
getTileDataAvailable : function(x, y, level) {
return undefined;
},
getNearestBvhLevel : function(x, y, level) {
return -1;
}
};
mockTerrain = new MockTerrainProvider();
// Skip the WebGL bits
spyOn(GlobeSurfaceTile, '_createVertexArrayForMesh').and.callFake(function() {
var vertexArray = jasmine.createSpyObj('VertexArray', ['destroy']);
@ -114,12 +108,12 @@ defineSuite([
});
spyOn(ImageryLayer.prototype, '_finalizeReprojectTexture');
});
afterEach(function() {
for (var i = 0; i < rootTiles.length; ++i) {
rootTiles[i].freeResources();
}
spyOn(Texture, 'create').and.callFake(function(options) {
var result = clone(options);
result.destroy = function() {};
return result;
});
});
it('starts in the START state', function() {
@ -346,7 +340,7 @@ defineSuite([
imageryLayerCollection.addImageryProvider(mockImagery);
mockImagery
.requestImageWillSucceed(rootTile)
.requestImageWillSucceed(rootTile);
mockTerrain
.requestTileGeometryWillSucceed(rootTile)
@ -442,143 +436,62 @@ defineSuite([
expect(rootTile.southwestChild.upsampledFromParent).toBe(false);
});
});
});
describe('water mask', function() {
var scene;
it('creates water mask texture from one-byte water mask data, if it exists', function() {
mockTerrain
.willBeAvailable(rootTile)
.requestTileGeometryWillSucceed(rootTile)
.willHaveWaterMask(false, true, rootTile);
beforeAll(function() {
scene = createScene();
});
afterAll(function() {
scene.destroyForSpecs();
});
it('is created from one-byte water mask data, if it exists', function() {
var tile = new QuadtreeTile({
level: 0,
x: 0,
y: 0,
tilingScheme: new GeographicTilingScheme()
return processTiles([rootTile]).then(function() {
expect(rootTile.data.waterMaskTexture).toBeDefined();
});
var terrainProvider = {
hasWaterMask: true
};
makeTerrainReceived(tile);
tile.data.terrainData.waterMask = new Uint8Array(1);
tile.data.terrainData.waterMask[0] = 1;
GlobeSurfaceTile.processStateMachine(tile, scene.frameState, terrainProvider, new ImageryLayerCollection());
expect(tile.data.waterMaskTexture).toBeDefined();
});
it('uses undefined water mask texture for tiles that are entirely land', function() {
var tile = new QuadtreeTile({
level: 0,
x: 0,
y: 0,
tilingScheme: new GeographicTilingScheme()
mockTerrain
.requestTileGeometryWillSucceed(rootTile)
.willHaveWaterMask(true, false, rootTile);
return processTiles([rootTile]).then(function() {
expect(rootTile.data.waterMaskTexture).toBeUndefined();
});
var terrainProvider = {
hasWaterMask: true
};
makeTerrainReceived(tile);
tile.data.terrainData.waterMask = new Uint8Array(1);
tile.data.terrainData.waterMask[0] = 0;
GlobeSurfaceTile.processStateMachine(tile, scene.frameState, terrainProvider, new ImageryLayerCollection());
expect(tile.data.waterMaskTexture).toBeUndefined();
});
it('uses shared water mask texture for tiles that are entirely water', function() {
var tile = new QuadtreeTile({
level: 0,
x: 0,
y: 0,
tilingScheme: new GeographicTilingScheme()
mockTerrain
.requestTileGeometryWillSucceed(rootTile)
.willHaveWaterMask(false, true, rootTile)
.requestTileGeometryWillSucceed(rootTile.southwestChild)
.willHaveWaterMask(false, true, rootTile.southwestChild);
return processTiles([rootTile, rootTile.southwestChild]).then(function() {
expect(rootTile.data.waterMaskTexture).toBe(rootTile.southwestChild.data.waterMaskTexture);
});
var terrainProvider = {
hasWaterMask: true
};
makeTerrainReceived(tile);
tile.data.terrainData.waterMask = new Uint8Array(1);
tile.data.terrainData.waterMask[0] = 1;
GlobeSurfaceTile.processStateMachine(tile, scene.frameState, terrainProvider, new ImageryLayerCollection());
var sw = tile.southwestChild;
makeTerrainReceived(sw);
sw.data.terrainData.waterMask = new Uint8Array(1);
sw.data.terrainData.waterMask[0] = 1;
GlobeSurfaceTile.processStateMachine(sw, scene.frameState, terrainProvider, new ImageryLayerCollection());
expect(tile.data.waterMaskTexture).toBeDefined();
expect(tile.data.waterMaskTexture).toBe(sw.data.waterMaskTexture);
});
it('is created from multi-byte water mask data, if it exists', function() {
var tile = new QuadtreeTile({
level: 0,
x: 0,
y: 0,
tilingScheme: new GeographicTilingScheme()
it('creates water mask texture from multi-byte water mask data, if it exists', function() {
mockTerrain
.requestTileGeometryWillSucceed(rootTile)
.willHaveWaterMask(true, true, rootTile);
return processTiles([rootTile]).then(function() {
expect(rootTile.data.waterMaskTexture).toBeDefined();
});
var terrainProvider = {
hasWaterMask: true
};
makeTerrainReceived(tile);
tile.data.terrainData.waterMask = new Uint8Array(4);
tile.data.terrainData.waterMask[0] = 1;
tile.data.terrainData.waterMask[1] = 1;
tile.data.terrainData.waterMask[2] = 0;
tile.data.terrainData.waterMask[3] = 0;
GlobeSurfaceTile.processStateMachine(tile, scene.frameState, terrainProvider, new ImageryLayerCollection());
expect(tile.data.waterMaskTexture).toBeDefined();
});
it('is created by upsampling if data is not available', function() {
var tile = new QuadtreeTile({
level: 0,
x: 0,
y: 0,
tilingScheme: new GeographicTilingScheme()
it('upsamples water mask if data is not available', function() {
mockTerrain
.requestTileGeometryWillSucceed(rootTile)
.willHaveWaterMask(false, true, rootTile)
.requestTileGeometryWillSucceed(rootTile.southwestChild);
return processTiles([rootTile, rootTile.southwestChild]).then(function() {
expect(rootTile.southwestChild.data.waterMaskTexture).toBeDefined();
expect(rootTile.southwestChild.data.waterMaskTranslationAndScale).toEqual(new Cartesian4(0.0, 0.0, 0.5, 0.5));
});
var terrainProvider = {
hasWaterMask: true
};
makeTerrainReceived(tile);
tile.data.terrainData.waterMask = new Uint8Array(4);
tile.data.terrainData.waterMask[0] = 1;
tile.data.terrainData.waterMask[1] = 1;
tile.data.terrainData.waterMask[2] = 0;
tile.data.terrainData.waterMask[3] = 0;
var sw = tile.southwestChild;
makeTerrainReceived(sw);
GlobeSurfaceTile.processStateMachine(tile, scene.frameState, terrainProvider, new ImageryLayerCollection());
// Parent doesn't have a water mask texture yet, so neither will the child
expect(sw.data.waterMaskTexture).not.toBeDefined();
GlobeSurfaceTile.processStateMachine(tile, scene.frameState, terrainProvider, new ImageryLayerCollection());
GlobeSurfaceTile.processStateMachine(sw, scene.frameState, terrainProvider, new ImageryLayerCollection());
// But once the parent's water mask texture is created, the child will upsample from it
expect(sw.data.waterMaskTexture).toBeDefined();
});
}, 'WebGL');
});
describe('getBoundingVolumeHierarchy', function() {
it('gets the BVH from the TerrainData if available', function() {
@ -782,14 +695,6 @@ defineSuite([
tile.state = QuadtreeTileLoadState.LOADING;
}
function makeTerrainFailed(tile) {
makeLoading(tile);
tile.data.terrainState = TerrainState.FAILED;
tile.data.terrainData = undefined;
tile.data.vertexArray = undefined;
tile.data.mesh = undefined;
}
function makeTerrainUnloaded(tile) {
makeLoading(tile);
tile.data.terrainState = TerrainState.UNLOADED;
@ -808,16 +713,6 @@ defineSuite([
tile.data.vertexArray = undefined;
}
function makeTerrainUpsampled(tile) {
makeLoading(tile);
tile.data.terrainState = TerrainState.RECEIVED;
tile.data.terrainData = jasmine.createSpyObj('TerrainData', ['createMesh', 'upsample', 'wasCreatedByUpsampling']);
tile.data.terrainData.wasCreatedByUpsampling.and.returnValue(true);
tile.data.mesh = undefined;
tile.data.vertexArray = undefined;
}
function makeTerrainTransformed(tile) {
makeLoading(tile);