@loaders.gl/3d-tiles - npm Package Compare versions

Comparing version 2.1.0-alpha.3 to 2.1.0-alpha.4

dist/es5/lib/parsers/parse-3d-tile-batched-model.js

@@ -9,3 +9,2 @@ "use strict";
 exports.parseBatchedModel3DTile = parseBatchedModel3DTile;
-exports.parseBatchedModel = parseBatchedModel;
 
@@ -32,2 +31,4 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
   _parseBatchedModel3DTile = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee(tile, arrayBuffer, byteOffset, options, context) {
+    var _ref, extensions;
+
     return _regenerator["default"].wrap(function _callee$(_context) {
@@ -42,5 +43,11 @@ while (1) {
           case 3:
+            _ref = tile.gltf || {}, extensions = _ref.extensions;
+
+            if (extensions && extensions.CESIUM_RTC) {
+              tile.rtcCenter = extensions.CESIUM_RTC.center;
+            }
+
             return _context.abrupt("return", byteOffset);
 
-          case 4:
+          case 6:
           case "end":
@@ -62,5 +69,4 @@ return _context.stop();
   tile.rtcCenter = featureTable.getGlobalProperty('RTC_CENTER', _math.GL.FLOAT, 3);
-  (0, _parse3dTileGltfView.extractGLTF)(tile, _parse3dTileGltfView.GLTF_FORMAT.EMBEDDED, options, context);
   return byteOffset;
 }
 //# sourceMappingURL=parse-3d-tile-batched-model.js.map

dist/es5/lib/tileset/tile-3d-header.js

@@ -262,3 +262,3 @@ "use strict";
 
-      if (this._updatedVisibilityFrame === tileset._updatedVisibilityFrame) {
+      if (this._frameNumber === tileset._frameNumber) {
         return;
@@ -278,3 +278,3 @@ }
       this._inRequestVolume = this.insideViewerRequestVolume(frameState);
-      this._updatedVisibilityFrame = tileset._updatedVisibilityFrame;
+      this._frameNumber = tileset._frameNumber;
     }
@@ -424,3 +424,3 @@ }, {
       this._selectionDepth = 0;
-      this._updatedVisibilityFrame = 0;
+      this._frameNumber = 0;
       this._touchedFrame = 0;
@@ -427,0 +427,0 @@ this._visitedFrame = 0;

dist/es5/lib/tileset/tileset-3d.js

@@ -166,3 +166,3 @@ "use strict";
     this._timeSinceLoad = 0.0;
-    this._updatedVisibilityFrame = 0;
+    this._frameNumber = 0;
     this._extras = undefined;
@@ -205,2 +205,3 @@ this._allTilesAdditive = true;
     value: function update(viewport) {
+      this._frameNumber++;
       var frameState;
@@ -211,7 +212,5 @@
       } else {
-        frameState = (0, _getFrameState.getFrameState)(viewport);
+        frameState = (0, _getFrameState.getFrameState)(viewport, this._frameNumber);
       }
 
-      this._updatedVisibilityFrame++;
-
       this._cache.reset();
@@ -218,0 +217,0 @@

dist/es5/tile-3d-loader.js

@@ -16,3 +16,3 @@ "use strict";
 
-var VERSION = typeof "2.1.0-alpha.3" !== 'undefined' ? "2.1.0-alpha.3" : 'latest';
+var VERSION = typeof "2.1.0-alpha.4" !== 'undefined' ? "2.1.0-alpha.4" : 'latest';
 
@@ -19,0 +19,0 @@ function parse(_x, _x2, _x3, _x4) {

dist/es6/lib/parsers/parse-3d-tile-batched-model.js

@@ -9,5 +9,14 @@ import { GL } from '@loaders.gl/math';
   await extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);
+  const {
+    extensions
+  } = tile.gltf || {};
+
+  if (extensions && extensions.CESIUM_RTC) {
+    tile.rtcCenter = extensions.CESIUM_RTC.center;
+  }
+
   return byteOffset;
 }
-export function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
+
+function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
   byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset, options);
@@ -19,5 +28,4 @@ byteOffset = parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset, options);
   tile.rtcCenter = featureTable.getGlobalProperty('RTC_CENTER', GL.FLOAT, 3);
-  extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);
   return byteOffset;
 }
 //# sourceMappingURL=parse-3d-tile-batched-model.js.map

dist/es6/lib/tileset/tile-3d-header.js

@@ -257,3 +257,3 @@ import { Vector3, Matrix4 } from 'math.gl';
 
