Skip to content

Commit

Permalink
Merge ab09f65 into 8140873
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibgreen
ibgreen committed Apr 3, 2019
2 parents 8140873 + ab09f65 commit 78d3315
Show file tree
Hide file tree
Showing 43 changed files with 169 additions and 72 deletions.
1 change: 0 additions & 1 deletion .gitattributes
View file
@@ -1,4 +1,3 @@
yarn.lock -diff
build/** -diff
dist/** -diff
_docs/** -diff
2 changes: 1 addition & 1 deletion dev-modules/babel-plugin-inline-webgl-constants/package.json
View file
Expand Up @@ -15,6 +15,6 @@
],
"main": "index.js",
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.6"
"@luma.gl/constants": "^7.0.0-beta"
}
}
4 changes: 2 additions & 2 deletions examples/core/cubemap/package.json
View file
Expand Up @@ -5,8 +5,8 @@
"build": "webpack --env.analyze"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/core/dof/package.json
View file
Expand Up @@ -9,8 +9,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/core/fragment/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/core/gltf/package.json
View file
Expand Up @@ -11,9 +11,9 @@
},
"dependencies": {
"@loaders.gl/core": "v1.0.0-alpha.2",
"@luma.gl/addons": "^7.0.0-alpha.16",
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/addons": "^7.0.0-beta",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/core/instancing/package.json
View file
Expand Up @@ -5,7 +5,7 @@
"build": "webpack --env.local --env.analyze --profile --json > stats.json"
},
"dependencies": {
"@luma.gl/core": "7.0.0-alpha",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/core/mandelbrot/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/persistence/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open --mode=development"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/core/shadowmap/package.json
View file
Expand Up @@ -9,8 +9,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/core/texture-3d/package.json
View file
Expand Up @@ -5,7 +5,7 @@
"build": "webpack --env.local --env.analyze --profile --json > stats.json"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1",
"noise3d": "^1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/core/transform-feedback/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/transform/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/core": "^7.0.0-beta",
"probe.gl": "^3.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/lessons/01/package.json
View file
Expand Up @@ -9,7 +9,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/lessons/02/package.json
View file
Expand Up @@ -9,7 +9,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/lessons/03/package.json
View file
Expand Up @@ -9,7 +9,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/lessons/04/package.json
View file
Expand Up @@ -9,7 +9,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/lessons/05/package.json
View file
Expand Up @@ -9,8 +9,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions examples/lessons/06/package.json
View file
Expand Up @@ -9,9 +9,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/addons": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/addons": "^7.0.0-beta",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions examples/lessons/07/package.json
View file
Expand Up @@ -9,9 +9,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/addons": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/addons": "^7.0.0-beta",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions examples/lessons/08/package.json
View file
Expand Up @@ -9,9 +9,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/addons": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/addons": "^7.0.0-beta",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/lessons/09/package.json
View file
Expand Up @@ -9,8 +9,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/addons": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta",
"@luma.gl/addons": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/lessons/10/package.json
View file
Expand Up @@ -8,9 +8,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/addons": "^7.0.0-beta.1",
"@luma.gl/constants": "^7.0.0-beta.1",
"@luma.gl/core": "^7.0.0-beta.1",
"@luma.gl/addons": "^7.0.0-beta",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions examples/lessons/11/package.json
View file
Expand Up @@ -8,9 +8,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/addons": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/addons": "^7.0.0-beta",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/lessons/12/package.json
View file
Expand Up @@ -8,8 +8,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/lessons/13/package.json
View file
Expand Up @@ -8,8 +8,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/lessons/14/package.json
View file
Expand Up @@ -8,7 +8,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/lessons/15/package.json
View file
Expand Up @@ -8,8 +8,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/lessons/16/package.json
View file
Expand Up @@ -4,8 +4,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.3",
"@luma.gl/core": "^7.0.0-alpha",
"@luma.gl/constants": "^7.0.0-beta",
"@luma.gl/core": "^7.0.0-beta",
"math.gl": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions modules/script/package.json
View file
Expand Up @@ -26,9 +26,9 @@
"dependencies": {
"@luma.gl/constants": "^7.0.0-alpha.2",
"@luma.gl/core": "^7.0.0-alpha.17",
"@luma.gl/debug": "^7.0.0-alpha",
"@luma.gl/debug": "^7.0.0-beta",
"@luma.gl/glfx": "^6.3.0-alpha.2",
"@luma.gl/shadertools": "^7.0.0-alpha",
"@luma.gl/shadertools": "^7.0.0-beta",
"math.gl": "^2.3.0-beta.2"
}
}
2 changes: 1 addition & 1 deletion test/apps/wip/cubemap2/package.json
View file
Expand Up @@ -5,7 +5,7 @@
"build": "webpack --env.analyze"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/custom-picking/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/debugger/package.json
View file
Expand Up @@ -5,7 +5,7 @@
"build": "webpack --env.analyze"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/deferred-rendering/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/imageproc/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open -d"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/particles/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/picking/package.json
View file
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"@loaders.gl/core": "^0.5.3",
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/wip/voronoi/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@luma.gl/core": "^7.0.0-alpha"
"@luma.gl/core": "^7.0.0-beta"
},
"devDependencies": {
"webpack": "^4.3.0",
Expand Down

0 comments on commit 78d3315

Please sign in to comment.