Skip to content

Commit

Permalink
Merge d1156e8 into ae2e18e
Browse files Browse the repository at this point in the history
  • Loading branch information
ibgreen committed Dec 18, 2019
2 parents ae2e18e + d1156e8 commit 94005e3
Show file tree
Hide file tree
Showing 30 changed files with 351,564 additions and 16 deletions.
4 changes: 2 additions & 2 deletions examples/cesium/3d-tiles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@loaders.gl/3d-tiles": "^2.0.0-beta.2",
"@loaders.gl/core": "^2.0.0-beta.2",
"@loaders.gl/draco": "^2.0.0-beta.2",
"@math.gl/culling": "3.0.0",
"math.gl": "^3.0.0"
"@math.gl/culling": "^3.1.1",
"math.gl": "^3.1.1"
},
"devDependencies": {
"babel-plugin-inline-import": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/deck.gl/3d-tiles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"@loaders.gl/core": "^2.0.0-beta.2",
"@loaders.gl/draco": "^2.0.0-beta.2",
"@loaders.gl/gltf": "^2.0.0-beta.2",
"@probe.gl/stats-widget": "^3.1.0",
"@probe.gl/stats-widget": "^3.2.0",
"marked": "^0.7.0",
"probe.gl": "^3.1.0",
"probe.gl": "^3.2.0",
"prop-types": "^15.7.2",
"react": "^16.8.0",
"react-dom": "^16.8.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/deck.gl/i3s/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@probe.gl/stats-widget": "^3.1.0",
"marked": "^0.7.0",
"pako": "^1.0.10",
"probe.gl": "^3.1.0",
"probe.gl": "^3.2.0",
"prop-types": "^15.7.2",
"react": "^16.8.0",
"react-dom": "^16.8.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/3d-tiles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"@loaders.gl/gltf": "2.0.0-beta.5",
"@loaders.gl/loader-utils": "2.0.0-beta.5",
"@loaders.gl/math": "2.0.0-beta.5",
"@math.gl/culling": "^3.0.0",
"@math.gl/geospatial": "^3.0.0",
"math.gl": "^3.0.0",
"probe.gl": "^3.1.1"
"@math.gl/culling": "^3.1.1",
"@math.gl/geospatial": "^3.1.1",
"math.gl": "^3.1.1",
"probe.gl": "^3.2.0"
}
}
8 changes: 4 additions & 4 deletions modules/i3s/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"@loaders.gl/gltf": "2.0.0-beta.5",
"@loaders.gl/loader-utils": "2.0.0-beta.5",
"@loaders.gl/math": "2.0.0-beta.5",
"@math.gl/culling": "^3.0.0",
"@math.gl/geospatial": "^3.0.0",
"math.gl": "^3.0.0",
"probe.gl": "^3.1.1",
"@math.gl/culling": "^3.1.1",
"@math.gl/geospatial": "^3.1.1",
"math.gl": "^3.1.1",
"probe.gl": "^3.2.0",
"viewport-mercator-project": "^6.2.2",
"zip-loader": "^1.1.0"
}
Expand Down
5 changes: 5 additions & 0 deletions modules/json/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# @loaders.gl/json

This module contains a table loader for the JSON and line delimited JSON formats.

[loaders.gl](https://loaders.gl/docs) is a collection of framework independent visualization-focused loaders (parsers).
40 changes: 40 additions & 0 deletions modules/json/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "@loaders.gl/json",
"version": "1.2.2",
"description": "Framework-independent loader for JSON and streaming JSON formats",
"license": "MIT",
"publishConfig": {
"access": "public"
},
"repository": {
"type": "git",
"url": "https://github.com/uber-web/loaders.gl"
},
"keywords": [
"webgl",
"loader",
"parser",
"table",
"JSON",
"Streaming JSON",
"JSON stream",
"JSON async iterator"
],
"main": "dist/es5/index.js",
"module": "dist/esm/index.js",
"esnext": "dist/es6/index.js",
"sideEffects": false,
"files": [
"src",
"dist",
"README.md"
],
"scripts": {
"pre-build": "npm run build-bundle && npm run build-bundle -- --env.dev",
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/core": "1.2.2",
"@loaders.gl/experimental": "1.2.2"
}
}
7 changes: 7 additions & 0 deletions modules/json/src/bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* global window, global */
const moduleExports = require('./index');

const _global = typeof window === 'undefined' ? global : window;
_global.loaders = _global.loaders || {};

module.exports = Object.assign(_global.loaders, moduleExports);
28 changes: 28 additions & 0 deletions modules/json/src/clarinet/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Copyright (c) Isaac Z. Schlueter ("Author")
Copyright (c) 2011 nuno job <nunojob.com>
All rights reserved.

The BSD License

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit 94005e3

Please sign in to comment.