-    if (this._updatedVisibilityFrame === tileset._updatedVisibilityFrame) {
+    if (this._frameNumber === tileset._frameNumber) {
       return;
@@ -273,3 +273,3 @@ }
     this._inRequestVolume = this.insideViewerRequestVolume(frameState);
-    this._updatedVisibilityFrame = tileset._updatedVisibilityFrame;
+    this._frameNumber = tileset._frameNumber;
   }
@@ -415,3 +415,3 @@
     this._selectionDepth = 0;
-    this._updatedVisibilityFrame = 0;
+    this._frameNumber = 0;
     this._touchedFrame = 0;
@@ -418,0 +418,0 @@ this._visitedFrame = 0;

dist/es6/lib/tileset/tileset-3d.js

@@ -135,3 +135,3 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
     this._timeSinceLoad = 0.0;
-    this._updatedVisibilityFrame = 0;
+    this._frameNumber = 0;
     this._extras = undefined;
@@ -224,2 +224,3 @@ this._allTilesAdditive = true;
   update(viewport) {
+    this._frameNumber++;
     let frameState;
@@ -230,7 +231,5 @@
     } else {
-      frameState = getFrameState(viewport);
+      frameState = getFrameState(viewport, this._frameNumber);
     }
 
-    this._updatedVisibilityFrame++;
-
     this._cache.reset();
@@ -237,0 +236,0 @@

dist/es6/tile-3d-loader.js

@@ -1,2 +0,2 @@
-const VERSION = typeof "2.1.0-alpha.3" !== 'undefined' ? "2.1.0-alpha.3" : 'latest';
+const VERSION = typeof "2.1.0-alpha.4" !== 'undefined' ? "2.1.0-alpha.4" : 'latest';
 import { parse3DTile } from './lib/parsers/parse-3d-tile';
@@ -3,0 +3,0 @@

dist/esm/lib/parsers/parse-3d-tile-batched-model.js

@@ -14,2 +14,4 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
   _parseBatchedModel3DTile = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(tile, arrayBuffer, byteOffset, options, context) {
+    var _ref, extensions;
+
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -24,5 +26,11 @@ while (1) {
           case 3:
+            _ref = tile.gltf || {}, extensions = _ref.extensions;
+
+            if (extensions && extensions.CESIUM_RTC) {
+              tile.rtcCenter = extensions.CESIUM_RTC.center;
+            }
+
             return _context.abrupt("return", byteOffset);
 
-          case 4:
+          case 6:
           case "end":
@@ -37,3 +45,3 @@ return _context.stop();
 
-export function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
+function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
   byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset, options);
@@ -45,5 +53,4 @@ byteOffset = parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset, options);
   tile.rtcCenter = featureTable.getGlobalProperty('RTC_CENTER', GL.FLOAT, 3);
-  extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);
   return byteOffset;
 }
 //# sourceMappingURL=parse-3d-tile-batched-model.js.map

dist/esm/lib/tileset/tile-3d-header.js

@@ -242,3 +242,3 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 
-      if (this._updatedVisibilityFrame === tileset._updatedVisibilityFrame) {
+      if (this._frameNumber === tileset._frameNumber) {
         return;
@@ -258,3 +258,3 @@ }
       this._inRequestVolume = this.insideViewerRequestVolume(frameState);
-      this._updatedVisibilityFrame = tileset._updatedVisibilityFrame;
+      this._frameNumber = tileset._frameNumber;
     }
@@ -404,3 +404,3 @@ }, {
       this._selectionDepth = 0;
-      this._updatedVisibilityFrame = 0;
+      this._frameNumber = 0;
       this._touchedFrame = 0;
@@ -407,0 +407,0 @@ this._visitedFrame = 0;

dist/esm/lib/tileset/tileset-3d.js

@@ -144,3 +144,3 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
     this._timeSinceLoad = 0.0;
-    this._updatedVisibilityFrame = 0;
+    this._frameNumber = 0;
     this._extras = undefined;
@@ -183,2 +183,3 @@ this._allTilesAdditive = true;
     value: function update(viewport) {
+      this._frameNumber++;
       var frameState;
@@ -189,7 +190,5 @@
       } else {
-        frameState = getFrameState(viewport);
+        frameState = getFrameState(viewport, this._frameNumber);
       }
 
-      this._updatedVisibilityFrame++;
-
       this._cache.reset();
@@ -196,0 +195,0 @@

dist/esm/tile-3d-loader.js

 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-var VERSION = typeof "2.1.0-alpha.3" !== 'undefined' ? "2.1.0-alpha.3" : 'latest';
+var VERSION = typeof "2.1.0-alpha.4" !== 'undefined' ? "2.1.0-alpha.4" : 'latest';
 import { parse3DTile } from './lib/parsers/parse-3d-tile';
@@ -5,0 +5,0 @@

package.json

 {
   "name": "@loaders.gl/3d-tiles",
-  "version": "2.1.0-alpha.3",
+  "version": "2.1.0-alpha.4",
   "description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
@@ -37,6 +37,6 @@ "license": "MIT",
   "dependencies": {
-    "@loaders.gl/core": "2.1.0-alpha.3",
-    "@loaders.gl/gltf": "2.1.0-alpha.3",
-    "@loaders.gl/loader-utils": "2.1.0-alpha.3",
-    "@loaders.gl/math": "2.1.0-alpha.3",
+    "@loaders.gl/core": "2.1.0-alpha.4",
+    "@loaders.gl/gltf": "2.1.0-alpha.4",
+    "@loaders.gl/loader-utils": "2.1.0-alpha.4",
+    "@loaders.gl/math": "2.1.0-alpha.4",
     "@math.gl/culling": "^3.1.2",
@@ -50,3 +50,3 @@ "@math.gl/geospatial": "^3.1.2",
   },
-  "gitHead": "afb026d1d61ec2634a293adbc125f17f4964d6eb"
+  "gitHead": "2a1c53d6311d82b9080c7aec124d80d23291d846"
 }

src/lib/parsers/parse-3d-tile-batched-model.js

@@ -15,6 +15,12 @@ // This file is derived from the Cesium code base under Apache 2 license
   await extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);
