From 0588487f38829186e8140ae238082b0f9212313f Mon Sep 17 00:00:00 2001 From: sunag Date: Sat, 22 Apr 2023 07:02:37 -0300 Subject: [PATCH] WebGPURenderer: Make work without three/nodes (#25904) --- examples/jsm/renderers/webgpu/WebGPUBackground.js | 2 +- examples/jsm/renderers/webgpu/WebGPURenderStates.js | 2 +- examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js | 2 +- examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js | 2 +- examples/webgpu_loader_gltf.html | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/jsm/renderers/webgpu/WebGPUBackground.js b/examples/jsm/renderers/webgpu/WebGPUBackground.js index 62b6e668a24d48..c211ddfa0cd1d9 100644 --- a/examples/jsm/renderers/webgpu/WebGPUBackground.js +++ b/examples/jsm/renderers/webgpu/WebGPUBackground.js @@ -1,6 +1,6 @@ import { GPULoadOp, GPUStoreOp } from './constants.js'; import { Color, Mesh, BoxGeometry, BackSide } from 'three'; -import { context, positionWorldDirection, MeshBasicNodeMaterial } from 'three/nodes'; +import { context, positionWorldDirection, MeshBasicNodeMaterial } from '../../nodes/Nodes.js'; let _clearAlpha; const _clearColor = new Color(); diff --git a/examples/jsm/renderers/webgpu/WebGPURenderStates.js b/examples/jsm/renderers/webgpu/WebGPURenderStates.js index e2fdf52ce41c3c..771abfa2723643 100644 --- a/examples/jsm/renderers/webgpu/WebGPURenderStates.js +++ b/examples/jsm/renderers/webgpu/WebGPURenderStates.js @@ -1,5 +1,5 @@ import WebGPUWeakMap from './WebGPUWeakMap.js'; -import { lights } from 'three/nodes'; +import { lights } from '../../nodes/Nodes.js'; class WebGPURenderState { diff --git a/examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js b/examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js index 36e56149417230..d0c4e03ffad943 100644 --- a/examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js +++ b/examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js @@ -12,7 +12,7 @@ import { getVectorLength, getStrideLength } from '../WebGPUBufferUtils.js'; import WebGPURenderTarget from '../WebGPURenderTarget.js'; -import { NodeBuilder, WGSLNodeParser, CodeNode, NodeMaterial } from 'three/nodes'; +import { NodeBuilder, WGSLNodeParser, CodeNode, NodeMaterial } from '../../../nodes/Nodes.js'; const gpuShaderStageLib = { 'vertex': GPUShaderStage.VERTEX, diff --git a/examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js b/examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js index be2d12ee29fea2..e563cec06bba29 100644 --- a/examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js +++ b/examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js @@ -1,6 +1,6 @@ import WebGPUNodeBuilder from './WebGPUNodeBuilder.js'; import { NoToneMapping, EquirectangularReflectionMapping, EquirectangularRefractionMapping } from 'three'; -import { NodeFrame, cubeTexture, texture, rangeFog, densityFog, reference, toneMapping, positionWorld, modelWorldMatrix, transformDirection, equirectUV, viewportBottomLeft } from 'three/nodes'; +import { NodeFrame, cubeTexture, texture, rangeFog, densityFog, reference, toneMapping, positionWorld, modelWorldMatrix, transformDirection, equirectUV, viewportBottomLeft } from '../../../nodes/Nodes.js'; class WebGPUNodes { diff --git a/examples/webgpu_loader_gltf.html b/examples/webgpu_loader_gltf.html index b24e1e8a1be2fe..b6d2b5b12674f3 100644 --- a/examples/webgpu_loader_gltf.html +++ b/examples/webgpu_loader_gltf.html @@ -23,8 +23,7 @@ { "imports": { "three": "../build/three.module.js", - "three/addons/": "./jsm/", - "three/nodes": "./jsm/nodes/Nodes.js" + "three/addons/": "./jsm/" } }