diff --git a/README.md b/README.md index ba13d94..c9b6e20 100644 --- a/README.md +++ b/README.md @@ -311,7 +311,7 @@ const uni1 = makeStructuredView(defs.uniforms.uni1, new ArrayBuffer(4 * 16)); * include from the net ```js -import { createTextureFromImage } from 'https://greggman.github.io/webgpu-utils/dist/0.x/webgpu-utils.module.js' +import { createTextureFromImage } from 'https://greggman.github.io/webgpu-utils/dist/1.x/webgpu-utils.module.js' ... ``` @@ -340,7 +340,7 @@ npm start ``` This will run rollup in watch mode, building from typescript into -`dist/0.x/webgpu-utils.js`. +`dist/1.x/webgpu-utils.js`. ``` npx servez diff --git a/examples/2d-array.js b/examples/2d-array.js index 3c4500c..99a7bd4 100644 --- a/examples/2d-array.js +++ b/examples/2d-array.js @@ -1,7 +1,7 @@ /* global GPUBufferUsage */ /* global GPUTextureUsage */ import { mat4, vec3 } from 'https://wgpu-matrix.org/dist/2.x/wgpu-matrix.module.js'; -import * as wgh from '../dist/0.x/webgpu-utils.module.js'; +import * as wgh from '../dist/1.x/webgpu-utils.module.js'; async function main() { const adapter = await navigator.gpu?.requestAdapter(); diff --git a/examples/background.js b/examples/background.js index 8d30137..5369d1c 100644 --- a/examples/background.js +++ b/examples/background.js @@ -1,7 +1,7 @@ /* global GPUBufferUsage */ /* global GPUTextureUsage */ import { mat4, vec3 } from 'https://wgpu-matrix.org/dist/2.x/wgpu-matrix.module.js'; -import * as wgh from '../dist/0.x/webgpu-utils.module.js'; +import * as wgh from '../dist/1.x/webgpu-utils.module.js'; async function main() { const adapter = await navigator.gpu?.requestAdapter(); @@ -120,7 +120,7 @@ async function main() { indexBuffer, indexFormat, numElements, - } = wgh.createBuffersAndAttributesFromArrays(device, wgh.primitives.createCylinderVertices(2, 4)); + } = wgh.createBuffersAndAttributesFromArrays(device, wgh.primitives.createCylinderVertices({radius: 2, height: 4})); const module = device.createShaderModule({code}); const module2 = device.createShaderModule({code: code2}); diff --git a/examples/cube-map.js b/examples/cube-map.js index 1ce1f4a..4545c6d 100644 --- a/examples/cube-map.js +++ b/examples/cube-map.js @@ -1,7 +1,7 @@ /* global GPUBufferUsage */ /* global GPUTextureUsage */ import { mat4 } from 'https://wgpu-matrix.org/dist/2.x/wgpu-matrix.module.js'; -import * as wgh from '../dist/0.x/webgpu-utils.module.js'; +import * as wgh from '../dist/1.x/webgpu-utils.module.js'; import GUI from './3rdparty/muigui-0.x.module.js'; async function main() { diff --git a/examples/cube.js b/examples/cube.js index ca7a4ff..98ccee4 100644 --- a/examples/cube.js +++ b/examples/cube.js @@ -1,7 +1,7 @@ /* global GPUBufferUsage */ /* global GPUTextureUsage */ import { mat4, vec3 } from 'https://wgpu-matrix.org/dist/2.x/wgpu-matrix.module.js'; -import * as wgh from '../dist/0.x/webgpu-utils.module.js'; +import * as wgh from '../dist/1.x/webgpu-utils.module.js'; async function main() { const adapter = await navigator.gpu?.requestAdapter(); diff --git a/examples/instancing-size-only.js b/examples/instancing-size-only.js index 7b4860f..26e2fd8 100644 --- a/examples/instancing-size-only.js +++ b/examples/instancing-size-only.js @@ -1,7 +1,7 @@ /* global GPUBufferUsage */ /* global GPUTextureUsage */ import { mat4, vec3 } from 'https://wgpu-matrix.org/dist/2.x/wgpu-matrix.module.js'; -import * as wgh from '../dist/0.x/webgpu-utils.module.js'; +import * as wgh from '../dist/1.x/webgpu-utils.module.js'; async function main() { const adapter = await navigator.gpu?.requestAdapter(); diff --git a/examples/instancing.js b/examples/instancing.js index b225ed2..290d042 100644 --- a/examples/instancing.js +++ b/examples/instancing.js @@ -1,7 +1,7 @@ /* global GPUBufferUsage */ /* global GPUTextureUsage */ import { mat4, vec3 } from 'https://wgpu-matrix.org/dist/2.x/wgpu-matrix.module.js'; -import * as wgh from '../dist/0.x/webgpu-utils.module.js'; +import * as wgh from '../dist/1.x/webgpu-utils.module.js'; async function main() { const adapter = await navigator.gpu?.requestAdapter(); diff --git a/test/tests/attribute-utils-test.js b/test/tests/attribute-utils-test.js index 484abf8..f55cc69 100644 --- a/test/tests/attribute-utils-test.js +++ b/test/tests/attribute-utils-test.js @@ -1,5 +1,5 @@ import { describe, it } from '../mocha-support.js'; -import { createBuffersAndAttributesFromArrays} from '../../dist/0.x/webgpu-utils.module.js'; +import { createBuffersAndAttributesFromArrays} from '../../dist/1.x/webgpu-utils.module.js'; import { assertArrayEqual, assertEqual, assertDeepEqual, assertTruthy, assertFalsy } from '../assert.js'; import { testWithDevice, readBuffer } from '../webgpu.js'; diff --git a/test/tests/buffer-views-test.js b/test/tests/buffer-views-test.js index cb9546e..6fe7795 100644 --- a/test/tests/buffer-views-test.js +++ b/test/tests/buffer-views-test.js @@ -5,7 +5,7 @@ import { setStructuredValues, makeShaderDataDefinitions, setIntrinsicsToView, -} from '../../dist/0.x/webgpu-utils.module.js'; +} from '../../dist/1.x/webgpu-utils.module.js'; import { assertArrayEqual, assertEqual, assertTruthy } from '../assert.js'; describe('buffer-views-tests', () => { diff --git a/test/tests/data-definition-test.js b/test/tests/data-definition-test.js index 36be7be..5e74344 100644 --- a/test/tests/data-definition-test.js +++ b/test/tests/data-definition-test.js @@ -1,7 +1,7 @@ import { describe, it } from '../mocha-support.js'; import { makeShaderDataDefinitions, -} from '../../dist/0.x/webgpu-utils.module.js'; +} from '../../dist/1.x/webgpu-utils.module.js'; import { assertEqual, assertFalsy, assertTruthy } from '../assert.js'; describe('data-definition-tests', () => { diff --git a/test/tests/generate-mipmap-test.js b/test/tests/generate-mipmap-test.js index 7e2bf11..529e5f7 100644 --- a/test/tests/generate-mipmap-test.js +++ b/test/tests/generate-mipmap-test.js @@ -2,7 +2,7 @@ import { describe, it } from '../mocha-support.js'; import { generateMipmap, numMipLevels, -} from '../../dist/0.x/webgpu-utils.module.js'; +} from '../../dist/1.x/webgpu-utils.module.js'; import { assertArrayEqualApproximately, assertEqual } from '../assert.js'; import { readTextureUnpadded, testWithDevice } from '../webgpu.js'; diff --git a/test/tests/texture-utils-test.js b/test/tests/texture-utils-test.js index 1828a55..d82e3cc 100644 --- a/test/tests/texture-utils-test.js +++ b/test/tests/texture-utils-test.js @@ -3,7 +3,7 @@ import { describe, it } from '../mocha-support.js'; import { createTextureFromSource, createTextureFromImage, -} from '../../dist/0.x/webgpu-utils.module.js'; +} from '../../dist/1.x/webgpu-utils.module.js'; import { assertArrayEqual, assertArrayEqualApproximately, assertEqual } from '../assert.js'; import { readTextureUnpadded, testWithDevice, testWithDeviceAndDocument } from '../webgpu.js'; diff --git a/test/tests/umd-min-test.html b/test/tests/umd-min-test.html index d9620a5..b605ac3 100644 --- a/test/tests/umd-min-test.html +++ b/test/tests/umd-min-test.html @@ -6,7 +6,7 @@
- + - +