Skip to content

Commit

Permalink
Merge 51ea759 into f2bc050
Browse files Browse the repository at this point in the history
  • Loading branch information
Pessimistress committed Mar 6, 2024
2 parents f2bc050 + 51ea759 commit 6cb9bd1
Show file tree
Hide file tree
Showing 19 changed files with 146 additions and 169 deletions.
10 changes: 3 additions & 7 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module.exports = getESLintConfig({

rules: {
'no-unused-expressions': 'warn',
'import/no-unresolved': 1,
'no-console': 1,
'no-continue': ['warn'],
'callback-return': 0,
Expand Down Expand Up @@ -52,8 +51,8 @@ module.exports = getESLintConfig({

'consistent-return': 0, // We use typescript noImplicitReturn
'default-case': 0, // We rely on typescript
'import/no-unresolved': 0,
'import/no-extraneous-dependencies': 0,
'import/no-unresolved': 'error',
'import/no-extraneous-dependencies': 'error',
'no-unused-expressions': 'warn',
'@typescript-eslint/no-empty-function': 0,
'@typescript-eslint/no-misused-promises': 0,
Expand All @@ -71,9 +70,6 @@ module.exports = getESLintConfig({
'warn',
{vars: 'all', args: 'none', ignoreRestSiblings: false}
],
// We still have some issues with import resolution
'import/named': 0,
// 'import/no-extraneous-dependencies': ['warn'],
// Warn instead of error
// 'max-params': ['warn'],
// 'no-undef': ['warn'],
Expand All @@ -99,7 +95,7 @@ module.exports = getESLintConfig({
// This means lint will not find the imported files and generate false warnings
{
// scripts use devDependencies
files: ['**/test/**/*.js', '**/scripts/**/*.js', '*.config.js', '*.config.local.js'],
files: ['**/test/**/*.ts', '**/test/**/*.js', '**/scripts/**/*.js', '*.config.ts', '*.config.js', '*.config.local.js'],
rules: {
'import/no-unresolved': 0,
'import/no-extraneous-dependencies': 0
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- feat(shadertools): ShaderAssembler support single compute/unified shader (#1980)
- chore(webgpu): Improve ComputePipeline implementation, add tests (#1979)

### v9.0.0-beta.6
### v9.0.0-beta.7

- feat: Add QuerySet resource (#1975)
- chore(engine): Restore tests for Model class (#1973)
Expand Down
3 changes: 2 additions & 1 deletion examples/portable/rotating-cube/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"@luma.gl/core": "9.0.0-beta.7",
"@luma.gl/engine": "9.0.0-beta.7",
"@luma.gl/shadertools": "9.0.0-beta.7",
"@luma.gl/webgpu": "9.0.0-beta.7"
"@luma.gl/webgpu": "9.0.0-beta.7",
"@math.gl/core": "^4.0.0"
},
"devDependencies": {
"typescript": "^5.3.0",
Expand Down
5 changes: 3 additions & 2 deletions examples/script/webgl/transform-feedback/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
"serve": "vite preview"
},
"dependencies": {
"@luma.gl/engine": "9.0.0-alpha.54",
"@luma.gl/webgl": "9.0.0-alpha.54"
"@luma.gl/core": "9.0.0-beta.7",
"@luma.gl/engine": "9.0.0-beta.7",
"@luma.gl/webgl": "9.0.0-beta.7"
},
"devDependencies": {
"typescript": "^5.1.6",
Expand Down
5 changes: 4 additions & 1 deletion examples/tutorials/hello-gltf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
"serve": "vite preview"
},
"dependencies": {
"@loaders.gl/core": "^4.0.4",
"@loaders.gl/gltf": "^4.0.4",
"@luma.gl/core": "9.0.0-beta.7",
"@luma.gl/engine": "9.0.0-beta.7",
"@luma.gl/gltf": "9.0.0-beta.7",
"@luma.gl/shadertools": "9.0.0-beta.7",
"@luma.gl/webgl": "9.0.0-beta.7",
"@luma.gl/webgpu": "9.0.0-beta.7"
"@luma.gl/webgpu": "9.0.0-beta.7",
"@math.gl/core": "^4.0.0"
},
"devDependencies": {
"typescript": "^5.3.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/webgpu/computeboids/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// @ts-nocheck
/* eslint-disable no-console */

import updateSprites from './update-sprites.wgsl?raw';
import sprites from './sprites.wgsl?raw';
import updateSprites from './update-sprites.wgsl?raw'; // eslint-disable-line
import sprites from './sprites.wgsl?raw'; // eslint-disable-line
import {Buffer} from '@luma.gl/core';
// import { RenderPipelineParameters} from '@luma.gl/core';
import {Model, WebGPUDevice} from '@luma.gl/webgpu';
Expand Down
4 changes: 4 additions & 0 deletions modules/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
"prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
},
"dependencies": {
"@math.gl/types": "^4.0.0",
"@probe.gl/env": "^4.0.2",
"@probe.gl/log": "^4.0.2",
"@probe.gl/stats": "^4.0.2",
"@types/offscreencanvas": "^2019.6.4"
},
"gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
Expand Down
4 changes: 2 additions & 2 deletions modules/engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
},
"peerDependencies": {
"@luma.gl/core": "^9.0.0-beta.4",
"@luma.gl/shadertools": "^9.0.0-beta.4"
"@luma.gl/core": "^9.0.0-beta"
},
"dependencies": {
"@luma.gl/shadertools": "9.0.0-beta.7",
"@math.gl/core": "^4.0.0",
"@probe.gl/log": "^4.0.2",
"@probe.gl/stats": "^4.0.2"
Expand Down
6 changes: 1 addition & 5 deletions modules/engine/src/debug/copy-texture-to-image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// Copyright (c) vis.gl contributors

import {Texture, Framebuffer} from '@luma.gl/core';
import {GL} from '@luma.gl/constants';
import {flipRows, scalePixels} from './pixel-data-utils';

/**
Expand Down Expand Up @@ -44,10 +43,7 @@ export function copyTextureToDataUrl(
source: Texture | Framebuffer,
options: CopyTextureToImageOptions = {}
): string {
const {
sourceAttachment = GL.COLOR_ATTACHMENT0, // TODO - support gl.readBuffer
targetMaxHeight = Number.MAX_SAFE_INTEGER
} = options;
const {sourceAttachment, targetMaxHeight = Number.MAX_SAFE_INTEGER} = options;

let data = source.device.readPixelsToArrayWebGL(source, {sourceAttachment});

Expand Down
2 changes: 1 addition & 1 deletion modules/engine/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export type {ModelNodeProps} from './scenegraph/model-node';
export {ModelNode} from './scenegraph/model-node';

// Geometries
export type {GeometryProps} from './geometry/geometry';
export type {GeometryProps, GeometryAttribute} from './geometry/geometry';
export {Geometry} from './geometry/geometry';
export type {GPUGeometryProps} from './geometry/gpu-geometry';
export {GPUGeometry} from './geometry/gpu-geometry';
Expand Down
15 changes: 5 additions & 10 deletions modules/gltf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,13 @@
"prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
},
"peerDependencies": {
"@luma.gl/core": "^9.0.0-beta.4",
"@luma.gl/engine": "^9.0.0-beta.4",
"@luma.gl/shadertools": "^9.0.0-beta.4",
"@luma.gl/webgl": "^9.0.0-beta.4"
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
},
"dependencies": {
"@math.gl/core": "4.0.0"
},
"devDependencies": {
"@loaders.gl/gltf": "^4.0.4",
"@loaders.gl/math": "^4.0.4",
"@luma.gl/test-utils": "9.0.0-beta.7"
"@loaders.gl/textures": "^4.1.0",
"@luma.gl/shadertools": "9.0.0-beta.7",
"@math.gl/core": "^4.0.0"
},
"gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
}
9 changes: 3 additions & 6 deletions modules/gltf/src/gltf/gltf-instantiator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {Device, Buffer, PrimitiveTopology} from '@luma.gl/core';
import {Geometry, GroupNode, ModelNode, ModelProps} from '@luma.gl/engine';
import {GeometryAttribute} from '@luma.gl/engine/geometry/geometry';
import {WebGLDevice} from '@luma.gl/webgl';
import {Geometry, GeometryAttribute, GroupNode, ModelNode, ModelProps} from '@luma.gl/engine';
import {Matrix4} from '@math.gl/core';

import {GLTFAnimator} from './gltf-animator';
Expand Down Expand Up @@ -29,13 +27,12 @@ const DEFAULT_OPTIONS: GLTFInstantiatorOptions = {
* Walks the parsed and resolved glTF structure and builds a luma.gl scenegraph
*/
export class GLTFInstantiator {
// TODO - replace with Device
device: WebGLDevice;
device: Device;
options: GLTFInstantiatorOptions;
gltf: any;

constructor(device: Device, options: GLTFInstantiatorOptions = {}) {
this.device = device as WebGLDevice;
this.device = device;
this.options = {...DEFAULT_OPTIONS, ...options};
}

Expand Down
2 changes: 1 addition & 1 deletion modules/shadertools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
},
"peerDependencies": {
"@luma.gl/core": "^9.0.0-beta.4"
"@luma.gl/core": "^9.0.0-beta"
},
"dependencies": {
"@math.gl/core": "^4.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {ShaderModule} from '@luma.gl/shadertools/lib/shader-module/shader-module';
import {ShaderModule} from '../../../lib/shader-module/shader-module';
import {glsl} from '../../../lib/glsl-utils/highlight';
import type {NumberArray} from '../../../types';
import {project} from '../../project/project';
Expand Down
19 changes: 7 additions & 12 deletions modules/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,15 @@
"pre-build": "echo test utils has no bundle"
},
"peerDependencies": {
"@luma.gl/core": "^9.0.0-beta.4",
"@luma.gl/engine": "^9.0.0-beta.4",
"@luma.gl/shadertools": "^9.0.0-beta.4",
"@luma.gl/webgl": "^9.0.0-beta.4",
"@luma.gl/webgpu": "^9.0.0-beta.4"
},
"devDependencies": {
"@luma.gl/core": "9.0.0-beta.7",
"@luma.gl/engine": "9.0.0-beta.7",
"@luma.gl/webgl": "9.0.0-beta.7",
"@luma.gl/webgpu": "9.0.0-beta.7"
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta",
"@luma.gl/shadertools": "^9.0.0-beta",
"@luma.gl/webgl": "^9.0.0-beta",
"@luma.gl/webgpu": "^9.0.0-beta"
},
"dependencies": {
"@probe.gl/env": "^4.0.2"
"@probe.gl/env": "^4.0.2",
"@probe.gl/stats": "^4.0.2"
},
"gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
}
3 changes: 1 addition & 2 deletions modules/webgl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@
"prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
},
"peerDependencies": {
"@luma.gl/constants": "^9.0.0-beta.4"
"@luma.gl/core": "^9.0.0-beta"
},
"dependencies": {
"@luma.gl/constants": "9.0.0-beta.7",
"@luma.gl/core": "9.0.0-beta.7",
"@probe.gl/env": "^4.0.2"
},
"gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
Expand Down
2 changes: 1 addition & 1 deletion modules/webgpu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
},
"peerDependencies": {
"@luma.gl/core": "^9.0.0-beta.4"
"@luma.gl/core": "^9.0.0-beta"
},
"dependencies": {
"@probe.gl/env": "^4.0.2",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"metrics": "./scripts/metrics.sh && ocular-metrics"
},
"devDependencies": {
"@loaders.gl/core": "4.0.0-beta.7",
"@loaders.gl/gltf": "4.0.0-beta.7",
"@loaders.gl/polyfills": "4.0.0-beta.7",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/gltf": "^4.1.0",
"@loaders.gl/polyfills": "^4.1.0",
"@probe.gl/bench": "^4.0.2",
"@probe.gl/stats": "^4.0.2",
"@probe.gl/stats-widget": "^4.0.2",
Expand Down
Loading

0 comments on commit 6cb9bd1

Please sign in to comment.