Skip to content

Commit

Permalink
chore: Port I3S examples to v9 (#2903)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibgreen
ibgreen committed Mar 6, 2024
1 parent eef42ae commit c4dac47
Show file tree
Hide file tree
Showing 20 changed files with 493 additions and 441 deletions.
12 changes: 6 additions & 6 deletions examples/website/3d-tiles/package.json
View file
Expand Up @@ -11,12 +11,12 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/core": "^9.0.0-beta.5",
"@deck.gl/extensions": "^9.0.0-beta.5",
"@deck.gl/geo-layers": "^9.0.0-beta.5",
"@deck.gl/layers": "^9.0.0-beta.5",
"@deck.gl/mesh-layers": "^9.0.0-beta.5",
"@deck.gl/react": "^9.0.0-beta.5",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/extensions": "^9.0.0-beta.6",
"@deck.gl/geo-layers": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/mesh-layers": "^9.0.0-beta.6",
"@deck.gl/react": "^9.0.0-beta.6",
"@loaders.gl/3d-tiles": "^4.1.0",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/gltf": "^4.1.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/website/geospatial/package.json
View file
Expand Up @@ -11,9 +11,9 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/core": "^9.0.0-beta.5",
"@deck.gl/layers": "^9.0.0-beta.5",
"@deck.gl/react": "^9.0.0-beta.5",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/react": "^9.0.0-beta.6",
"@loaders.gl/arrow": "^4.1.0",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/flatgeobuf": "^4.1.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/website/gltf/app.ts
View file
Expand Up @@ -6,7 +6,7 @@
import {load} from '@loaders.gl/core';
import {GLTFLoader} from '@loaders.gl/gltf';
import GL from '@luma.gl/constants';
import {AnimationLoop, setParameters, clear, log, lumaStats} from '@luma.gl/core';
import {AnimationLoop, setParameters, clear, log, luma} from '@luma.gl/core';
import {GLTFEnvironment} from '@luma.gl/experimental';
import {createGLTFObjects} from './create-gltf-objects';
import {Matrix4, radians} from '@math.gl/core';
Expand Down Expand Up @@ -202,7 +202,7 @@ export class AppAnimationLoop extends AnimationLoop {
this.scenes.forEach((scene) => scene.delete());
this.scenes = [];

lumaStats.get('Resource Counts').forEach(({name, count}) => {
luma.stats.get('Resource Counts').forEach(({name, count}) => {
log.info(3, `${name}: ${count}`)();
});
}
Expand Down
12 changes: 6 additions & 6 deletions examples/website/i3s-arcgis/package.json
View file
Expand Up @@ -11,12 +11,12 @@
},
"dependencies": {
"@arcgis/core": "^4.25.0",
"@deck.gl/arcgis": "^8.9.28",
"@deck.gl/core": "^8.9.28",
"@deck.gl/extensions": "^8.9.28",
"@deck.gl/geo-layers": "^8.9.28",
"@deck.gl/layers": "^8.9.28",
"@deck.gl/mesh-layers": "^8.9.28",
"@deck.gl/arcgis": "^9.0.0-beta.6",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/extensions": "^9.0.0-beta.6",
"@deck.gl/geo-layers": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/mesh-layers": "^9.0.0-beta.6",
"@esri/react-arcgis": "^5.2.0",
"@loaders.gl/core": "^4.0.0",
"@loaders.gl/i3s": "^4.0.0",
Expand Down
11 changes: 8 additions & 3 deletions examples/website/i3s-building-scene-layer/package.json
View file
Expand Up @@ -11,14 +11,14 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl-community/layers": "^0.0.0",
"@deck.gl-community/layers": "^9.0.0-alpha.1",
"@fortawesome/fontawesome-svg-core": "^1.2.34",
"@fortawesome/free-solid-svg-icons": "^5.15.2",
"@fortawesome/react-fontawesome": "^0.1.14",
"@loaders.gl/core": "^4.0.0",
"@loaders.gl/i3s": "^4.0.0",
"@luma.gl/core": "^8.5.21",
"deck.gl": "^8.9.28",
"@luma.gl/core": "^9.0.0-beta.6",
"deck.gl": "^9.0.0-beta.6",
"mapbox-gl": "npm:empty-npm-package@^1.0.0",
"maplibre-gl": "^3.6.2",
"prop-types": "^15.7.2",
Expand All @@ -28,6 +28,11 @@
"react-map-gl": "^7.1.7",
"styled-components": "^4.2.0"
},
"resolutions": {
"deck.gl": "^9.0.0-beta.6",
"@math.gl/core": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0"
},
"devDependencies": {
"typescript": "^5.3.0",
"vite": "^5.0.0"
Expand Down
1 change: 0 additions & 1 deletion examples/website/i3s-building-scene-layer/vite.config.ts
View file
Expand Up @@ -8,7 +8,6 @@ const getAliases = async (frameworkName, frameworkRootDir) => {
modules.forEach(module => {
aliases[`${frameworkName}/${module}`] = `${frameworkRootDir}/modules/${module}/src`;
})
console.log(aliases);
return aliases
}

Expand Down
10 changes: 5 additions & 5 deletions examples/website/i3s-colorization-by-attributes/package.json
View file
Expand Up @@ -11,11 +11,11 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/core": "^8.9.28",
"@deck.gl-community/layers": "^0.0.0",
"@loaders.gl/core": "^4.0.0",
"@loaders.gl/i3s": "^4.0.0",
"@luma.gl/core": "^8.5.21",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl-community/layers": "^9.0.0-alpha.1",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/i3s": "^4.1.0",
"@luma.gl/core": "^9.0.0-beta.6",
"mapbox-gl": "npm:empty-npm-package@1.0.0",
"maplibre-gl": "^3.6.2",
"prop-types": "^15.7.2",
Expand Down
1 change: 0 additions & 1 deletion examples/website/i3s-colorization-by-attributes/vite.config.ts
View file
Expand Up @@ -8,7 +8,6 @@ const getAliases = async (frameworkName, frameworkRootDir) => {
modules.forEach((module) => {
aliases[`${frameworkName}/${module}`] = `${frameworkRootDir}/modules/${module}/src`;
});
console.log(aliases);
return aliases;
};

Expand Down
32 changes: 16 additions & 16 deletions examples/website/i3s/package.json
View file
Expand Up @@ -11,25 +11,25 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/core": "^8.9.28",
"@deck.gl/extensions": "^8.9.28",
"@deck.gl/geo-layers": "^8.9.28",
"@deck.gl/layers": "^8.9.28",
"@deck.gl/mesh-layers": "^8.9.28",
"@deck.gl/react": "^8.9.28",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/extensions": "^9.0.0-beta.6",
"@deck.gl/geo-layers": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/mesh-layers": "^9.0.0-beta.6",
"@deck.gl/react": "^9.0.0-beta.6",
"@fortawesome/fontawesome-svg-core": "^1.2.34",
"@fortawesome/free-solid-svg-icons": "^5.15.2",
"@fortawesome/react-fontawesome": "^0.1.14",
"@loaders.gl/core": "^4.0.0",
"@loaders.gl/draco": "^4.0.0",
"@loaders.gl/gltf": "^4.0.0",
"@loaders.gl/i3s": "^4.0.0",
"@loaders.gl/images": "^4.0.0",
"@luma.gl/constants": "^8.5.21",
"@luma.gl/core": "^8.5.21",
"@luma.gl/engine": "^8.5.21",
"@luma.gl/shadertools": "^8.5.21",
"@luma.gl/webgl": "^8.5.21",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/draco": "^4.1.0",
"@loaders.gl/gltf": "^4.1.0",
"@loaders.gl/i3s": "^4.1.0",
"@loaders.gl/images": "^4.1.0",
"@luma.gl/constants": "^9.0.0-beta.6",
"@luma.gl/core": "^9.0.0-beta.6",
"@luma.gl/engine": "^9.0.0-beta.6",
"@luma.gl/shadertools": "^9.0.0-beta.6",
"@luma.gl/webgl": "^9.0.0-beta.6",
"@math.gl/core": "^4.0.0",
"@math.gl/culling": "^4.0.0",
"@math.gl/geospatial": "^4.0.0",
Expand Down
18 changes: 9 additions & 9 deletions examples/website/i3s/src/app-debug.tsx
View file
Expand Up @@ -6,7 +6,7 @@ import maplibregl from 'maplibre-gl';
import {HuePicker, MaterialPicker} from 'react-color';
import styled from 'styled-components';

import {lumaStats} from '@luma.gl/core';
import {luma} from '@luma.gl/core';
import DeckGL from '@deck.gl/react';
import {
FlyToInterpolator,
Expand Down Expand Up @@ -266,7 +266,7 @@ export default class App extends PureComponent {
}

componentDidMount() {
this._memWidget = new StatsWidget(lumaStats.get('Memory Usage'), {
this._memWidget = new StatsWidget(luma.stats.get('Memory Usage'), {
framesPerUpdate: 1,
formatters: {
'GPU Memory': 'memory',
Expand Down Expand Up @@ -699,13 +699,13 @@ export default class App extends PureComponent {
getColor: (d) => d.color,
getWidth: 2
}),
new BoundingVolumeLayer({
id: 'bounding-volume-layer',
visible: boundingVolume,
tiles,
getBoundingVolumeColor: this.getBoundingVolumeColor.bind(this),
boundingVolumeType
}),
// new BoundingVolumeLayer({
// id: 'bounding-volume-layer',
// visible: boundingVolume,
// tiles,
// getBoundingVolumeColor: this.getBoundingVolumeColor.bind(this),
// boundingVolumeType
// }),
new LineLayer({
id: 'normals-debug',
data: normalsDebugData,
Expand Down
4 changes: 2 additions & 2 deletions examples/website/i3s/src/app.tsx
View file
Expand Up @@ -17,7 +17,7 @@ import {TerrainLayer, Tile3DLayer} from '@deck.gl/geo-layers';
import {I3SLoader, I3SBuildingSceneLayerLoader, loadFeatureAttributes} from '@loaders.gl/i3s';
import {StatsWidget} from '@probe.gl/stats-widget';

import {lumaStats} from '@luma.gl/core';
import {luma} from '@luma.gl/core';
import {load, fetchFile} from '@loaders.gl/core';


Expand Down Expand Up @@ -148,7 +148,7 @@ class App extends PureComponent {
}

componentDidMount() {
this._memWidget = new StatsWidget(lumaStats.get('Memory Usage'), {
this._memWidget = new StatsWidget(luma.stats.get('Memory Usage'), {
framesPerUpdate: 1,
formatters: {
'GPU Memory': 'memory',
Expand Down
1 change: 0 additions & 1 deletion examples/website/i3s/vite.config.ts
View file
Expand Up @@ -8,7 +8,6 @@ const getAliases = async (frameworkName, frameworkRootDir) => {
modules.forEach(module => {
aliases[`${frameworkName}/${module}`] = `${frameworkRootDir}/modules/${module}/src`;
})
console.log(aliases);
return aliases
}

Expand Down
6 changes: 3 additions & 3 deletions examples/website/pointcloud/package.json
View file
Expand Up @@ -10,9 +10,9 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/react": "^9.0.0-beta.5",
"@deck.gl/core": "^9.0.0-beta.5",
"@deck.gl/layers": "^9.0.0-beta.5",
"@deck.gl/react": "^9.0.0-beta.6",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/draco": "^4.1.0",
"@loaders.gl/las": "^4.1.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/website/tiles/package.json
View file
Expand Up @@ -11,12 +11,12 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/core": "^9.0.0-beta.5",
"@deck.gl/layers": "^9.0.0-beta.5",
"@deck.gl/geo-layers": "^9.0.0-beta.5",
"@deck.gl/mesh-layers": "^9.0.0-beta.5",
"@deck.gl/extensions": "^9.0.0-beta.5",
"@deck.gl/react": "^9.0.0-beta.5",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/geo-layers": "^9.0.0-beta.6",
"@deck.gl/mesh-layers": "^9.0.0-beta.6",
"@deck.gl/extensions": "^9.0.0-beta.6",
"@deck.gl/react": "^9.0.0-beta.6",
"@loaders.gl/core": "^4.0.0",
"@loaders.gl/loader-utils": "^4.0.0",
"@loaders.gl/mvt": "^4.0.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/website/wms/package.json
View file
Expand Up @@ -11,12 +11,12 @@
"serve": "vite preview"
},
"dependencies": {
"@deck.gl/core": "^9.0.0-beta.5",
"@deck.gl/geo-layers": "^9.0.0-beta.5",
"@deck.gl/layers": "^9.0.0-beta.5",
"@deck.gl/mesh-layers": "^9.0.0-beta.5",
"@deck.gl/extensions": "^9.0.0-beta.5",
"@deck.gl/react": "^9.0.0-beta.5",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/geo-layers": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/mesh-layers": "^9.0.0-beta.6",
"@deck.gl/extensions": "^9.0.0-beta.6",
"@deck.gl/react": "^9.0.0-beta.6",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/wms": "^4.1.0",
"@monaco-editor/react": "^4.5.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/parquet/test/index.ts
View file
Expand Up @@ -19,4 +19,4 @@ import './geoparquet-loader.spec';

import './parquet-columnar-loader.spec';

import './parquet-wasm-loader.spec';
// import './parquet-wasm-loader.spec';
4 changes: 2 additions & 2 deletions modules/parquet/test/parquet-wasm-loader.spec.ts
View file
Expand Up @@ -13,14 +13,14 @@ setLoaderOptions({
_workerType: 'test'
});

test('ParquetLoader#loader objects', (t) => {
test('ParquetWASMLoader#loader objects', (t) => {
// Not sure why validateLoader calls parse? Raises an error about "Invalid Parquet file"
// validateLoader(t, ParquetWasmLoader, 'ParquetLoader');
// validateLoader(t, ParquetWasmWorkerLoader, 'ParquetWorkerLoader');
t.end();
});

test('Load Parquet file', async (t) => {
test('ParquetWASMLoader#Load Parquet file', async (t) => {
const url = `${PARQUET_DIR}/geoparquet/example.parquet`;
const table = await load(url, ParquetWasmLoader, {});
const arrowTable = table.data;
Expand Down
16 changes: 8 additions & 8 deletions website/package.json
View file
Expand Up @@ -17,14 +17,14 @@
"dependencies": {
"@algolia/autocomplete-js": "^1.8.3",
"@arcgis/core": "^4.25.0",
"@deck.gl-community/layers": "^0.0.0",
"@deck.gl/arcgis": "^8.9.28",
"@deck.gl/core": "^8.9.28",
"@deck.gl/extensions": "^8.9.28",
"@deck.gl/geo-layers": "^8.9.28",
"@deck.gl/layers": "^8.9.28",
"@deck.gl/mesh-layers": "^8.9.28",
"@deck.gl/react": "^8.9.28",
"@deck.gl-community/layers": "^9.0.0-alpha.1",
"@deck.gl/arcgis": "^9.0.0-beta.6",
"@deck.gl/core": "^9.0.0-beta.6",
"@deck.gl/extensions": "^9.0.0-beta.6",
"@deck.gl/geo-layers": "^9.0.0-beta.6",
"@deck.gl/layers": "^9.0.0-beta.6",
"@deck.gl/mesh-layers": "^9.0.0-beta.6",
"@deck.gl/react": "^9.0.0-beta.6",
"@docusaurus/core": "^3.1.1",
"@docusaurus/preset-classic": "^3.1.1",
"@esri/react-arcgis": "^5.2.0",
Expand Down
2 changes: 2 additions & 0 deletions website/src/examples/i3s-arcgis.mdx
View file
@@ -1,5 +1,7 @@
# I3S

```
import Demo from './i3s-arcgis';
<Demo />
```

0 comments on commit c4dac47

Please sign in to comment.