Fix transform matrix (#275)

visgl · Jun 29, 2019 · 910db28 · 910db28
1 parent f0e1a87
commit 910db28
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 67 deletions.
diff --git a/examples/3d-tiles/app.js b/examples/3d-tiles/app.js
@@ -5,7 +5,7 @@ import React, {PureComponent} from 'react';
 import {render} from 'react-dom';
 import {StaticMap} from 'react-map-gl';
 import DeckGL from '@deck.gl/react';
-import {COORDINATE_SYSTEM, MapController} from '@deck.gl/core';
+import {MapController} from '@deck.gl/core';
 import {Vector3} from 'math.gl';
 // import '@loaders.gl/polyfills';
 // import '@luma.gl/debug';
@@ -39,8 +39,6 @@ const ADDITIONAL_EXAMPLES = {
     royalExhibitionBuilding: {
       tilesetUrl:
         'https://raw.githubusercontent.com/uber-common/deck.gl-data/master/3d-tiles/RoyalExhibitionBuilding/tileset.json',
-      coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS,
-      isWGS84: true,
       depthLimit: 2, // TODO: Remove this after sse traversal is working since this is just to prevent full load of tileset
       color: [115, 101, 152, 200]
     }
@@ -249,26 +247,19 @@ export default class App extends PureComponent {
     const {tilesetExampleProps} = this.state;
     const {
       tilesetUrl,
-      coordinateSystem,
       coordinateOrigin,
-      isWGS84,
       depthLimit = 5,
       color = [255, 0, 0, 255]
     } = tilesetExampleProps;
-    return (
-      tilesetExampleProps &&
-      new Tile3DLayer({
-        id: 'tile-3d-layer',
-        tilesetUrl,
-        coordinateSystem,
-        coordinateOrigin,
-        isWGS84,
-        depthLimit,
-        color,
-        onTileLoaded: this._onTileLoaded.bind(this),
-        onTilesetLoaded: () => this.forceUpdate()
-      })
-    );
+    return new Tile3DLayer({
+      id: 'tile-3d-layer',
+      tilesetUrl,
+      coordinateOrigin,
+      depthLimit,
+      color,
+      onTileLoaded: this._onTileLoaded.bind(this),
+      onTilesetLoaded: () => this.forceUpdate()
+    });
   }
 
   render() {

diff --git a/examples/3d-tiles/package.json b/examples/3d-tiles/package.json
@@ -15,11 +15,10 @@
     "@loaders.gl/3d-tiles": "^1.0.3",
     "@loaders.gl/core": "^1.0.3",
     "@luma.gl/addons": "^7.1.0",
+    "@math.gl/geospatial": "^3.0.0-alpha.6",
     "@math.gl/culling": "^3.0.0-alpha.6",
-    "@math.gl/geospatial": "^3.0.0-alpha.5",
     "@probe.gl/stats-widget": "^3.0.3",
-    "math.gl": "^3.0.0-alpha.5",
-    "@loaders.gl/gltf": "^7.1.0",
+    "math.gl": "^3.0.0-alpha.6",
     "prop-types": "^15.7.2",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",

diff --git a/examples/3d-tiles/tile-3d-layer.js b/examples/3d-tiles/tile-3d-layer.js
@@ -24,16 +24,14 @@ import {
 
 registerLoaders([Tile3DLoader, Tileset3DLoader, GLTFLoader]);
 
-const DEFAULT_POINT_COLOR = [255, 0, 0, 255];
+const DEFAULT_POINT_COLOR = [202, 112, 41, 255];
 
 const defaultProps = {
   // TODO - the tileset json should be an async prop.
   tilesetUrl: null,
   isWGS84: false,
   color: DEFAULT_POINT_COLOR,
   depthLimit: Number.MAX_SAFE_INTEGER,
-  coordinateSystem: null,
-  coordinateOrigin: null,
   onTileLoaded: () => {},
   onTilesetLoaded: () => {}
 };
@@ -295,52 +293,28 @@ export default class Tile3DLayer extends CompositeLayer {
       return {};
     }
 
-    const {coordinateSystem, coordinateOrigin, isWGS84} = this.props;
     const {rtcCenter} = tileHeader.content;
-    const {transform} = tileHeader.userData;
+    const {transform, positions} = tileHeader.userData;
 
     const transformProps = {};
 
-    if (coordinateSystem) {
-      transformProps.coordinateSystem = coordinateSystem;
-    }
-    if (coordinateOrigin) {
-      transformProps.coordinateOrigin = coordinateOrigin;
-    }
-
-    let modelMatrix;
-    if (transform) {
-      modelMatrix = new Matrix4(transform);
-    }
-
+    let modelMatrix = new Matrix4(transform);
     if (rtcCenter) {
-      modelMatrix = modelMatrix || new Matrix4();
       modelMatrix.translate(rtcCenter);
-      transformProps.coordinateSystem =
-        transformProps.coordinateSystem || COORDINATE_SYSTEM.METER_OFFSETS;
     }
 
-    if (isWGS84) {
-      transformProps.coordinateSystem = coordinateSystem || COORDINATE_SYSTEM.METER_OFFSETS;
-      transformProps.coordinateOrigin = coordinateOrigin;
-      // TODO - Heuristics to get a coordinateOrigin from the tile
-      // verify with spec
-      if (!coordinateOrigin) {
-        if (modelMatrix) {
-          const origin = new Vector3();
-          modelMatrix.transform(origin, origin);
-          transformProps.coordinateOrigin = Ellipsoid.WGS84.cartesianToCartographic(origin, origin);
-          modelMatrix = null;
-        } else {
-          // No model matrix, so assume bounding volume center
-          transformProps.coordinateOrigin = tileHeader.boundingVolume.center;
-        }
-      }
-    }
+    const firstPoint = [positions[0], positions[1], positions[2]];
 
-    if (modelMatrix) {
-      transformProps.modelMatrix = modelMatrix;
-    }
+    const originInCartesian = modelMatrix.transform(firstPoint, new Vector3());
+    const originInCarto = Ellipsoid.WGS84.cartesianToCartographic(originInCartesian, new Vector3());
+
+    const rotateMatrix = Ellipsoid.WGS84.eastNorthUpToFixedFrame(originInCartesian);
+
+    modelMatrix = new Matrix4(rotateMatrix.invert()).multiplyRight(modelMatrix);
+
+    transformProps.coordinateOrigin = originInCarto;
+    transformProps.modelMatrix = modelMatrix;
+    transformProps.coordinateSystem = COORDINATE_SYSTEM.METER_OFFSETS;
 
     return transformProps;
   }

diff --git a/examples/gltf/package.json b/examples/gltf/package.json
@@ -14,7 +14,7 @@
     "@luma.gl/addons": "^7.1.0-beta.1",
     "@luma.gl/constants": "^7.1.0-beta.1",
     "@luma.gl/core": "^7.1.0-beta.1",
-    "math.gl": "^2.3.1"
+    "math.gl": "^3.0.0-alpha.6"
   },
   "devDependencies": {
     "html-webpack-plugin": "^3.2.0",

diff --git a/examples/webpack.config.local.js b/examples/webpack.config.local.js
@@ -85,7 +85,7 @@ function addLocalDependency(config, dependency) {
   return config;
 }
 
-function addLocalDevSettings(config) {
+function addLocalDevSettings(config, opts) {
   config = Object.assign({}, LOCAL_DEVELOPMENT_CONFIG, config);
   config.resolve = config.resolve || {};
   config.resolve.alias = config.resolve.alias || {};

diff --git a/modules/3d-tiles/package.json b/modules/3d-tiles/package.json
@@ -38,8 +38,8 @@
     "@loaders.gl/gltf": "1.2.0-alpha.1",
     "@loaders.gl/loader-utils": "1.2.0-alpha.1",
     "@loaders.gl/math": "1.2.0-alpha.1",
-    "@math.gl/culling": "^3.0.0-alpha.5",
-    "@math.gl/geospatial": "^3.0.0-alpha.5",
-    "math.gl": "^3.0.0-alpha.5"
+    "@math.gl/culling": "^3.0.0-alpha.6",
+    "@math.gl/geospatial": "^3.0.0-alpha.6",
+    "math.gl": "^3.0.0-alpha.6"
   }
 }