Merge pull request #18 from strawberry-vis/fix-compiler

Export methods in compiler such as getUniforms
antvis · Sep 19, 2023 · c8157bf · c8157bf
2 parents eb91300 + 6891a60
commit c8157bf
Show file tree

Hide file tree

Showing 15 changed files with 611 additions and 151 deletions.
diff --git a/.changeset/bright-months-taste.md b/.changeset/bright-months-taste.md
@@ -0,0 +1,5 @@
+---
+'@strawberry-vis/g-device-api': patch
+---
+
+Export compiler utils.
diff --git a/README.md b/README.md
@@ -722,7 +722,7 @@ setPipeline(pipeline: RenderPipeline)
 Bindings defines the interface between a set of resources bound and their accessibility in shader stages.
 
 ```ts
-setBindings: (bindings: Bindings, dynamicByteOffsets?: number[]) => void;
+setBindings: (bindings: Bindings) => void;
 ```
 
 ### <a id="setVertexInput" />setVertexInput

diff --git a/examples/demos/cubemap.ts b/examples/demos/cubemap.ts
@@ -19,6 +19,13 @@ import {
 } from '../../src';
 import { initExample, loadImage } from './utils';
 import { vec3, mat4 } from 'gl-matrix';
+import {
+  cubeVertexArray,
+  cubeVertexSize,
+  cubeVertexCount,
+  cubePositionOffset,
+  cubeUVOffset,
+} from '../meshes/cube';
 
 /**
  * @see https://webgpu.github.io/webgpu-samples/samples/texturedCube
@@ -71,39 +78,6 @@ void main() {
     },
   });
 
-  const cubeVertexSize = 4 * 10; // Byte size of one cube vertex.
-  const cubePositionOffset = 0;
-  const cubeColorOffset = 4 * 4; // Byte offset of cube vertex color attribute.
-  const cubeUVOffset = 4 * 8;
-  const cubeVertexCount = 36;
-
-  const cubeVertexArray = new Float32Array([
-    // float4 position, float4 color, float2 uv,
-    1, -1, 1, 1, 1, 0, 1, 1, 0, 1, -1, -1, 1, 1, 0, 0, 1, 1, 1, 1, -1, -1, -1,
-    1, 0, 0, 0, 1, 1, 0, 1, -1, -1, 1, 1, 0, 0, 1, 0, 0, 1, -1, 1, 1, 1, 0, 1,
-    1, 0, 1, -1, -1, -1, 1, 0, 0, 0, 1, 1, 0,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, -1, 1,
-    1, 0, 0, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-    1, 1, -1, -1, 1, 1, 0, 0, 1, 1, 0,
-
-    -1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1,
-    1, 0, 1, 1, 0, -1, 1, -1, 1, 0, 1, 0, 1, 0, 0, -1, 1, 1, 1, 0, 1, 1, 1, 0,
-    1, 1, 1, -1, 1, 1, 1, 0, 1, 1, 0,
-
-    -1, -1, 1, 1, 0, 0, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, 1, -1, 1,
-    0, 1, 0, 1, 1, 0, -1, -1, -1, 1, 0, 0, 0, 1, 0, 0, -1, -1, 1, 1, 0, 0, 1, 1,
-    0, 1, -1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, -1, 1, 1,
-    0, 0, 1, 1, 1, 0, -1, -1, 1, 1, 0, 0, 1, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1,
-    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
-
-    1, -1, -1, 1, 1, 0, 0, 1, 0, 1, -1, -1, -1, 1, 0, 0, 0, 1, 1, 1, -1, 1, -1,
-    1, 0, 1, 0, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 0, 0, 1, -1, -1, 1, 1, 0, 0,
-    1, 0, 1, -1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-  ]);
-
   const vertexBuffer = device.createBuffer({
     viewOrSize: cubeVertexArray,
     usage: BufferUsage.VERTEX,

diff --git a/examples/demos/index.ts b/examples/demos/index.ts
@@ -2,7 +2,9 @@ export { PrimitiveTopologyPoints } from './primitive-topology-points';
 export { PrimitiveTopologyTriangles } from './primitive-topology-triangles';
 export { MSAA } from './msaa';
 export { RotatingCube } from './rotating-cube';
+export { TwoCubes } from './two-cubes';
 export { TexturedCube } from './textured-cube';
+export { Sampler } from './sampler';
 export { InstancedCubes } from './instanced-cubes';
 export { Cubemap } from './cubemap';
 export { ComputeBoids } from './compute-boids';
diff --git a/examples/demos/instanced-cubes.ts b/examples/demos/instanced-cubes.ts
@@ -15,6 +15,11 @@ import {
 } from '../../src';
 import { initExample } from './utils';
 import { vec3, mat4 } from 'gl-matrix';
+import {
+  cubeVertexArray,
+  cubeVertexSize,
+  cubeVertexCount,
+} from '../meshes/cube';
 
 /**
  * @see https://webgpu.github.io/webgpu-samples/samples/instancedCube#main.ts
@@ -60,39 +65,6 @@ void main() {
     },
   });
 
-  const cubeVertexSize = 4 * 10; // Byte size of one cube vertex.
-  const cubePositionOffset = 0;
-  const cubeColorOffset = 4 * 4; // Byte offset of cube vertex color attribute.
-  const cubeUVOffset = 4 * 8;
-  const cubeVertexCount = 36;
-
-  const cubeVertexArray = new Float32Array([
-    // float4 position, float4 color, float2 uv,
-    1, -1, 1, 1, 1, 0, 1, 1, 0, 1, -1, -1, 1, 1, 0, 0, 1, 1, 1, 1, -1, -1, -1,
-    1, 0, 0, 0, 1, 1, 0, 1, -1, -1, 1, 1, 0, 0, 1, 0, 0, 1, -1, 1, 1, 1, 0, 1,
-    1, 0, 1, -1, -1, -1, 1, 0, 0, 0, 1, 1, 0,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, -1, 1,
-    1, 0, 0, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-    1, 1, -1, -1, 1, 1, 0, 0, 1, 1, 0,
-
-    -1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1,
-    1, 0, 1, 1, 0, -1, 1, -1, 1, 0, 1, 0, 1, 0, 0, -1, 1, 1, 1, 0, 1, 1, 1, 0,
-    1, 1, 1, -1, 1, 1, 1, 0, 1, 1, 0,
-
-    -1, -1, 1, 1, 0, 0, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, 1, -1, 1,
-    0, 1, 0, 1, 1, 0, -1, -1, -1, 1, 0, 0, 0, 1, 0, 0, -1, -1, 1, 1, 0, 0, 1, 1,
-    0, 1, -1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, -1, 1, 1,
-    0, 0, 1, 1, 1, 0, -1, -1, 1, 1, 0, 0, 1, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1,
-    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
-
-    1, -1, -1, 1, 1, 0, 0, 1, 0, 1, -1, -1, -1, 1, 0, 0, 0, 1, 1, 1, -1, 1, -1,
-    1, 0, 1, 0, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 0, 0, 1, -1, -1, 1, 1, 0, 0,
-    1, 0, 1, -1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-  ]);
-
   const xCount = 4;
   const yCount = 4;
   const numInstances = xCount * yCount;

diff --git a/examples/demos/rotating-cube.ts b/examples/demos/rotating-cube.ts
@@ -15,6 +15,11 @@ import {
 } from '../../src';
 import { initExample } from './utils';
 import { vec3, mat4 } from 'gl-matrix';
+import {
+  cubeVertexArray,
+  cubeVertexSize,
+  cubeVertexCount,
+} from '../meshes/cube';
 
 export async function render(
   deviceContribution: DeviceContribution,
@@ -57,39 +62,6 @@ void main() {
     },
   });
 
-  const cubeVertexSize = 4 * 10; // Byte size of one cube vertex.
-  const cubePositionOffset = 0;
-  const cubeColorOffset = 4 * 4; // Byte offset of cube vertex color attribute.
-  const cubeUVOffset = 4 * 8;
-  const cubeVertexCount = 36;
-
-  const cubeVertexArray = new Float32Array([
-    // float4 position, float4 color, float2 uv,
-    1, -1, 1, 1, 1, 0, 1, 1, 0, 1, -1, -1, 1, 1, 0, 0, 1, 1, 1, 1, -1, -1, -1,
-    1, 0, 0, 0, 1, 1, 0, 1, -1, -1, 1, 1, 0, 0, 1, 0, 0, 1, -1, 1, 1, 1, 0, 1,
-    1, 0, 1, -1, -1, -1, 1, 0, 0, 0, 1, 1, 0,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, -1, 1,
-    1, 0, 0, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-    1, 1, -1, -1, 1, 1, 0, 0, 1, 1, 0,
-
-    -1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1,
-    1, 0, 1, 1, 0, -1, 1, -1, 1, 0, 1, 0, 1, 0, 0, -1, 1, 1, 1, 0, 1, 1, 1, 0,
-    1, 1, 1, -1, 1, 1, 1, 0, 1, 1, 0,
-
-    -1, -1, 1, 1, 0, 0, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, 1, -1, 1,
-    0, 1, 0, 1, 1, 0, -1, -1, -1, 1, 0, 0, 0, 1, 0, 0, -1, -1, 1, 1, 0, 0, 1, 1,
-    0, 1, -1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1, 1, 1, 1, -1, -1, 1, 1,
-    0, 0, 1, 1, 1, 0, -1, -1, 1, 1, 0, 0, 1, 1, 1, 0, 1, -1, 1, 1, 1, 0, 1, 1,
-    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
-
-    1, -1, -1, 1, 1, 0, 0, 1, 0, 1, -1, -1, -1, 1, 0, 0, 0, 1, 1, 1, -1, 1, -1,
-    1, 0, 1, 0, 1, 1, 0, 1, 1, -1, 1, 1, 1, 0, 1, 0, 0, 1, -1, -1, 1, 1, 0, 0,
-    1, 0, 1, -1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-  ]);
-
   const vertexBuffer = device.createBuffer({
     viewOrSize: cubeVertexArray,
     usage: BufferUsage.VERTEX,