Skip to content

Commit

Permalink
Merge b20914a into c2737d4
Browse files Browse the repository at this point in the history
  • Loading branch information
ibgreen committed Aug 5, 2019
2 parents c2737d4 + b20914a commit cbba017
Show file tree
Hide file tree
Showing 13 changed files with 1,090 additions and 1,068 deletions.
8 changes: 2 additions & 6 deletions arrowjs/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@
"react-dom": "^16.6.0"
},
"devDependencies": {
"gatsby": "2.3.0",
"gatsby-plugin-styletron": "^3.0.5",
"ocular-gatsby": "1.0.0-alpha.33",
"gatsby": "^2.13.0",
"ocular-gatsby": "1.0.0-alpha.44",
"sharp": "^0.22.1"
},
"resolutions": {
"**/sharp": "^0.22.1"
}
}
2 changes: 1 addition & 1 deletion docs/api-reference/gltf-loaders/gltf-loader.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# GLTFLoaders
# GLTFLoader

Parses a glTF file into a hierarchical scenegraph description that can be used to instantiate an actual Scenegraph in most WebGL libraries. Can load both binary `.glb` files and JSON `.gltf` files.

Expand Down
7 changes: 0 additions & 7 deletions docs/table-of-contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,6 @@
{
"title": "Math Library (Experimental)",
"entries": [
{"entry": "docs/api-reference/math/geospatial/README"},
{"entry": "docs/api-reference/math/geospatial/ellipsoid"},
{"entry": "docs/api-reference/math/culling/README"},
{"entry": "docs/api-reference/math/culling/bounding-sphere"},
{"entry": "docs/api-reference/math/culling/culling-volume"},
{"entry": "docs/api-reference/math/culling/oriented-bounding-box"},
{"entry": "docs/api-reference/math/culling/plane"},
{"entry": "docs/api-reference/math/geometry/README"},
{"entry": "docs/api-reference/math/geometry/gl-type"}
]
Expand Down
18 changes: 18 additions & 0 deletions docs/whats-new.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# What's New

## v1.2 (In Development, alpha/beta releases available)

Release Date: Aug 8, 2019

- `@loaders.gl/core`: File Type Auto Detection now supports binary files
- `@loaders.gl/polyfills`: Fixed `TextEncoder` warnings
- `@loaders.gl/arrow`: Improved Node 8 support
- `@loaders.gl/images`: Image file extensions now added to loader object
- `@loaders.gl/gltf`: Generate default sampler parameters if none provided in gltf file

### @loaders.gl/3d-tiles <sup>EXPERIMENTAL</sup>

- Support for dynamic traversal of 3D tilesets (automatically loads and unloads tiles based on viewer position and view frustum).
- Support for loading tilesets from Cesium ION servers.
- Asynchronous tileset loading
- Auto centering of view based on tileset bounding volumes
- deck.gl `Tile3DLayer` class provided in examples.

## v1.1

Release Date: May 30, 2019
Expand Down
18 changes: 8 additions & 10 deletions examples/3d-tiles/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,30 @@ import {getStatsWidget} from './components/stats-widgets';
const DATA_URI = 'https://raw.githubusercontent.com/uber-web/loaders.gl/master';
const INDEX_FILE = `${DATA_URI}/modules/3d-tiles/test/data/index.json`;

const ION_ACCESS_TOKEN = process.env.IonAccessToken; // eslint-disable-line
// eslint-disable-next-line
const ION_ACCESS_TOKEN =
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIxN2NhMzkwYi0zNWM4LTRjNTYtYWE3Mi1jMDAxYzhlOGVmNTAiLCJpZCI6OTYxOSwic2NvcGVzIjpbImFzbCIsImFzciIsImFzdyIsImdjIl0sImlhdCI6MTU2MjE4MTMxM30.OkgVr6NaKYxabUMIGqPOYFe0V5JifXLVLfpae63x-tA';

// Set your mapbox token here
const MAPBOX_TOKEN = process.env.MapboxAccessToken; // eslint-disable-line
const MAPBOX_STYLE = 'mapbox://styles/mapbox/light-v9';
const DEPTH_LIMIT = 2; // TODO: Remove this after sse traversal is working since this is just to prevent full load of tileset

const INITIAL_EXAMPLE_CATEGORY = 'additional';
const INITIAL_EXAMPLE_NAME = 'royalExhibitionBuilding';
// const INITIAL_EXAMPLE_CATEGORY = 'Instanced';
// const INITIAL_EXAMPLE_NAME = 'InstancedGltfExternal';
// const INITIAL_EXAMPLE_CATEGORY = 'PointCloud';
// const INITIAL_EXAMPLE_NAME = 'PointCloudRGB';
const INITIAL_EXAMPLE_NAME = 'Mount St Helens (Cesium ion)';

const scratchLongLatZoom = new Vector3();

const ADDITIONAL_EXAMPLES = {
name: 'additional',
examples: {
royalExhibitionBuilding: {
'Royal Exhibition Building (Github Pages)': {
tilesetUrl:
'https://raw.githubusercontent.com/uber-common/deck.gl-data/master/3d-tiles/RoyalExhibitionBuilding/tileset.json',
depthLimit: DEPTH_LIMIT, // TODO: Remove this after sse traversal is working since this is just to prevent full load of tileset
color: [115, 101, 152, 200]
},
'St Helen (Cesium ion)': {
'Mount St Helens (Cesium ion)': {
ionAssetId: 33301, // St Helen
ionAccessToken: ION_ACCESS_TOKEN
}
Expand Down Expand Up @@ -212,9 +210,9 @@ export default class App extends PureComponent {
points
</div>
<div>
{' '}
{viewState.longitude.toFixed(5)} {viewState.latitude.toFixed(5)} {viewState.zoom}{' '}
long/lat: {viewState.longitude.toFixed(5)},{viewState.latitude.toFixed(5)}
</div>
<div>zoom: {viewState.zoom.toFixed(2)} </div>
</ControlPanel>
);
}
Expand Down
14 changes: 7 additions & 7 deletions examples/3d-tiles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
},
"dependencies": {
"@babel/polyfill": "^7.4.4",
"@deck.gl/core": "^7.2.0-alpha.3",
"@deck.gl/layers": "^7.2.0-alpha.3",
"@deck.gl/mesh-layers": "^7.2.0-alpha.3",
"@deck.gl/react": "^7.2.1-alpha.1",
"@loaders.gl/3d-tiles": "^1.0.3",
"@loaders.gl/core": "^1.0.3",
"@luma.gl/addons": "^7.1.0",
"@deck.gl/core": "^7.2.0-alpha.4",
"@deck.gl/layers": "^7.2.0-alpha.4",
"@deck.gl/mesh-layers": "^7.2.0-alpha.4",
"@deck.gl/react": "^7.2.0-alpha.4",
"@loaders.gl/3d-tiles": "^1.2.0-beta.2",
"@loaders.gl/core": "^1.2.0-beta.2",
"@luma.gl/addons": "^7.2.0-alpha.4",
"@math.gl/geospatial": "^3.0.0-beta.2",
"@math.gl/culling": "^3.0.0-beta.2",
"@probe.gl/stats-widget": "^3.1.0-alpha.7",
Expand Down
2 changes: 1 addition & 1 deletion modules/las/src/laslaz-decoder.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

// laslaz.js - treat as compiled code
import getModule from './laz-perf.transpiled';
const getModule = require('./laz-perf.transpiled');

let Module = null;

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
},
"devDependencies": {
"@babel/register": "^7.4.4",
"@luma.gl/core": "^7.1.0",
"@luma.gl/debug": "^7.1.0",
"@luma.gl/test-utils": "^7.1.0",
"@luma.gl/core": "^7.2.0-alpha.4",
"@luma.gl/debug": "^7.2.0-alpha.4",
"@luma.gl/test-utils": "^7.2.0-alpha.4",
"@probe.gl/bench": "^3.0.3",
"@probe.gl/test-utils": "^3.0.3",
"arraybuffer-loader": "^1.0.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// run by gatsby. Rather, a file of the same name must have the same query in the local tree.
// During the init process, ocular copies this file over to the local tree.

// WARNING: DO NOT MODIFY THIS FILE MANUALLY IT WILL BE OVERWRITTEN.
import React from 'react';
import {StaticQuery, graphql} from 'gatsby';

Expand All @@ -20,6 +21,7 @@ const QUERY = graphql`
PROJECT_URL
PROJECT_ORG
HOME_HEADING
LINK_TO_GET_STARTED
HOME_BULLETS {
text
desc
Expand Down
14 changes: 8 additions & 6 deletions website/ocular-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,19 @@ module.exports = {
}
],

LINK_TO_GET_STARTED: 'docs/developer-guide/get-started',

ADDITIONAL_LINKS: [],

INDEX_PAGE_URL: resolve(__dirname, './templates/index.jsx'),

EXAMPLES: [
{
title: 'Point Clouds & Meshes',
image: 'images/example-pointcloud.png',
componentUrl: resolve(__dirname, '../examples/pointcloud/app.js'),
path: 'examples/pointcloud'
},
// {
// title: 'Point Clouds & Meshes',
// image: 'images/example-pointcloud.png',
// componentUrl: resolve(__dirname, '../examples/pointcloud/app.js'),
// path: 'examples/pointcloud'
// },
{
title: '3D Tiles',
image: 'images/example-3d-tiles.png',
Expand Down
30 changes: 15 additions & 15 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@
"deploy": "NODE_DEBUG=gh-pages gh-pages -d public"
},
"dependencies": {
"@deck.gl/core": "^7.1.2",
"@deck.gl/layers": "^7.1.2",
"@deck.gl/mesh-layers": "^7.1.2",
"@deck.gl/react": "^7.1.2",
"@loaders.gl/draco": "^1.0.3",
"@loaders.gl/las": "^1.0.3",
"@luma.gl/addons": "^7.1.1",
"@luma.gl/constants": "^7.1.1",
"@luma.gl/core": "^7.1.1",
"@luma.gl/webgl": "^7.1.1",
"@deck.gl/core": "^7.2.0-alpha.4",
"@deck.gl/layers": "^7.2.0-alpha.4",
"@deck.gl/mesh-layers": "^7.2.0-alpha.4",
"@deck.gl/react": "^7.2.0-alpha.4",
"@loaders.gl/draco": "^1.2.0-beta.2",
"@loaders.gl/las": "1.2.0-beta.2",
"@luma.gl/addons": "^7.2.0-alpha.6",
"@luma.gl/constants": "^7.2.0-alpha.6",
"@luma.gl/core": "^7.2.0-alpha.6",
"@luma.gl/webgl": "^7.2.0-alpha.6",
"math.gl": "^3.0.0-beta.2",
"@math.gl/culling": "^3.0.0-beta.2",
"@math.gl/geospatial": "^3.0.0-beta.2",
"@probe.gl/stats-widget": "^3.1.0-alpha.2",
"@probe.gl/stats-widget": "^3.1.0-alpha.7",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"react-map-gl": "^5.0.0",
"styled-components": "^4.2.0"
},
"devDependencies": {
"gatsby": "^2.3.0",
"gatsby": "^2.13.51",
"gatsby-plugin-no-sourcemaps": "^2.0.2",
"gh-pages": "^2.0.1",
"ocular-gatsby": "1.0.0-alpha.38",
"sharp": "^0.22.0"
"gh-pages": "^2.1.0",
"ocular-gatsby": "1.0.0-alpha.46",
"sharp": "^0.23.0"
}
}
112 changes: 0 additions & 112 deletions website/src/components/site-query.jsx

This file was deleted.

Loading

0 comments on commit cbba017

Please sign in to comment.