Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codesplit WebGL/WebGPU entrypoints: Fix WebGPU Addons #29644

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/jsm/lines/webgpu/Line2.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Line2NodeMaterial } from 'three/webgpu';

import { LineSegments2 } from './LineSegments2.js';
import { LineGeometry } from '../LineGeometry.js';

import { Line2NodeMaterial } from 'three';

class Line2 extends LineSegments2 {

Expand Down
4 changes: 3 additions & 1 deletion examples/jsm/lines/webgpu/LineSegments2.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import {
Sphere,
Vector3,
Vector4,
Line2NodeMaterial
} from 'three';

import { Line2NodeMaterial } from 'three/webgpu';

import { LineSegmentsGeometry } from '../../lines/LineSegmentsGeometry.js';

const _start = new Vector3();
Expand Down
6 changes: 4 additions & 2 deletions examples/jsm/loaders/MaterialXLoader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { FileLoader, Loader, TextureLoader, MeshBasicNodeMaterial, MeshPhysicalNodeMaterial, RepeatWrapping } from 'three';
import { FileLoader, Loader, TextureLoader, RepeatWrapping } from 'three';

import { MeshBasicNodeMaterial, MeshPhysicalNodeMaterial } from 'three/webgpu';

import {
float, bool, int, vec2, vec3, vec4, color, texture,
Expand Down Expand Up @@ -396,7 +398,7 @@ class MaterialXNode {

} else if ( this.hasReference ) {

if ( this.element === 'output' && this.output && out === null ) {
if ( this.element === 'output' && this.output && out === null ) {

out = this.output;

Expand Down
8 changes: 4 additions & 4 deletions examples/jsm/objects/InstancedPoints.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Mesh,
InstancedPointsNodeMaterial
} from 'three';
import { Mesh } from 'three';

import { InstancedPointsNodeMaterial } from 'three/webgpu';

import InstancedPointsGeometry from '../geometries/InstancedPointsGeometry.js';

class InstancedPoints extends Mesh {
Expand Down
1 change: 1 addition & 0 deletions examples/webgpu_instance_points.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"imports": {
"three": "../build/three.webgpu.js",
"three/tsl": "../build/three.webgpu.js",
"three/webgpu": "../build/three.webgpu.js",
"three/addons/": "./jsm/"
}
}
Expand Down
1 change: 1 addition & 0 deletions examples/webgpu_lines_fat.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"imports": {
"three": "../build/three.webgpu.js",
"three/tsl": "../build/three.webgpu.js",
"three/webgpu": "../build/three.webgpu.js",
"three/addons/": "./jsm/"
}
}
Expand Down
1 change: 1 addition & 0 deletions examples/webgpu_loader_materialx.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"imports": {
"three": "../build/three.webgpu.js",
"three/tsl": "../build/three.webgpu.js",
"three/webgpu": "../build/three.webgpu.js",
"three/addons/": "./jsm/"
}
}
Expand Down