fix 3dtiles mask specs

fix 3dtiles specs
maptalks · Dec 24, 2024 · 472c557 · 472c557
1 parent 51c0e9c
commit 472c557
Show file tree

Hide file tree

Showing 30 changed files with 34 additions and 33 deletions.
diff --git a/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/alphaTest/expected.png b/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/alphaTest/expected.png
diff --git a/.../layer-3dtiles/test/integration/expected/BatchedDraco/ambientLight/expected.png b/.../layer-3dtiles/test/integration/expected/BatchedDraco/ambientLight/expected.png
diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/crn/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/crn/expected.png
diff --git a/...ayer-3dtiles/test/integration/expected/BatchedDraco/dayanta-offset/expected.png b/...ayer-3dtiles/test/integration/expected/BatchedDraco/dayanta-offset/expected.png
diff --git a/.../layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4326/expected.png b/.../layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4326/expected.png
diff --git a/.../layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4490/expected.png b/.../layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/4490/expected.png
diff --git a/...es/test/integration/expected/BatchedDraco/dayanta/debugBoundingBox/expected.png b/...es/test/integration/expected/BatchedDraco/dayanta/debugBoundingBox/expected.png
diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/expected.png
diff --git a/...3dtiles/test/integration/expected/BatchedDraco/dayanta/polygonFill/expected.png b/...3dtiles/test/integration/expected/BatchedDraco/dayanta/polygonFill/expected.png
diff --git a/...er-3dtiles/test/integration/expected/BatchedDraco/dayanta/rotation/expected.png b/...er-3dtiles/test/integration/expected/BatchedDraco/dayanta/rotation/expected.png
diff --git a/...s/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/trs/expected.png b/...s/layer-3dtiles/test/integration/expected/BatchedDraco/dayanta/trs/expected.png
diff --git a/...r-3dtiles/test/integration/expected/BatchedDraco/deyihu/fzc3dtiles/expected.png b/...r-3dtiles/test/integration/expected/BatchedDraco/deyihu/fzc3dtiles/expected.png
diff --git a/...ayer-3dtiles/test/integration/expected/BatchedDraco/deyihu/taoyuan/expected.png b/...ayer-3dtiles/test/integration/expected/BatchedDraco/deyihu/taoyuan/expected.png
diff --git a/...es/test/integration/expected/BatchedDraco/issue-424-scale-rotation/expected.png b/...es/test/integration/expected/BatchedDraco/issue-424-scale-rotation/expected.png
diff --git a/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424/expected.png b/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/issue-424/expected.png
diff --git a/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/issue-604/expected.png b/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/issue-604/expected.png
diff --git a/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/issue-755/expected.png b/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/issue-755/expected.png
diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ktx2/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/ktx2/expected.png
diff --git a/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected-phong.png b/...ges/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected-phong.png
diff --git a/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected.png b/packages/layer-3dtiles/test/integration/expected/BatchedDraco/lwy/expected.png
diff --git a/...dtiles/test/integration/expected/BatchedDraco/oldKhrTechniqueWebGL/expected.png b/...dtiles/test/integration/expected/BatchedDraco/oldKhrTechniqueWebGL/expected.png
diff --git a/.../integration/expected/Cesium3DTiles/Tilesets/TilesetWithTransforms/expected.png b/.../integration/expected/Cesium3DTiles/Tilesets/TilesetWithTransforms/expected.png
diff --git a/packages/layer-3dtiles/test/integration/expected/cmpt/expected.png b/packages/layer-3dtiles/test/integration/expected/cmpt/expected.png
diff --git a/packages/layer-3dtiles/test/integration/expected/withSkyBox/lit/expected.png b/packages/layer-3dtiles/test/integration/expected/withSkyBox/lit/expected.png
diff --git a/packages/layer-3dtiles/test/integration/expected/withSkyBox/unlit/expected.png b/packages/layer-3dtiles/test/integration/expected/withSkyBox/unlit/expected.png
diff --git 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
@@ -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
@@ -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: '&copy; <a href="http://osm.org">OpenStreetMap</a> contributors, &copy; <a href="https://carto.com/">CARTO</a>'
-            }),
+            // baseLayer: new maptalks.TileLayer('base', {
+            //     urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png',
+            //     subdomains: ['a','b','c','d'],
+            //     attribution: '&copy; <a href="http://osm.org">OpenStreetMap</a> contributors, &copy; <a href="https://carto.com/">CARTO</a>'
+            // }),
         };
         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
@@ -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
@@ -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,