Skip to content

Commit a73dc8c

Browse files
committed
threejs and its types bump to r181
1 parent 531846b commit a73dc8c

File tree

6 files changed

+33
-35
lines changed

6 files changed

+33
-35
lines changed

apps/typegpu-docs/src/examples/threejs/compute-cloth/verlet.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ export class VerletSimulation {
6767
THREE.StorageBufferNode
6868
>;
6969

70-
readonly computeSpringForces: TSL.ShaderNodeObject<THREE.ComputeNode>;
71-
readonly computeVertexForces: TSL.ShaderNodeObject<THREE.ComputeNode>;
70+
readonly computeSpringForces: THREE.TSL.NodeObject<THREE.ComputeNode>;
71+
readonly computeVertexForces: THREE.TSL.NodeObject<THREE.ComputeNode>;
7272

7373
constructor(
7474
{ sphereRadius, sphereUniform, spherePositionUniform }:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// export { TypeGPUMaterial } from './typegpu-material.ts';
22

33
export { time, uv } from './builtin-accessors.ts';
4-
export { fromTSL, type TSLAccessor, toTSL } from './typegpu-node.ts';
4+
export { fromTSL, toTSL, type TSLAccessor } from './typegpu-node.ts';

packages/typegpu-three/src/typegpu-material.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import tgpu, { type TgpuFn } from 'typegpu';
44
class FragmentNode extends THREE.CodeNode {
55
private tgslFn: TgpuFn;
66
private functionName: string | null | undefined;
7-
private threeVars: THREE.TSL.ShaderNodeObject<THREE.Node>[] | undefined;
7+
private threeVars: THREE.TSL.NodeObject<THREE.Node>[] | undefined;
88
private argNames: string[] | undefined;
99

1010
constructor(
1111
tgslFn: TgpuFn,
12-
threeRequirements?: THREE.TSL.ShaderNodeObject<THREE.Node>[] | undefined,
12+
threeRequirements?: THREE.TSL.NodeObject<THREE.Node>[] | undefined,
1313
) {
1414
const resolved = tgpu.resolve({
1515
template: '___ID___ fnName',
@@ -96,14 +96,12 @@ class FragmentNode extends THREE.CodeNode {
9696
export class TypeGPUMaterial extends THREE.NodeMaterial {
9797
constructor(
9898
fragmentFn: TgpuFn,
99-
threeRequirements?: THREE.TSL.ShaderNodeObject<
100-
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
99+
threeRequirements?: THREE.TSL.NodeObject<
101100
THREE.Node | THREE.UniformNode<any>
102101
>[] | undefined,
103102
) {
104103
super();
105104

106-
// @ts-expect-error
107105
this.fragmentNode = new FragmentNode(fragmentFn, threeRequirements);
108106
}
109107
}

packages/typegpu-three/src/typegpu-node.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,18 @@ class TgpuFnNode<T> extends THREE.Node {
197197

198198
export function toTSL(
199199
fn: () => unknown,
200-
): THREE.TSL.ShaderNodeObject<THREE.Node> {
200+
): THREE.TSL.NodeObject<THREE.Node> {
201201
return TSL.nodeObject(new TgpuFnNode(fn));
202202
}
203203

204204
export class TSLAccessor<T extends d.AnyWgslData, TNode extends THREE.Node> {
205205
readonly #dataType: T;
206206

207207
readonly var: TgpuVar<'private', T> | undefined;
208-
readonly node: TSL.ShaderNodeObject<TNode>;
208+
readonly node: THREE.TSL.NodeObject<TNode>;
209209

210210
constructor(
211-
node: TSL.ShaderNodeObject<TNode>,
211+
node: THREE.TSL.NodeObject<TNode>,
212212
dataType: T,
213213
) {
214214
this.node = node;
@@ -243,15 +243,15 @@ export class TSLAccessor<T extends d.AnyWgslData, TNode extends THREE.Node> {
243243
}
244244

245245
export function fromTSL<T extends d.AnyWgslData, TNode extends THREE.Node>(
246-
node: TSL.ShaderNodeObject<TNode>,
246+
node: THREE.TSL.NodeObject<TNode>,
247247
options: { type: (length: number) => T },
248248
): TSLAccessor<T, TNode>;
249249
export function fromTSL<T extends d.AnyWgslData, TNode extends THREE.Node>(
250-
node: TSL.ShaderNodeObject<TNode>,
250+
node: THREE.TSL.NodeObject<TNode>,
251251
options: { type: T },
252252
): TSLAccessor<T, TNode>;
253253
export function fromTSL<T extends d.AnyWgslData, TNode extends THREE.Node>(
254-
node: TSL.ShaderNodeObject<TNode>,
254+
node: THREE.TSL.NodeObject<TNode>,
255255
options: { type: T } | { type: (length: number) => T },
256256
): TSLAccessor<T, TNode> {
257257
return new TSLAccessor<T, TNode>(

pnpm-lock.yaml

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
packages:
2-
- "packages/*"
3-
- "apps/*"
2+
- 'packages/*'
3+
- 'apps/*'
44

55
catalog:
66
arktype: ^2.1.22
@@ -12,13 +12,13 @@ catalogs:
1212
jiti: ^2.6.0
1313
types:
1414
typescript: ^5.8.2
15-
"@webgpu/types": ^0.1.66
16-
"@types/three": "^0.180.0"
15+
'@webgpu/types': ^0.1.66
16+
'@types/three': '^0.181.0'
1717
test:
1818
vitest: ^3.2.4
1919
frontend:
20-
"vite-imagetools": ^9.0.0
21-
"fuse.js": ^7.1.0
20+
'vite-imagetools': ^9.0.0
21+
'fuse.js': ^7.1.0
2222
example:
23-
"wgpu-matrix": ^3.4.0
24-
three: ^0.180.0
23+
'wgpu-matrix': ^3.4.0
24+
three: ^0.181.0

0 commit comments

Comments
 (0)