fix: fix 3dtiles with jpeg texture, close #2699

Author: fuzhenn

packages/gltf-loader/src/adapters/GLTFV2.js

@@ -112,7 +112,14 @@ export default class V2 extends GLTFAdapter {
                 }
             }
             if (response.format) {
-                out.format = response.format;
+                out.format = response.format; // convert RGB to RGBA
+            }
+            if (out.format === 0x1907) {
+                const length = out.image.array && out.image.array.length;
+                if (length && length === out.image.width * out.image.height * 4) {
+                    // rgb images is transformed to rgba by requestImageOffscreen
+                    out.format = 0x1908;
+                }
             }
             return out;
         });

packages/layer-3dtiles/test/integration/expected/BatchedDraco/issue-2699/expected.png

@@ -0,0 +1,45 @@
+{
+  "asset": {
+    "gltfUpAxis": "Y",
+    "statistics": {
+      "components": 28663,
+      "fileSize": 0,
+      "triangles": 10626384,
+      "vertices": 12077589
+    },
+    "tilesetVersion": "1.2.3",
+    "version": "0.0"
+  },
+  "geometricError": 43434.8125,
+  "root": {
+    "boundingVolume": {
+      "box": [
+        -683.38633454023477, 405.70397591051386, 367.8682640287052,
+        1600.7544626284032, -3595.3534387959871, 8157.6143269658005,
+        -6313.1237763461277, 13624.119538930374, 7243.4517892868507,
+        -5866.1563517411269, -2698.0384732275647, -38.016745063797316
+      ]
+    },
+    "children": [
+      {
+        "boundingVolume": {
+          "box": [
+            -9783.038148201289, 10788.11830869575, 10336.869082268435,
+            727.08843140882584, -1633.0674219457408, 3700.4787737632464,
+            30.192449936670826, -65.041713887260102, -34.63608168499227,
+            2008.9362642280066, 925.29805026051156, 13.619800948419343
+          ]
+        },
+        "content": { "uri": "./F_Tile_+0_2_4+R6_0.b3dm" },
+        "geometricError": 64.149318695068359,
+        "refine": "REPLACE"
+      }
+    ],
+    "geometricError": 36195.67578125,
+    "refine": "REPLACE",
+    "transform": [
+      1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -2410000.0,
+      5202000.0, 2747000.0, 1.0
+    ]
+  }
+}

packages/layer-3dtiles/test/integration/fixtures/BatchedDraco/issue-2699/F_Tile_+0_2_4+R6_0.b3dm

@@ -2177,6 +2177,21 @@ describe('render specs', () => {
             }, layer, { path: `./integration/expected/${resPath}/expected.png`, zoomOffset: 1, diffCount: 5, renderCount: 1, noGroup: true });
         });
 
+        it('maptalks/maptalks.js#2699, fix incorrect image format with jpeg texture', done => {
+            const resPath = 'BatchedDraco/issue-2699';
+            const layer = new Geo3DTilesLayer('3d-tiles', {
+                services : [
+                    {
+                        url : `http://localhost:${PORT}/integration/fixtures/${resPath}/tileset.json`,
+                        heightOffset: 0
+                    }
+                ]
+            });
+            runner(() => {
+                done();
+            }, layer, { path: `./integration/expected/${resPath}/expected.png`, zoomOffset: 1, diffCount: 5, renderCount: 1, noGroup: true });
+        });
+
         it('3dtiles under hdr, maptalks/issues#755', done => {
             const resPath = 'BatchedDraco/issue-755';
             map.setLights({

packages/layer-3dtiles/test/integration/fixtures/BatchedDraco/issue-2699/tileset.json

@@ -2209,7 +2209,7 @@ describe('vector layers update style specs', () => {
                 polygonFill: '#0f0'
             },
             properties: {
-                height: 80000
+                height_0: 80000
             }
         });
 
@@ -2223,7 +2223,7 @@ describe('vector layers update style specs', () => {
                 const pixel = readPixel(canvas, canvas.width / 2 + 20, canvas.height / 2 - 30);
                 assert(pixel[3] === 0);
                 layer.updateDataConfig({
-                    altitudeProperty: 'height'
+                    altitudeProperty: 'height_0'
                 });
             } else if (count === 4) {
                 const canvas = group.getRenderer().canvas;