Skip to content

Commit

Permalink
playground: add back Cairo 3d tiles example and bump luma
Browse files Browse the repository at this point in the history
  • Loading branch information
xintong committed Mar 14, 2020
1 parent ee68e0e commit 0edfc2e
Show file tree
Hide file tree
Showing 16 changed files with 72 additions and 67 deletions.
4 changes: 2 additions & 2 deletions examples/layer-browser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"dependencies": {
"@loaders.gl/ply": "^2.1.0-beta.1",
"@loaders.gl/gltf": "^2.1.0-beta.1",
"@luma.gl/experimental": "^8.1.0-beta.2",
"@luma.gl/debug": "^8.1.0-beta.2",
"@luma.gl/experimental": "^8.1.0-beta.4",
"@luma.gl/debug": "^8.1.0-beta.4",
"colorbrewer": "^1.0.0",
"d3-request": "^1.0.6",
"d3-scale": "^3.1.0",
Expand Down
5 changes: 2 additions & 3 deletions examples/playground/json-examples/3d-tiles-cairo-vricon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
"id": "tiles-cairo-vricon",
"DracoWorkerLoader": "@!DracoWorkerLoader",
"loader": "@@#CesiumIonLoader",
"data": "https://assets.cesium.com/44865/tileset.json",
"data": "https://assets.cesium.com/29328/tileset.json",
"loadOptions": {
"cesium-ion": {
"accessToken":
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwOTBkYTA1ZS03NGM5LTQyNTEtOTViOS1hZDFmNDZjZGQ3YTEiLCJpZCI6NDQsInNjb3BlcyI6WyJhc3IiXSwiYXNzZXRzIjpbNDQ4NjVdLCJpYXQiOjE1Njk0MTcwNjh9.zrWE65u2u-TYyTSRKhDl9-yDYrC_qxiJQ-tZFCgMbt0"
"accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/playground/json-examples/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
'website/3D Tiles (Tile3DLayer, Royal)': require('./3d-tiles-royal.json'),
'website/3D Tiles (Tile3DLayer, St Helens)': require('./3d-tiles-st-helens.json'),
// TODO restore when luma fix shader assemble
// 'website/3D Tiles (Tile3DLayer, Cairo/vricon)': require('./3d-tiles-cairo-vricon.json'),
'website/3D Tiles (Tile3DLayer, Cairo/vricon)': require('./3d-tiles-cairo-vricon.json'),
'website/3D Tiles (Tile3DLayer, New York)': require('./3d-tiles-new-york.json'),
// GET STARTED EXAMPLES AS JSON PAYLOADS
'get-started/US map (GeoJsonLayer)': require('./us-map.json'),
Expand Down
3 changes: 2 additions & 1 deletion examples/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/draco": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.1",
"@luma.gl/constants": "^8.1.0-beta.2",
"@loaders.gl/gltf": "^2.1.0-beta.1",
"@luma.gl/constants": "^8.1.0-beta.4",
"brace": "^0.11.1",
"react": "~16.9.0",
"react-ace": "^6.1.4",
Expand Down
4 changes: 4 additions & 0 deletions examples/playground/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import {render} from 'react-dom';
import AutoSizer from 'react-virtualized-auto-sizer';
import {StaticMap} from 'react-map-gl';
import DeckWithMaps from './deck-with-maps';
import {DracoWorkerLoader} from '@loaders.gl/draco';
import {registerLoaders} from '@loaders.gl/core';

registerLoaders([DracoWorkerLoader]);

import {FlyToInterpolator} from '@deck.gl/core';
import {JSONConverter, JSONConfiguration, _shallowEqualObjects} from '@deck.gl/json';
Expand Down
5 changes: 3 additions & 2 deletions examples/website/3d-tiles/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ registerLoaders([DracoWorkerLoader]);
// Set your mapbox token here
const MAPBOX_TOKEN = process.env.MapboxAccessToken; // eslint-disable-line

const ION_ASSET_ID = 43978;
const ION_ASSET_ID = 44865;
const ION_TOKEN =
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwOTBkYTA1ZS03NGM5LTQyNTEtOTViOS1hZDFmNDZjZGQ3YTEiLCJpZCI6NDQsInNjb3BlcyI6WyJhc3IiXSwiYXNzZXRzIjpbNDQ4NjVdLCJpYXQiOjE1Njk0MTcwNjh9.zrWE65u2u-TYyTSRKhDl9-yDYrC_qxiJQ-tZFCgMbt0';
// 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
const TILESET_URL = `https://assets.cesium.com/${ION_ASSET_ID}/tileset.json`;

const INITIAL_VIEW_STATE = {
Expand Down
2 changes: 1 addition & 1 deletion modules/aggregation-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@luma.gl/shadertools": "^8.1.0-beta.2",
"@luma.gl/shadertools": "^8.1.0-beta.4",
"@math.gl/web-mercator": "^3.1.3",
"d3-hexbin": "^0.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/images": "^2.1.0-beta.1",
"@luma.gl/core": "^8.1.0-beta.2",
"@luma.gl/core": "^8.1.0-beta.4",
"@math.gl/web-mercator": "^3.1.3",
"gl-matrix": "^3.0.0",
"math.gl": "^3.1.2",
Expand Down
2 changes: 1 addition & 1 deletion modules/extensions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@luma.gl/shadertools": "^8.1.0-beta.2"
"@luma.gl/shadertools": "^8.1.0-beta.4"
},
"peerDependencies": {
"@deck.gl/core": "^8.0.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/jupyter-widget/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@loaders.gl/3d-tiles": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/csv": "^2.1.0-beta.1",
"@luma.gl/constants": "^8.1.0-beta.2",
"@luma.gl/constants": "^8.1.0-beta.4",
"mapbox-gl": "^1.2.1"
},
"jupyterlab": {
Expand Down
4 changes: 2 additions & 2 deletions modules/mesh-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@deck.gl/core": "^8.0.0"
},
"dependencies": {
"@luma.gl/experimental": "^8.1.0-beta.2",
"@luma.gl/shadertools": "^8.1.0-beta.2"
"@luma.gl/experimental": "^8.1.0-beta.4",
"@luma.gl/shadertools": "^8.1.0-beta.4"
}
}
4 changes: 2 additions & 2 deletions modules/test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
],
"peerDependencies": {
"@deck.gl/core": "^8.0.0",
"@luma.gl/test-utils": "^8.1.0-beta.2",
"@luma.gl/webgl": "^8.1.0-beta.2",
"@luma.gl/test-utils": "^8.1.0-beta.4",
"@luma.gl/webgl": "^8.1.0-beta.4",
"@probe.gl/test-utils": "^3.2.1"
},
"scripts": {}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"devDependencies": {
"@loaders.gl/csv": "^2.1.0-beta.1",
"@loaders.gl/polyfills": "^2.1.0-beta.1",
"@luma.gl/engine": "^8.1.0-beta.2",
"@luma.gl/test-utils": "^8.1.0-beta.2",
"@luma.gl/engine": "^8.1.0-beta.4",
"@luma.gl/test-utils": "^8.1.0-beta.4",
"@probe.gl/bench": "^3.2.1",
"@probe.gl/test-utils": "^3.2.1",
"babel-loader": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/glsl-debugger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --port 3000 --open"
},
"dependencies": {
"@luma.gl/debug": "^8.1.0-beta.2",
"@luma.gl/debug": "^8.1.0-beta.4",
"deck.gl": "^7.3.0-beta",
"glsl-transpiler": "^1.8.5"
},
Expand Down
6 changes: 3 additions & 3 deletions website-gatsby/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"dependencies": {
"@loaders.gl/draco": "^2.1.0-beta.1",
"@loaders.gl/las": "^2.1.0-beta.1",
"@luma.gl/constants": "^8.1.0-beta.2",
"@luma.gl/core": "^8.1.0-beta.2",
"@luma.gl/webgl": "^8.1.0-beta.2",
"@luma.gl/constants": "^8.1.0-beta.4",
"@luma.gl/core": "^8.1.0-beta.4",
"@luma.gl/webgl": "^8.1.0-beta.4",
"@probe.gl/stats-widget": "^3.0.1",
"baseui": "^9.26.0",
"d3-color": "^1.4.0",
Expand Down
88 changes: 44 additions & 44 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1665,82 +1665,82 @@
"@math.gl/geospatial" "^3.1.2"
"@probe.gl/stats" "^3.2.1"

"@luma.gl/constants@8.1.0-beta.2", "@luma.gl/constants@^8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.1.0-beta.2.tgz#c07863d68933e04f515ccbcd7e98f820041d15c5"
integrity sha512-EA7vfFFMZa8oHEyCPFZMGGkSpoUVtNkbGuaq3FiQKlAUAnnVfQlFgYjNIb27xlFeKN4yDoHNnvrwFAiHU604qQ==
"@luma.gl/constants@8.1.0-beta.4", "@luma.gl/constants@^8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.1.0-beta.4.tgz#598bd3f82025d80758725b8a210fecdf7b4cdc9c"
integrity sha512-AR9zV0si5RMtbQEyyiTA/aserfQ7TzKxd4/6iw9JOY/ZlaSgHKE1jg6xVa53q8rxkYLjn93yHcno8IpT9abaUw==

"@luma.gl/constants@^8.0.0":
version "8.0.3"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.3.tgz#5418bc121f2d2b477e94df1170702f7563ee1b91"
integrity sha512-Ps89hhaNGyseXDECnSNWbDARP3n1WOttoUnci2BL3O6Od7IIzkuV4HeoI3wsH5Zyyf9/3UBFaFwDnfnfK7E0TA==

"@luma.gl/core@^8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.1.0-beta.2.tgz#0e2cbea13b2d041050c31e349ea9429802d6e557"
integrity sha512-Ut7efqTXv9TQXN1OWCN1R8tBsMBITZ9TmOzBLCRnuHowDDRDiVxL3o8FgvMRr6SLCxFgclk19Bo2a2PPYmmABg==
"@luma.gl/core@^8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.1.0-beta.4.tgz#cd725db30b629dbd29af5f11b9a00f019de70cf9"
integrity sha512-4FuwFP/bgflhN1/+XgjWINxVPRqg5rw/NAK5xz7E1wmZdQ64BNnA76lcwDVSqzP2kbJrAkeHnHVK8dvSkHdHOw==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "8.1.0-beta.2"
"@luma.gl/engine" "8.1.0-beta.2"
"@luma.gl/shadertools" "8.1.0-beta.2"
"@luma.gl/webgl" "8.1.0-beta.2"
"@luma.gl/constants" "8.1.0-beta.4"
"@luma.gl/engine" "8.1.0-beta.4"
"@luma.gl/shadertools" "8.1.0-beta.4"
"@luma.gl/webgl" "8.1.0-beta.4"

"@luma.gl/engine@8.1.0-beta.2", "@luma.gl/engine@^8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.1.0-beta.2.tgz#068d94faee5e41c590a8565f8e609cb569f44a19"
integrity sha512-W9ALM8al28iuiQKm5JHvfNBcWdgOgBL7Z6dXsK4rPcsLL+E0t7LNhgQrb+pP6nsDtkePpX71EJK7Kmi2OqVSRw==
"@luma.gl/engine@8.1.0-beta.4", "@luma.gl/engine@^8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.1.0-beta.4.tgz#c306fa2bf7e3f1b5ab4ef38f4a949056469099af"
integrity sha512-UC7wlbOJyDUxKReA0gQ77UO8xOEc9NjNR9MVuOQMzjTCpIR4npK+yRqFMmAjTMx/9i5l1jbtIl/TqVzNygqIyg==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "8.1.0-beta.2"
"@luma.gl/gltools" "8.1.0-beta.2"
"@luma.gl/shadertools" "8.1.0-beta.2"
"@luma.gl/webgl" "8.1.0-beta.2"
"@luma.gl/constants" "8.1.0-beta.4"
"@luma.gl/gltools" "8.1.0-beta.4"
"@luma.gl/shadertools" "8.1.0-beta.4"
"@luma.gl/webgl" "8.1.0-beta.4"
math.gl "^3.1.3"
probe.gl "^3.3.0-alpha.4"

"@luma.gl/experimental@^8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.1.0-beta.2.tgz#a16e93b7994b5a0518c52c4a8946cf6598fef92a"
integrity sha512-w13z+YArORvkXcAvdU9osJAV6pB4uvmdNR7bbNjP94Hj9xXUaD0EHbPaCLV9Hc3BDRnMlcckhtOEsBUGgVDTNA==
"@luma.gl/experimental@^8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.1.0-beta.4.tgz#ea6afa9a06ce498ab17d625bdb312a7819383256"
integrity sha512-yl8Oj8xF0MpBW93OeN9A/X63Cg/4RWfK51C5AnsPq6Om1J0ZSrtHP8nTgw0CIrlUYoKCZjOJbjIPUAt5fm3Ikg==
dependencies:
"@loaders.gl/images" "^2.1.0-alpha.4"
"@luma.gl/constants" "8.1.0-beta.2"
"@luma.gl/constants" "8.1.0-beta.4"
earcut "^2.0.6"
math.gl "^3.1.3"

"@luma.gl/gltools@8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.1.0-beta.2.tgz#eea9bc4c74e881cdc0ccc9235af43786d70fb395"
integrity sha512-SFF6Hj+zoPOPIcS/0hO3VxEzQpxFq6YXRbnnp9EMi/mJ+F6YOreqsfMn98UC461ksrHtNzYQZdkOnImtDndO9g==
"@luma.gl/gltools@8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.1.0-beta.4.tgz#50a8bf8f3d9982ce55549db3542c40748467f3b9"
integrity sha512-bMolfJuoSO5tdRO0LIivmwYIaQI1GTztwE9+yxmpTJ3NhWA6nenwszObtSXkpl9UU7dkq6GLCH0FQSqC9wj9uQ==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "8.1.0-beta.2"
"@luma.gl/constants" "8.1.0-beta.4"
probe.gl "^3.3.0-alpha.4"

"@luma.gl/shadertools@8.1.0-beta.2", "@luma.gl/shadertools@^8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.1.0-beta.2.tgz#23b5abe87b6a05ab3d3f6dc6096ea0adf7be7d67"
integrity sha512-9oPPUuFb24vYji0lczyq6kGWyS1RG+eO9KQlIsR52s89bt/YGx4L37GmU5HK6CZAiHMm+hPBeIfjMdDd8saswg==
"@luma.gl/shadertools@8.1.0-beta.4", "@luma.gl/shadertools@^8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.1.0-beta.4.tgz#b2919580ac5d6626c9c9552106d396f7303f2957"
integrity sha512-XbFJKZnabmnyEKOZ5KLz7BGE3/PFEWQ3wGGODWHo7Hoid6wu2OM7ivfdrxlKdPjfI1ibKtDwaHk42F28+wdpmw==
dependencies:
"@babel/runtime" "^7.0.0"
math.gl "^3.1.3"

"@luma.gl/test-utils@^8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-8.1.0-beta.2.tgz#056d2016559abc575361ff010a29627c1bd53830"
integrity sha512-IjK0aMA+BoeNiMq4kImCHxiOyyfK188O8UasfsWi8ms366n80E20U5aYYiC2RayJKOcjYkHByHGNbqlD9kNyUQ==
"@luma.gl/test-utils@^8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-8.1.0-beta.4.tgz#595207d1131ed336b570870f0791ccb38e558c18"
integrity sha512-rMYvXxL43PdHLB4zdeEH/8kZ853PbcZbgNjaUqoecCs2NyBnK3EONJcZ6pzxGTcZzKps5ofFMOlQZSo1vCM9jg==
dependencies:
probe.gl "^3.3.0-alpha.4"

"@luma.gl/webgl@8.1.0-beta.2":
version "8.1.0-beta.2"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.1.0-beta.2.tgz#f7def9c0948c2aeb70ed03802082cd08ae461948"
integrity sha512-5jrnv3fFAiY6slmxRnyh8fJHsyMr3x3v2MiNC8CM9xH3nYKRnrQHTW9UmnUS7vfw4RG6A/N7E+0IfQyZpJds0g==
"@luma.gl/webgl@8.1.0-beta.4":
version "8.1.0-beta.4"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.1.0-beta.4.tgz#223d41c0808e5d8b619c95e9089db6d849be4ab9"
integrity sha512-9CeVX7Sv2tmx7ORVOU5eNYmx/OohGzUsqVxL2fVEHQ8+j4TdQ6C/DfbBzKl15gzXVvDTx/mwbuGpitGjRPJdkg==
dependencies:
"@babel/runtime" "^7.0.0"
"@luma.gl/constants" "8.1.0-beta.2"
"@luma.gl/gltools" "8.1.0-beta.2"
"@luma.gl/constants" "8.1.0-beta.4"
"@luma.gl/gltools" "8.1.0-beta.4"
probe.gl "^3.3.0-alpha.4"

"@mapbox/geojson-area@0.2.2":
Expand Down

0 comments on commit 0edfc2e

Please sign in to comment.