+
+  const {extensions} = tile.gltf || {};
+  if (extensions && extensions.CESIUM_RTC) {
+    tile.rtcCenter = extensions.CESIUM_RTC.center;
+  }
+
   return byteOffset;
 }
 
-export function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
+function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
   byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset, options);
@@ -30,5 +36,3 @@
 
-  extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);
-
   return byteOffset;
 }

src/lib/tileset/tile-3d-header.js

@@ -331,3 +331,3 @@ // This file is derived from the Cesium code base under Apache 2 license
     const tileset = this._tileset;
-    if (this._updatedVisibilityFrame === tileset._updatedVisibilityFrame) {
+    if (this._frameNumber === tileset._frameNumber) {
       // Return early if visibility has already been checked during the traversal.
@@ -351,3 +351,3 @@ // The visibility may have already been checked if the cullWithChildrenBounds optimization is used.
 
-    this._updatedVisibilityFrame = tileset._updatedVisibilityFrame;
+    this._frameNumber = tileset._frameNumber;
   }
@@ -570,3 +570,3 @@
 
-    this._updatedVisibilityFrame = 0;
+    this._frameNumber = 0;
     this._touchedFrame = 0;
@@ -573,0 +573,0 @@ this._visitedFrame = 0;

src/lib/tileset/tileset-3d.js

@@ -156,3 +156,3 @@ // This file is derived from the Cesium code base under Apache 2 license
     this._timeSinceLoad = 0.0;
-    this._updatedVisibilityFrame = 0;
+    this._frameNumber = 0;
     this._extras = undefined;
@@ -266,2 +266,4 @@
   update(viewport) {
+    // TODO: only update when camera or culling volume from last update moves (could be render camera change or prefetch camera)
+    this._frameNumber++;
     let frameState;
@@ -275,6 +277,5 @@ if ('frameNumber' in viewport) {
       // TODO deprecated in v8.x
-      frameState = getFrameState(viewport);
+      frameState = getFrameState(viewport, this._frameNumber);
     }
 
-    this._updatedVisibilityFrame++; // TODO: only update when camera or culling volume from last update moves (could be render camera change or prefetch camera)
     this._cache.reset();
@@ -281,0 +282,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

2862274

decreased by-5.59%

Number of package files

306

decreased by-2.24%

Lines of code

39586

decreased by-4.75%

Dependency changes

• + [e-mail]/core@2.1.0-alpha.4(transitive)

• + [e-mail]/gltf@2.1.0-alpha.4(transitive)

• + [e-mail]/images@2.1.0-alpha.4(transitive)

• + [e-mail]/loader-utils@2.1.0-alpha.4(transitive)

• + [e-mail]/math@2.1.0-alpha.4(transitive)

• - [e-mail]/core@2.1.0-alpha.3(transitive)

• - [e-mail]/gltf@2.1.0-alpha.3(transitive)

• - [e-mail]/images@2.1.0-alpha.3(transitive)

• - [e-mail]/loader-utils@2.1.0-alpha.3(transitive)

• - [e-mail]/math@2.1.0-alpha.3(transitive)

• [e-mail]/core@2.1.0-alpha.4

• [e-mail]/gltf@2.1.0-alpha.4

• [e-mail]/loader-utils@2.1.0-alpha.4

• [e-mail]/math@2.1.0-alpha.4