Skip to content

Commit d315b4d

Browse files
authored
Merge pull request #21364 from mrdoob/importmaps
Adopt importmaps in WebGPU examples
2 parents 8514f00 + 494b342 commit d315b4d

11 files changed

+46
-11
lines changed

examples/jsm/renderers/webgpu/WebGPUBackground.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { GPULoadOp } from './constants.js';
2-
import { Color } from '../../../../build/three.module.js';
2+
import { Color } from 'three';
33

44
let _clearAlpha;
55
const _clearColor = new Color();

examples/jsm/renderers/webgpu/WebGPURenderPipelines.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
NoBlending, NormalBlending, AdditiveBlending, SubtractiveBlending, MultiplyBlending, CustomBlending,
88
AddEquation, SubtractEquation, ReverseSubtractEquation, MinEquation, MaxEquation,
99
ZeroFactor, OneFactor, SrcColorFactor, OneMinusSrcColorFactor, SrcAlphaFactor, OneMinusSrcAlphaFactor, DstAlphaFactor, OneMinusDstAlphaFactor, DstColorFactor, OneMinusDstColorFactor, SrcAlphaSaturateFactor
10-
} from '../../../../build/three.module.js';
10+
} from 'three';
1111

1212
class WebGPURenderPipelines {
1313

examples/jsm/renderers/webgpu/WebGPURenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import WebGPUNodes from './nodes/WebGPUNodes.js';
1414

1515
import glslang from '../../libs/glslang.js';
1616

17-
import { Frustum, Matrix4, Vector3, Color } from '../../../../build/three.module.js';
17+
import { Frustum, Matrix4, Vector3, Color } from 'three';
1818

1919
console.info( 'THREE.WebGPURenderer: Modified Matrix4.makePerspective() and Matrix4.makeOrtographic() to work with WebGPU, see https://github.com/mrdoob/three.js/issues/20276.' );
2020

examples/jsm/renderers/webgpu/WebGPUTextureRenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { WebGLRenderTarget } from '../../../../build/three.module.js';
1+
import { WebGLRenderTarget } from 'three';
22

33
class WebGPUTextureRenderer {
44

examples/jsm/renderers/webgpu/WebGPUTextures.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { GPUTextureFormat, GPUAddressMode, GPUFilterMode, GPUTextureDimension } from './constants.js';
22
import { CubeTexture, Texture, NearestFilter, NearestMipmapNearestFilter, NearestMipmapLinearFilter, LinearFilter, RepeatWrapping, MirroredRepeatWrapping,
33
RGBFormat, RGBAFormat, RedFormat, RGFormat, RGBA_S3TC_DXT1_Format, RGBA_S3TC_DXT3_Format, RGBA_S3TC_DXT5_Format, UnsignedByteType, FloatType, HalfFloatType, sRGBEncoding
4-
} from '../../../../build/three.module.js';
4+
} from 'three';
55
import WebGPUTextureUtils from './WebGPUTextureUtils.js';
66

77
class WebGPUTextures {

examples/jsm/renderers/webgpu/WebGPUUniform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Color, Matrix3, Matrix4, Vector2, Vector3, Vector4 } from '../../../../build/three.module.js';
1+
import { Color, Matrix3, Matrix4, Vector2, Vector3, Vector4 } from 'three';
22

33
class WebGPUUniform {
44

examples/webgpu_compute.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@
1010
<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> WebGPU - Compute<br/>(Chrome Canary with flag: --enable-unsafe-webgpu)
1111
</div>
1212

13+
<script type="importmap">
14+
{
15+
"imports": {
16+
"three": "../build/three.module.js"
17+
}
18+
}
19+
</script>
1320
<script type="module">
1421

15-
import * as THREE from '../build/three.module.js';
22+
import * as THREE from 'three';
1623

1724
import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
1825
import WebGPU from './jsm/renderers/webgpu/WebGPU.js';

examples/webgpu_instance_uniform.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,16 @@
1111
<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> - webgpu materials
1212
</div>
1313

14+
<script type="importmap">
15+
{
16+
"imports": {
17+
"three": "../build/three.module.js"
18+
}
19+
}
20+
</script>
1421
<script type="module">
1522

16-
import * as THREE from '../build/three.module.js';
23+
import * as THREE from 'three';
1724

1825
import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
1926
import WebGPU from './jsm/renderers/webgpu/WebGPU.js';

examples/webgpu_materials.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,16 @@
1111
<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> - webgpu materials
1212
</div>
1313

14+
<script type="importmap">
15+
{
16+
"imports": {
17+
"three": "../build/three.module.js"
18+
}
19+
}
20+
</script>
1421
<script type="module">
1522

16-
import * as THREE from '../build/three.module.js';
23+
import * as THREE from 'three';
1724

1825
import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
1926
import WebGPU from './jsm/renderers/webgpu/WebGPU.js';

examples/webgpu_rtt.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@
1010
<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> WebGPU - RTT<br/>(Chrome Canary with flag: --enable-unsafe-webgpu)
1111
</div>
1212

13+
<script type="importmap">
14+
{
15+
"imports": {
16+
"three": "../build/three.module.js"
17+
}
18+
}
19+
</script>
1320
<script type="module">
1421

15-
import * as THREE from '../build/three.module.js';
22+
import * as THREE from 'three';
1623

1724
import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
1825
import WebGPUTextureRenderer from './jsm/renderers/webgpu/WebGPUTextureRenderer.js';

0 commit comments

Comments
 (0)