@deck.gl/arcgis 8.10.0-alpha.7 → 9.0.0-alpha.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/arcgis",
   "description": "Use deck.gl as a custom ArcGIS API for JavaScript layer",
   "license": "MIT",
-  "version": "8.10.0-alpha.7",
+  "version": "9.0.0-alpha.4",
   "publishConfig": {
     "access": "public"
   },
@@ -32,11 +32,12 @@
   "peerDependencies": {
     "@arcgis/core": "^4.0.0",
     "@deck.gl/core": "^8.0.0",
-    "@luma.gl/core": "^8.0.0"
+    "@luma.gl/core": "9.0.0-alpha.42",
+    "@luma.gl/engine": "9.0.0-alpha.42"
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "esri-loader": "^3.3.0"
   },
-  "gitHead": "1c62a9eec914019afd3969bc0c59f1488e491207"
+  "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
 }

package/src/{commons.js → commons.ts}

@@ -1,14 +1,17 @@
 /* eslint-disable no-invalid-this */
 
-import {Deck} from '@deck.gl/core';
-import {Model, Buffer, Framebuffer, instrumentGLContext, withParameters} from '@luma.gl/core';
+import type {Device} from '@luma.gl/core';
+import {Model} from '@luma.gl/engine';
+import {GL} from '@luma.gl/constants';
+import {withGLParameters} from '@luma.gl/webgl';
 
-export function initializeResources(gl) {
-  instrumentGLContext(gl);
+import {Deck} from '@deck.gl/core';
 
-  this.buffer = new Buffer(gl, new Int8Array([-1, -1, 1, -1, -1, 1, 1, 1]));
+export function initializeResources(device: Device) {
+  // What is `this` referring to this function???
+  this.buffer = device.createBuffer(new Int8Array([-1, -1, 1, -1, -1, 1, 1, 1]));
 
-  this.model = new Model(gl, {
+  this.model = new Model(device, {
     vs: `
       attribute vec2 a_pos;
       varying vec2 v_texcoord;
@@ -28,13 +31,14 @@ export function initializeResources(gl) {
       }
     `,
     attributes: {
+      // eslint-disable-next-line camelcase
       a_pos: this.buffer
     },
     vertexCount: 4,
-    drawMode: gl.TRIANGLE_STRIP
+    drawMode: GL.TRIANGLE_STRIP
   });
 
-  this.deckFbo = new Framebuffer(gl, {width: 1, height: 1});
+  this.deckFbo = device.createFramebuffer({width: 1, height: 1});
 
   this.deckInstance = new Deck({
     // The view state will be set dynamically to track the MapView current extent.
@@ -44,7 +48,7 @@ export function initializeResources(gl) {
     controller: false,
 
     // We use the same WebGL context as the ArcGIS API for JavaScript.
-    gl,
+    gl: device.gl,
 
     // We need depth testing in general; we don't know what layers might be added to the deck.
     parameters: {
@@ -83,7 +87,7 @@ export function render({gl, width, height, viewState}) {
   this.deckInstance.redraw('arcgis');
 
   // We overlay the texture on top of the map using the full-screen quad.
-  withParameters(
+  withGLParameters(
     gl,
     {
       blend: true,
@@ -92,7 +96,8 @@ export function render({gl, width, height, viewState}) {
       viewport: [0, 0, width, height]
     },
     () => {
-      this.model.setUniforms({u_texture: this.deckFbo}).draw();
+      // eslint-disable-next-line camelcase
+      this.model.setUniforms({u_texture: this.deckFbo}).draw(this.context.renderPass);
     }
   );
 }

package/LICENSE

@@ -1,19 +0,0 @@
-Copyright Vis.gl contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.