diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/alphaTest/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/alphaTest/expected.png index c491c9a852..688681319c 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/alphaTest/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/alphaTest/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ambientLight/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ambientLight/expected.png index 6cbd65de40..c307a6b218 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ambientLight/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ambientLight/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/crn/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/crn/expected.png index 37150bc677..d4ce07cb93 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/crn/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/crn/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta-offset/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta-offset/expected.png index c652fc151a..0f94dd8001 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta-offset/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta-offset/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4326/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4326/expected.png index 779f711fe1..bea4fe0988 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4326/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4326/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4490/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4490/expected.png index 779f711fe1..798d6ca61b 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4490/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4490/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/debugBoundingBox/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/debugBoundingBox/expected.png index ca38497ee6..96071c0b81 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/debugBoundingBox/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/debugBoundingBox/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/expected.png index b64f06aa66..8f8541be85 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/polygonFill/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/polygonFill/expected.png index 719410466f..6a25b0a92a 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/polygonFill/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/polygonFill/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/rotation/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/rotation/expected.png index 025956e66e..da08a24b7a 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/rotation/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/rotation/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/trs/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/trs/expected.png index 40f82b9ec3..863f70ab30 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/trs/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/trs/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/fzc3dtiles/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/fzc3dtiles/expected.png index 3a5a87c29b..de27911bff 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/fzc3dtiles/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/fzc3dtiles/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/taoyuan/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/taoyuan/expected.png index 2eb019820b..0efef80c7c 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/taoyuan/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/deyihu/taoyuan/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424-scale-rotation/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424-scale-rotation/expected.png index d6c332278a..aeb89bcb8d 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424-scale-rotation/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424-scale-rotation/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424/expected.png index f2a6b1eae7..0d544119a2 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-604/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-604/expected.png index 3fdb2198cc..2dadced8b4 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-604/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-604/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-755/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-755/expected.png index 37a85a0d5b..f9fbf167ae 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-755/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-755/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ktx2/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ktx2/expected.png index 51baef1fad..09e026ce56 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ktx2/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ktx2/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected-phong.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected-phong.png index 4878808ac2..f7d8bdea3e 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected-phong.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected-phong.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected.png index 4878808ac2..f7d8bdea3e 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/oldKhrTechniqueWebGL/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/oldKhrTechniqueWebGL/expected.png index a019b13baa..43aecdd8bf 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/oldKhrTechniqueWebGL/expected.png and b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/oldKhrTechniqueWebGL/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/Cesium3DTiles/Tilesets/TilesetWithTransforms/expected.png b/packages/layer-3dtiles/test/integration/expected/Cesium3DTiles/Tilesets/TilesetWithTransforms/expected.png index bc8b08e119..5143b9c861 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/Cesium3DTiles/Tilesets/TilesetWithTransforms/expected.png and b/packages/layer-3dtiles/test/integration/expected/Cesium3DTiles/Tilesets/TilesetWithTransforms/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/cmpt/expected.png b/packages/layer-3dtiles/test/integration/expected/cmpt/expected.png index 1738e2780d..6cc08d7b82 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/cmpt/expected.png and b/packages/layer-3dtiles/test/integration/expected/cmpt/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/withSkyBox/lit/expected.png b/packages/layer-3dtiles/test/integration/expected/withSkyBox/lit/expected.png index 92492ec2eb..dbcff1eb56 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/withSkyBox/lit/expected.png and b/packages/layer-3dtiles/test/integration/expected/withSkyBox/lit/expected.png differ diff --git a/packages/layer-3dtiles/test/integration/expected/withSkyBox/unlit/expected.png b/packages/layer-3dtiles/test/integration/expected/withSkyBox/unlit/expected.png index 5f99e17275..6c48ad7068 100644 Binary files a/packages/layer-3dtiles/test/integration/expected/withSkyBox/unlit/expected.png and b/packages/layer-3dtiles/test/integration/expected/withSkyBox/unlit/expected.png differ diff --git a/packages/layer-3dtiles/test/layer.identify.spec.js b/packages/layer-3dtiles/test/layer.identify.spec.js index 14ffe1a64d..2fc83e6c80 100644 --- a/packages/layer-3dtiles/test/layer.identify.spec.js +++ b/packages/layer-3dtiles/test/layer.identify.spec.js @@ -1,4 +1,4 @@ -const maptalks = require('maptalks'); +const maptalks = require('@maptalks/map'); require('@maptalks/gl'); require('@maptalks/transcoders.draco'); require('@maptalks/transcoders.ktx2'); diff --git a/packages/layer-3dtiles/test/layer.mask.spec.js b/packages/layer-3dtiles/test/layer.mask.spec.js index 8593f6ae5e..660653224a 100644 --- a/packages/layer-3dtiles/test/layer.mask.spec.js +++ b/packages/layer-3dtiles/test/layer.mask.spec.js @@ -1,4 +1,4 @@ -const maptalks = require('maptalks'); +const maptalks = require('@maptalks/map'); const { GroupGLLayer, FlatInsideMask, FlatOutsideMask, ClipInsideMask, ClipOutsideMask, ColorMask, VideoMask } = require('@maptalks/gl'); require('@maptalks/transcoders.draco'); require('@maptalks/transcoders.ktx2'); @@ -12,8 +12,7 @@ const PORT = 39887; function pickPixel(map, x, y, width, height) { const px = x || map.width / 2, py = y || map.height / 2; const w = width || 1, h = height || 1; - const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext("2d"); + const ctx = map.getRenderer().context; const pixel = ctx.getImageData(px, py, w, h).data; return pixel; } @@ -104,7 +103,7 @@ describe('render specs', () => { layer.setMask(mask); setTimeout(function() { const pixel = pickPixel(map, 255, 497, 1, 1); - assert(pixelMatch([104, 107, 114, 255], pixel) === true); + assert(pixelMatch([125, 128, 135, 255], pixel) === true); done(); }, 500); }); @@ -192,7 +191,7 @@ describe('render specs', () => { layer.setMask(mask); setTimeout(function() { const pixel = pickPixel(map, 255, 497, 1, 1); - assert(pixelMatch([53, 63, 81, 255], pixel, 50) === true); + assert(pixelMatch([107, 136, 170, 255], pixel, 50) === true); done(); }, 1200); }); @@ -206,7 +205,7 @@ describe('render specs', () => { layer.setServiceOpacity(0, 0.5); setTimeout(function() { const pixel = pickPixel(map, 255, 497, 1, 1); - assert(pixelMatch([255, 255, 255, 127], pixel) === true); + assert(pixelMatch([172, 176, 177, 127], pixel) === true); done(); }, 200); }); diff --git a/packages/layer-3dtiles/test/layer.render.spec.js b/packages/layer-3dtiles/test/layer.render.spec.js index 019ee08482..8ad17f7f4d 100644 --- a/packages/layer-3dtiles/test/layer.render.spec.js +++ b/packages/layer-3dtiles/test/layer.render.spec.js @@ -1,4 +1,4 @@ -const maptalks = require('maptalks'); +const maptalks = require('@maptalks/map'); const { GroupGLLayer } = require('@maptalks/gl'); const { Geo3DTilesLayer } = require('../dist/maptalks.3dtiles'); @@ -51,11 +51,11 @@ describe('render specs', () => { zoom: 20, center: center || [0, 0], // centerCross: true - baseLayer: new maptalks.TileLayer('base', { - urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', - subdomains: ['a','b','c','d'], - attribution: '© OpenStreetMap contributors, © CARTO' - }), + // baseLayer: new maptalks.TileLayer('base', { + // urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', + // subdomains: ['a','b','c','d'], + // attribution: '© OpenStreetMap contributors, © CARTO' + // }), }; map = new maptalks.Map(container, option); } @@ -426,7 +426,7 @@ describe('render specs', () => { runner(done, layer, { path: `./integration/expected/${resPath}/expected-phong.png`, diffCount: 0, renderCount: 1, noGroup: true }); }); - it('deyihu-khr_techniques_webgl', done => { + it('deyihu-taoyuan-khr_techniques_webgl', done => { const resPath = 'BatchedDraco/deyihu/taoyuan/'; const layer = new Geo3DTilesLayer('3d-tiles', { services : [ @@ -2014,7 +2014,7 @@ describe('render specs', () => { runner(() => { assert(map.getCenter().x.toFixed(3) === '108.959'); done(); - }, layer, { path: `./integration/expected/${resPath}/4490/expected.png`, diffCount: 0, renderCount: 1, noGroup: true }); + }, layer, { path: `./integration/expected/${resPath}/4490/expected.png`, diffCount: 100, renderCount: 1, noGroup: true }); }); }); @@ -2035,7 +2035,7 @@ describe('render specs', () => { runner(() => { assert(map.getCenter().x.toFixed(3) === '108.959'); done(); - }, layer, { path: `./integration/expected/${resPath}/trs/expected.png`, diffCount: 0, renderCount: 1, noGroup: true, zoomOffset: -2 }); + }, layer, { path: `./integration/expected/${resPath}/trs/expected.png`, diffCount: 100, renderCount: 1, noGroup: true, zoomOffset: -2 }); }); it('set transform', done => { @@ -2075,7 +2075,7 @@ describe('render specs', () => { runner(() => { assert(map.getCenter().x.toFixed(3) === '108.959'); done(); - }, layer, { path: `./integration/expected/${resPath}/rotation/expected.png`, diffCount: 0, renderCount: 1, noGroup: true, zoomOffset: -2 }); + }, layer, { path: `./integration/expected/${resPath}/rotation/expected.png`, diffCount: 100, renderCount: 1, noGroup: true, zoomOffset: -2 }); }); it('show debug boundingVolume', done => { diff --git a/packages/layer-3dtiles/test/layer.spec.js b/packages/layer-3dtiles/test/layer.spec.js index 60011785f2..a43e7d467c 100644 --- a/packages/layer-3dtiles/test/layer.spec.js +++ b/packages/layer-3dtiles/test/layer.spec.js @@ -1,4 +1,4 @@ -const maptalks = require('maptalks'); +const maptalks = require('@maptalks/map'); require('@maptalks/gl'); require('@maptalks/transcoders.draco'); require('@maptalks/transcoders.ktx2'); @@ -306,7 +306,7 @@ describe('3dtiles layer', () => { count++; if (count === 2) { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] > 0); done(); @@ -337,7 +337,7 @@ describe('3dtiles layer', () => { count++; if (count === 2) { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] > 0); done(); @@ -364,7 +364,7 @@ describe('3dtiles layer', () => { layer.addService(service); setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] > 0); done(); @@ -394,7 +394,7 @@ describe('3dtiles layer', () => { } else if (count === 3) { setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] === 0); done(); @@ -453,7 +453,7 @@ describe('3dtiles layer', () => { } else if (count === 3) { setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 53, canvas.height / 2 + 100, 1, 1); assert(color.data[3] === 255); done(); @@ -489,13 +489,13 @@ describe('3dtiles layer', () => { layer.removeService(0); layer.addService(service); const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] === 255); layer.hideService(0); setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] === 0); done(); @@ -529,7 +529,7 @@ describe('3dtiles layer', () => { } else if (count === 3) { setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 + 56, canvas.height / 2 + 70, 1, 1); assert(color.data[3] === 255); done(); @@ -563,7 +563,7 @@ describe('3dtiles layer', () => { } else if (count === 3) { setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] === 255); done(); @@ -593,7 +593,7 @@ describe('3dtiles layer', () => { layer.updateService(0, { heightOffset: 0 }); setTimeout(() => { const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(canvas.width / 2 - 43, canvas.height / 2 + 70, 1, 1); assert(color.data[3] === 255); done(); @@ -621,16 +621,14 @@ describe('3dtiles layer', () => { if (count === 1) { layer.removeService(0); setTimeout(() => { - const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(258, 525, 1, 1); assert(color.data[3] === 0); layer.addService(service); }, 20); } else if (count === 2) { setTimeout(() => { - const canvas = map.getRenderer().canvas; - const ctx = canvas.getContext('2d'); + const ctx = map.getRenderer().context; const color = ctx.getImageData(258, 525, 1, 1); assert(color.data[3] === 255); done(); diff --git a/packages/reshader.gl/src/index.ts b/packages/reshader.gl/src/index.ts index d9f6948ebc..e77065b659 100644 --- a/packages/reshader.gl/src/index.ts +++ b/packages/reshader.gl/src/index.ts @@ -104,7 +104,11 @@ export { Constants }; export { default as KHRTechniquesWebglManager } from './extensions/KHRTechniquesWebglManager'; -export { default as earcut } from 'earcut'; +import { default as earcutFn, flatten } from 'earcut'; + +const earcut = earcutFn; +earcut.flatten = flatten; +export { earcut }; export { glMatrix,