super-three 0.152.0 → 0.154.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/three.cjs +778 -557
- package/build/three.js +778 -557
- package/build/three.min.js +1 -1
- package/build/three.module.js +769 -539
- package/build/three.module.min.js +1 -1
- package/examples/jsm/cameras/CinematicCamera.js +1 -2
- package/examples/jsm/capabilities/WebGPU.js +15 -1
- package/examples/jsm/controls/ArcballControls.js +2 -1
- package/examples/jsm/controls/FlyControls.js +25 -9
- package/examples/jsm/controls/OrbitControls.js +5 -1
- package/examples/jsm/csm/CSM.js +1 -3
- package/examples/jsm/effects/AnaglyphEffect.js +6 -20
- package/examples/jsm/effects/OutlineEffect.js +1 -1
- package/examples/jsm/effects/ParallaxBarrierEffect.js +3 -0
- package/examples/jsm/environments/RoomEnvironment.js +6 -2
- package/examples/jsm/exporters/GLTFExporter.js +74 -2
- package/examples/jsm/exporters/USDZExporter.js +170 -129
- package/examples/jsm/helpers/ViewHelper.js +1 -1
- package/examples/jsm/lines/LineMaterial.js +1 -1
- package/examples/jsm/loaders/3DMLoader.js +1 -1
- package/examples/jsm/loaders/3MFLoader.js +5 -1
- package/examples/jsm/loaders/AMFLoader.js +5 -1
- package/examples/jsm/loaders/ColladaLoader.js +4 -1
- package/examples/jsm/loaders/DRACOLoader.js +2 -0
- package/examples/jsm/loaders/FBXLoader.js +9 -2
- package/examples/jsm/loaders/GLTFLoader.js +230 -94
- package/examples/jsm/loaders/KTX2Loader.js +106 -47
- package/examples/jsm/loaders/LDrawLoader.js +4 -7
- package/examples/jsm/loaders/MMDLoader.js +40 -13
- package/examples/jsm/loaders/PCDLoader.js +25 -10
- package/examples/jsm/loaders/PDBLoader.js +7 -2
- package/examples/jsm/loaders/PLYLoader.js +30 -8
- package/examples/jsm/loaders/STLLoader.js +8 -3
- package/examples/jsm/loaders/VRMLLoader.js +55 -7
- package/examples/jsm/loaders/VTKLoader.js +12 -4
- package/examples/jsm/loaders/XYZLoader.js +9 -3
- package/examples/jsm/materials/MeshGouraudMaterial.js +2 -2
- package/examples/jsm/math/Lut.js +5 -4
- package/examples/jsm/math/MeshSurfaceSampler.js +82 -37
- package/examples/jsm/misc/GPUComputationRenderer.js +1 -0
- package/examples/jsm/misc/VolumeSlice.js +3 -1
- package/examples/jsm/nodes/Nodes.js +22 -16
- package/examples/jsm/nodes/accessors/BufferAttributeNode.js +99 -0
- package/examples/jsm/nodes/accessors/BufferNode.js +2 -2
- package/examples/jsm/nodes/accessors/CameraNode.js +25 -4
- package/examples/jsm/nodes/accessors/ExtendedMaterialNode.js +7 -1
- package/examples/jsm/nodes/accessors/InstanceNode.js +29 -12
- package/examples/jsm/nodes/accessors/MaterialNode.js +55 -47
- package/examples/jsm/nodes/accessors/MaterialReferenceNode.js +2 -2
- package/examples/jsm/nodes/accessors/ModelNode.js +3 -1
- package/examples/jsm/nodes/accessors/ModelViewProjectionNode.js +4 -9
- package/examples/jsm/nodes/accessors/MorphNode.js +70 -0
- package/examples/jsm/nodes/accessors/NormalNode.js +3 -2
- package/examples/jsm/nodes/accessors/Object3DNode.js +10 -2
- package/examples/jsm/nodes/accessors/ReferenceNode.js +2 -2
- package/examples/jsm/nodes/accessors/SceneNode.js +46 -0
- package/examples/jsm/nodes/accessors/SkinningNode.js +43 -62
- package/examples/jsm/nodes/accessors/StorageBufferNode.js +2 -2
- package/examples/jsm/nodes/accessors/TangentNode.js +2 -2
- package/examples/jsm/nodes/accessors/TextureBicubicNode.js +94 -0
- package/examples/jsm/nodes/accessors/TextureNode.js +68 -6
- package/examples/jsm/nodes/accessors/TextureSizeNode.js +35 -0
- package/examples/jsm/nodes/accessors/UVNode.js +1 -1
- package/examples/jsm/nodes/code/CodeNode.js +3 -0
- package/examples/jsm/nodes/code/FunctionNode.js +25 -4
- package/examples/jsm/nodes/core/AttributeNode.js +1 -1
- package/examples/jsm/nodes/core/BypassNode.js +2 -2
- package/examples/jsm/nodes/core/ContextNode.js +2 -0
- package/examples/jsm/nodes/core/IndexNode.js +66 -0
- package/examples/jsm/nodes/core/LightingModel.js +2 -1
- package/examples/jsm/nodes/core/Node.js +13 -16
- package/examples/jsm/nodes/core/NodeAttribute.js +2 -1
- package/examples/jsm/nodes/core/NodeBuilder.js +86 -8
- package/examples/jsm/nodes/core/NodeUtils.js +10 -0
- package/examples/jsm/nodes/core/PropertyNode.js +6 -2
- package/examples/jsm/nodes/core/StackNode.js +8 -1
- package/examples/jsm/nodes/core/UniformNode.js +1 -1
- package/examples/jsm/nodes/core/VarNode.js +1 -3
- package/examples/jsm/nodes/display/BlendModeNode.js +9 -9
- package/examples/jsm/nodes/display/ColorAdjustmentNode.js +7 -7
- package/examples/jsm/nodes/display/ColorSpaceNode.js +50 -49
- package/examples/jsm/nodes/display/NormalMapNode.js +3 -3
- package/examples/jsm/nodes/display/ToneMappingNode.js +24 -15
- package/examples/jsm/nodes/display/ViewportDepthNode.js +69 -0
- package/examples/jsm/nodes/display/ViewportDepthTextureNode.js +34 -0
- package/examples/jsm/nodes/display/ViewportSharedTextureNode.js +7 -6
- package/examples/jsm/nodes/display/ViewportTextureNode.js +33 -19
- package/examples/jsm/nodes/functions/BSDF/BRDF_BlinnPhong.js +5 -5
- package/examples/jsm/nodes/functions/BSDF/BRDF_GGX.js +10 -8
- package/examples/jsm/nodes/functions/BSDF/BRDF_Lambert.js +2 -2
- package/examples/jsm/nodes/functions/BSDF/BRDF_Sheen.js +43 -0
- package/examples/jsm/nodes/functions/BSDF/DFGApprox.js +4 -4
- package/examples/jsm/nodes/functions/BSDF/D_GGX.js +2 -2
- package/examples/jsm/nodes/functions/BSDF/EnvironmentBRDF.js +13 -0
- package/examples/jsm/nodes/functions/BSDF/F_Schlick.js +2 -4
- package/examples/jsm/nodes/functions/BSDF/V_GGX_SmithCorrelated.js +2 -2
- package/examples/jsm/nodes/functions/PhongLightingModel.js +7 -7
- package/examples/jsm/nodes/functions/PhysicalLightingModel.js +132 -19
- package/examples/jsm/nodes/functions/material/getGeometryRoughness.js +2 -2
- package/examples/jsm/nodes/functions/material/getRoughness.js +3 -3
- package/examples/jsm/nodes/geometry/RangeNode.js +33 -51
- package/examples/jsm/nodes/lighting/AnalyticLightNode.js +6 -3
- package/examples/jsm/nodes/lighting/DirectionalLightNode.js +2 -2
- package/examples/jsm/nodes/lighting/EnvironmentNode.js +107 -62
- package/examples/jsm/nodes/lighting/HemisphereLightNode.js +2 -2
- package/examples/jsm/nodes/lighting/LightUtils.js +2 -2
- package/examples/jsm/nodes/lighting/LightingContextNode.js +17 -15
- package/examples/jsm/nodes/lighting/PointLightNode.js +3 -3
- package/examples/jsm/nodes/lighting/SpotLightNode.js +3 -3
- package/examples/jsm/nodes/materials/LineBasicNodeMaterial.js +0 -15
- package/examples/jsm/nodes/materials/MeshBasicNodeMaterial.js +0 -15
- package/examples/jsm/nodes/materials/MeshNormalNodeMaterial.js +0 -10
- package/examples/jsm/nodes/materials/MeshPhongNodeMaterial.js +0 -9
- package/examples/jsm/nodes/materials/MeshPhysicalNodeMaterial.js +41 -0
- package/examples/jsm/nodes/materials/MeshStandardNodeMaterial.js +1 -14
- package/examples/jsm/nodes/materials/NodeMaterial.js +119 -29
- package/examples/jsm/nodes/materials/PointsNodeMaterial.js +0 -9
- package/examples/jsm/nodes/materials/SpriteNodeMaterial.js +0 -7
- package/examples/jsm/nodes/materialx/lib/mx_hsv.js +3 -3
- package/examples/jsm/nodes/materialx/lib/mx_noise.js +14 -14
- package/examples/jsm/nodes/materialx/lib/mx_transform_color.js +4 -4
- package/examples/jsm/nodes/math/MathNode.js +6 -0
- package/examples/jsm/nodes/math/OperatorNode.js +1 -1
- package/examples/jsm/nodes/procedural/CheckerNode.js +3 -3
- package/examples/jsm/nodes/shadernode/ShaderNode.js +60 -33
- package/examples/jsm/nodes/utils/EquirectUVNode.js +2 -3
- package/examples/jsm/nodes/utils/LoopNode.js +186 -0
- package/examples/jsm/nodes/utils/TriplanarTexturesNode.js +1 -1
- package/examples/jsm/objects/GroundProjectedSkybox.js +1 -1
- package/examples/jsm/objects/Lensflare.js +3 -4
- package/examples/jsm/objects/MarchingCubes.js +5 -1
- package/examples/jsm/objects/Reflector.js +4 -1
- package/examples/jsm/objects/Refractor.js +1 -1
- package/examples/jsm/objects/Sky.js +1 -1
- package/examples/jsm/objects/Water.js +2 -1
- package/examples/jsm/objects/Water2.js +1 -1
- package/examples/jsm/offscreen/scene.js +1 -0
- package/examples/jsm/physics/RapierPhysics.js +93 -133
- package/examples/jsm/postprocessing/AfterimagePass.js +3 -0
- package/examples/jsm/postprocessing/BloomPass.js +7 -2
- package/examples/jsm/postprocessing/BokehPass.js +3 -2
- package/examples/jsm/postprocessing/DotScreenPass.js +1 -0
- package/examples/jsm/postprocessing/EffectComposer.js +4 -1
- package/examples/jsm/postprocessing/FilmPass.js +1 -0
- package/examples/jsm/postprocessing/OutlinePass.js +8 -9
- package/examples/jsm/postprocessing/OutputPass.js +72 -0
- package/examples/jsm/postprocessing/RenderPixelatedPass.js +4 -3
- package/examples/jsm/postprocessing/SAOPass.js +4 -2
- package/examples/jsm/postprocessing/SMAAPass.js +5 -2
- package/examples/jsm/postprocessing/SSAARenderPass.js +5 -13
- package/examples/jsm/postprocessing/SSAOPass.js +4 -2
- package/examples/jsm/postprocessing/SSRPass.js +3 -1
- package/examples/jsm/postprocessing/SavePass.js +5 -2
- package/examples/jsm/postprocessing/ShaderPass.js +1 -0
- package/examples/jsm/postprocessing/TAARenderPass.js +17 -4
- package/examples/jsm/postprocessing/TexturePass.js +2 -1
- package/examples/jsm/postprocessing/UnrealBloomPass.js +13 -13
- package/examples/jsm/renderers/{webgpu/WebGPUAnimation.js → common/Animation.js} +2 -2
- package/examples/jsm/renderers/common/Attributes.js +75 -0
- package/examples/jsm/renderers/common/Backend.js +162 -0
- package/examples/jsm/renderers/common/Background.js +134 -0
- package/examples/jsm/renderers/common/Binding.js +11 -0
- package/examples/jsm/renderers/common/Bindings.js +169 -0
- package/examples/jsm/renderers/common/Buffer.js +38 -0
- package/examples/jsm/renderers/{webgpu/WebGPUBufferUtils.js → common/BufferUtils.js} +2 -2
- package/examples/jsm/renderers/{webgpu/WebGPUWeakMap.js → common/ChainMap.js} +11 -5
- package/examples/jsm/renderers/common/ComputePipeline.js +17 -0
- package/examples/jsm/renderers/common/Constants.js +14 -0
- package/examples/jsm/renderers/common/CubeRenderTarget.js +65 -0
- package/examples/jsm/renderers/common/DataMap.js +54 -0
- package/examples/jsm/renderers/{webgpu/WebGPUGeometries.js → common/Geometries.js} +38 -37
- package/examples/jsm/renderers/{webgpu/WebGPUInfo.js → common/Info.js} +2 -3
- package/examples/jsm/renderers/common/Pipeline.js +13 -0
- package/examples/jsm/renderers/common/Pipelines.js +321 -0
- package/examples/jsm/renderers/common/ProgrammableStage.js +18 -0
- package/examples/jsm/renderers/common/RenderContext.js +37 -0
- package/examples/jsm/renderers/common/RenderContexts.js +38 -0
- package/examples/jsm/renderers/{webgpu/WebGPURenderLists.js → common/RenderList.js} +2 -39
- package/examples/jsm/renderers/common/RenderLists.js +38 -0
- package/examples/jsm/renderers/common/RenderObject.js +113 -0
- package/examples/jsm/renderers/common/RenderObjects.js +92 -0
- package/examples/jsm/renderers/common/RenderPipeline.js +16 -0
- package/examples/jsm/renderers/{webgpu/WebGPURenderTarget.js → common/RenderTarget.js} +2 -2
- package/examples/jsm/renderers/common/Renderer.js +864 -0
- package/examples/jsm/renderers/common/SampledTexture.js +80 -0
- package/examples/jsm/renderers/common/Sampler.js +18 -0
- package/examples/jsm/renderers/common/StorageBuffer.js +17 -0
- package/examples/jsm/renderers/common/Textures.js +206 -0
- package/examples/jsm/renderers/{webgpu/WebGPUUniform.js → common/Uniform.js} +13 -9
- package/examples/jsm/renderers/common/UniformBuffer.js +15 -0
- package/examples/jsm/renderers/{webgpu/WebGPUUniformsGroup.js → common/UniformsGroup.js} +13 -13
- package/examples/jsm/renderers/{webgpu/nodes/WebGPUNodes.js → common/nodes/NodeRender.js} +3 -3
- package/examples/jsm/renderers/{webgpu/nodes/WebGPUNodeSampledTexture.js → common/nodes/NodeSampledTexture.js} +4 -4
- package/examples/jsm/renderers/{webgpu/nodes/WebGPUNodeSampler.js → common/nodes/NodeSampler.js} +3 -3
- package/examples/jsm/renderers/{webgpu/nodes/WebGPUNodeUniform.js → common/nodes/NodeUniform.js} +1 -1
- package/examples/jsm/renderers/common/nodes/Nodes.js +319 -0
- package/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js +340 -0
- package/examples/jsm/renderers/webgl/nodes/WebGLNodeBuilder.js +23 -19
- package/examples/jsm/renderers/webgpu/WebGPUBackend.js +847 -0
- package/examples/jsm/renderers/webgpu/WebGPURenderer.js +15 -1131
- package/examples/jsm/renderers/webgpu/nodes/{WebGPUNodeBuilder.js → WGSLNodeBuilder.js} +75 -45
- package/examples/jsm/{nodes/parsers → renderers/webgpu/nodes}/WGSLNodeFunction.js +2 -2
- package/examples/jsm/{nodes/parsers → renderers/webgpu/nodes}/WGSLNodeParser.js +1 -1
- package/examples/jsm/renderers/webgpu/utils/WebGPUAttributeUtils.js +255 -0
- package/examples/jsm/renderers/webgpu/utils/WebGPUBindingUtils.js +145 -0
- package/examples/jsm/renderers/webgpu/{constants.js → utils/WebGPUConstants.js} +6 -7
- package/examples/jsm/renderers/webgpu/{WebGPURenderPipeline.js → utils/WebGPUPipelineUtils.js} +154 -247
- package/examples/jsm/renderers/webgpu/{WebGPUTextureUtils.js → utils/WebGPUTextureMipmapUtils.js} +3 -25
- package/examples/jsm/renderers/webgpu/{WebGPUTextures.js → utils/WebGPUTextureUtils.js} +392 -505
- package/examples/jsm/renderers/webgpu/utils/WebGPUUtils.js +92 -0
- package/examples/jsm/shaders/BleachBypassShader.js +2 -0
- package/examples/jsm/shaders/BlendShader.js +1 -2
- package/examples/jsm/shaders/BokehShader2.js +3 -0
- package/examples/jsm/shaders/ColorifyShader.js +2 -0
- package/examples/jsm/shaders/ConvolutionShader.js +2 -0
- package/examples/jsm/shaders/CopyShader.js +4 -2
- package/examples/jsm/shaders/DotScreenShader.js +2 -0
- package/examples/jsm/shaders/ExposureShader.js +44 -0
- package/examples/jsm/shaders/FilmShader.js +2 -0
- package/examples/jsm/shaders/GammaCorrectionShader.js +2 -0
- package/examples/jsm/shaders/HorizontalBlurShader.js +2 -0
- package/examples/jsm/shaders/OutputShader.js +61 -0
- package/examples/jsm/shaders/RGBShiftShader.js +2 -0
- package/examples/jsm/shaders/SepiaShader.js +2 -0
- package/examples/jsm/shaders/ToonShader.js +13 -5
- package/examples/jsm/shaders/VerticalBlurShader.js +2 -0
- package/examples/jsm/shaders/VignetteShader.js +2 -0
- package/examples/jsm/shaders/WaterRefractionShader.js +5 -2
- package/examples/jsm/utils/BufferGeometryUtils.js +17 -1
- package/examples/jsm/utils/TextureUtils.js +86 -0
- package/examples/jsm/webxr/OculusHandPointerModel.js +34 -13
- package/examples/jsm/webxr/XRHandPrimitiveModel.js +1 -0
- package/examples/jsm/webxr/XRPlanes.js +100 -0
- package/package.json +3 -1
- package/src/Three.Legacy.js +0 -228
- package/src/audio/PositionalAudio.js +8 -0
- package/src/cameras/Camera.js +5 -0
- package/src/cameras/CubeCamera.js +76 -13
- package/src/cameras/OrthographicCamera.js +1 -1
- package/src/cameras/PerspectiveCamera.js +1 -1
- package/src/constants.js +13 -1
- package/src/core/BufferAttribute.js +3 -25
- package/src/core/BufferGeometry.js +1 -8
- package/src/core/Object3D.js +1 -1
- package/src/extras/core/Curve.js +1 -1
- package/src/loaders/CubeTextureLoader.js +2 -0
- package/src/loaders/Loader.js +2 -0
- package/src/loaders/MaterialLoader.js +5 -0
- package/src/loaders/ObjectLoader.js +1 -0
- package/src/materials/Material.js +13 -1
- package/src/materials/MeshPhysicalMaterial.js +32 -6
- package/src/math/Color.js +16 -11
- package/src/math/Frustum.js +16 -2
- package/src/math/MathUtils.js +16 -0
- package/src/math/Matrix3.js +26 -6
- package/src/math/Matrix4.js +74 -19
- package/src/objects/InstancedMesh.js +3 -0
- package/src/objects/Mesh.js +14 -10
- package/src/objects/Skeleton.js +1 -3
- package/src/objects/SkinnedMesh.js +36 -8
- package/src/renderers/WebGLRenderer.js +126 -21
- package/src/renderers/shaders/ShaderChunk/alphahash_fragment.glsl.js +7 -0
- package/src/renderers/shaders/ShaderChunk/alphahash_pars_fragment.glsl.js +68 -0
- package/src/renderers/shaders/ShaderChunk/begin_vertex.glsl.js +6 -0
- package/src/renderers/shaders/ShaderChunk/common.glsl.js +6 -0
- package/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js +26 -3
- package/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js +9 -1
- package/src/renderers/shaders/ShaderChunk/lights_physical_fragment.glsl.js +26 -0
- package/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js +52 -2
- package/src/renderers/shaders/ShaderChunk/normal_fragment_begin.glsl.js +10 -2
- package/src/renderers/shaders/ShaderChunk/normalmap_pars_fragment.glsl.js +1 -1
- package/src/renderers/shaders/ShaderChunk/{output_fragment.glsl.js → opaque_fragment.glsl.js} +1 -2
- package/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl.js +1 -1
- package/src/renderers/shaders/ShaderChunk/transmission_fragment.glsl.js +3 -3
- package/src/renderers/shaders/ShaderChunk/transmission_pars_fragment.glsl.js +10 -5
- package/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl.js +6 -1
- package/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl.js +7 -1
- package/src/renderers/shaders/ShaderChunk/uv_vertex.glsl.js +6 -1
- package/src/renderers/shaders/ShaderChunk.js +10 -6
- package/src/renderers/shaders/ShaderLib/background.glsl.js +1 -1
- package/src/renderers/shaders/ShaderLib/backgroundCube.glsl.js +1 -1
- package/src/renderers/shaders/ShaderLib/cube.glsl.js +1 -1
- package/src/renderers/shaders/ShaderLib/depth.glsl.js +2 -0
- package/src/renderers/shaders/ShaderLib/distanceRGBA.glsl.js +2 -0
- package/src/renderers/shaders/ShaderLib/equirect.glsl.js +1 -1
- package/src/renderers/shaders/ShaderLib/linedashed.glsl.js +2 -2
- package/src/renderers/shaders/ShaderLib/meshbasic.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib/meshlambert.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib/meshmatcap.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib/meshphong.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib/meshphysical.glsl.js +12 -2
- package/src/renderers/shaders/ShaderLib/meshtoon.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib/points.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib/shadow.glsl.js +1 -1
- package/src/renderers/shaders/ShaderLib/sprite.glsl.js +4 -2
- package/src/renderers/shaders/ShaderLib.js +4 -1
- package/src/renderers/shaders/UniformsLib.js +2 -0
- package/src/renderers/webgl/WebGLBindingStates.js +13 -5
- package/src/renderers/webgl/WebGLGeometries.js +12 -0
- package/src/renderers/webgl/WebGLInfo.js +0 -1
- package/src/renderers/webgl/WebGLMaterials.js +18 -0
- package/src/renderers/webgl/WebGLObjects.js +23 -3
- package/src/renderers/webgl/WebGLProgram.js +43 -5
- package/src/renderers/webgl/WebGLPrograms.js +19 -7
- package/src/renderers/webgl/WebGLTextures.js +19 -1
- package/src/renderers/webvr/WebVRManager.js +12 -0
- package/src/renderers/webxr/WebXRManager.js +39 -99
- package/src/scenes/Scene.js +0 -14
- package/src/textures/DepthTexture.js +22 -0
- package/src/textures/FramebufferTexture.js +1 -3
- package/src/textures/Source.js +4 -0
- package/src/textures/Texture.js +1 -1
- package/examples/jsm/exporters/ColladaExporter.js +0 -725
- package/examples/jsm/geometries/LightningStrike.js +0 -1017
- package/examples/jsm/loaders/PRWMLoader.js +0 -299
- package/examples/jsm/nodes/core/InstanceIndexNode.js +0 -26
- package/examples/jsm/objects/LightningStorm.js +0 -245
- package/examples/jsm/postprocessing/AdaptiveToneMappingPass.js +0 -361
- package/examples/jsm/renderers/webgpu/WebGPUAttributes.js +0 -197
- package/examples/jsm/renderers/webgpu/WebGPUBackground.js +0 -190
- package/examples/jsm/renderers/webgpu/WebGPUBinding.js +0 -22
- package/examples/jsm/renderers/webgpu/WebGPUBindings.js +0 -270
- package/examples/jsm/renderers/webgpu/WebGPUBuffer.js +0 -43
- package/examples/jsm/renderers/webgpu/WebGPUComputePipelines.js +0 -78
- package/examples/jsm/renderers/webgpu/WebGPUProgrammableStage.js +0 -22
- package/examples/jsm/renderers/webgpu/WebGPUProperties.js +0 -44
- package/examples/jsm/renderers/webgpu/WebGPURenderObject.js +0 -40
- package/examples/jsm/renderers/webgpu/WebGPURenderObjects.js +0 -50
- package/examples/jsm/renderers/webgpu/WebGPURenderPipelines.js +0 -274
- package/examples/jsm/renderers/webgpu/WebGPURenderStates.js +0 -54
- package/examples/jsm/renderers/webgpu/WebGPUSampledTexture.js +0 -75
- package/examples/jsm/renderers/webgpu/WebGPUSampler.js +0 -29
- package/examples/jsm/renderers/webgpu/WebGPUStorageBuffer.js +0 -20
- package/examples/jsm/renderers/webgpu/WebGPUTextureRenderer.js +0 -38
- package/examples/jsm/renderers/webgpu/WebGPUUniformBuffer.js +0 -18
- package/examples/jsm/renderers/webgpu/WebGPUUtils.js +0 -88
- package/examples/jsm/shaders/ToneMapShader.js +0 -73
- /package/src/renderers/shaders/ShaderChunk/{encodings_fragment.glsl.js → colorspace_fragment.glsl.js} +0 -0
- /package/src/renderers/shaders/ShaderChunk/{encodings_pars_fragment.glsl.js → colorspace_pars_fragment.glsl.js} +0 -0
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import Node, { addNodeClass } from '../core/Node.js';
|
|
2
2
|
import { getValueType } from '../core/NodeUtils.js';
|
|
3
|
-
import {
|
|
3
|
+
import { buffer } from '../accessors/BufferNode.js';
|
|
4
|
+
//import { bufferAttribute } from '../accessors/BufferAttributeNode.js';
|
|
5
|
+
import { instanceIndex } from '../core/IndexNode.js';
|
|
4
6
|
import { nodeProxy, float } from '../shadernode/ShaderNode.js';
|
|
5
7
|
|
|
6
|
-
import {
|
|
8
|
+
import { Vector4, MathUtils } from 'three';
|
|
9
|
+
|
|
10
|
+
let min = null;
|
|
11
|
+
let max = null;
|
|
7
12
|
|
|
8
13
|
class RangeNode extends Node {
|
|
9
14
|
|
|
@@ -39,69 +44,46 @@ class RangeNode extends Node {
|
|
|
39
44
|
|
|
40
45
|
if ( object.isInstancedMesh === true ) {
|
|
41
46
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
let min = this.minNode.value;
|
|
45
|
-
let max = this.maxNode.value;
|
|
46
|
-
|
|
47
|
-
const minLength = builder.getTypeLength( getValueType( min ) );
|
|
48
|
-
const maxLength = builder.getTypeLength( getValueType( max ) );
|
|
49
|
-
|
|
50
|
-
if ( minLength > maxLength && maxLength > 1 ) max = new min.constructor().fromArray( min.toArray() );
|
|
51
|
-
else if ( minLength > maxLength && maxLength === 1 ) max = new min.constructor().setScalar( max );
|
|
52
|
-
else if ( maxLength > minLength && minLength > 1 ) min = new max.constructor().fromArray( min.toArray() );
|
|
53
|
-
else if ( maxLength > minLength && minLength === 1 ) min = new max.constructor().setScalar( min );
|
|
54
|
-
|
|
55
|
-
const vectorLength = this.getVectorLength( builder );
|
|
56
|
-
const attributeName = 'node' + this.id;
|
|
57
|
-
|
|
58
|
-
const length = vectorLength * object.count;
|
|
59
|
-
const array = new Float32Array( length );
|
|
60
|
-
|
|
61
|
-
const attributeGeometry = geometry.getAttribute( attributeName );
|
|
62
|
-
|
|
63
|
-
if ( attributeGeometry === undefined || attributeGeometry.array.length < length ) {
|
|
47
|
+
let minValue = this.minNode.value;
|
|
48
|
+
let maxValue = this.maxNode.value;
|
|
64
49
|
|
|
65
|
-
|
|
50
|
+
const minLength = builder.getTypeLength( getValueType( minValue ) );
|
|
51
|
+
const maxLength = builder.getTypeLength( getValueType( maxValue ) );
|
|
66
52
|
|
|
67
|
-
|
|
53
|
+
min = min || new Vector4();
|
|
54
|
+
max = max || new Vector4();
|
|
68
55
|
|
|
69
|
-
|
|
56
|
+
min.setScalar( 0 );
|
|
57
|
+
max.setScalar( 0 );
|
|
70
58
|
|
|
71
|
-
|
|
59
|
+
if ( minLength === 1 ) min.setScalar( minValue );
|
|
60
|
+
else if ( minValue.isColor ) min.set( minValue.r, minValue.g, minValue.b );
|
|
61
|
+
else min.set( minValue.x, minValue.y, minValue.z || 0, minValue.w || 0 );
|
|
72
62
|
|
|
73
|
-
|
|
63
|
+
if ( maxLength === 1 ) max.setScalar( maxValue );
|
|
64
|
+
else if ( maxValue.isColor ) max.set( maxValue.r, maxValue.g, maxValue.b );
|
|
65
|
+
else max.set( maxValue.x, maxValue.y, maxValue.z || 0, maxValue.w || 0 );
|
|
74
66
|
|
|
75
|
-
|
|
67
|
+
const stride = 4;
|
|
76
68
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
array[ i + 2 ] = MathUtils.lerp( min.b, max.b, Math.random() );
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
} else {
|
|
84
|
-
|
|
85
|
-
for ( let i = 0; i < length; i ++ ) {
|
|
86
|
-
|
|
87
|
-
const index = i % vectorLength;
|
|
88
|
-
|
|
89
|
-
const minValue = min.getComponent( index );
|
|
90
|
-
const maxValue = max.getComponent( index );
|
|
91
|
-
|
|
92
|
-
array[ i ] = MathUtils.lerp( minValue, maxValue, Math.random() );
|
|
69
|
+
const length = stride * object.count;
|
|
70
|
+
const array = new Float32Array( length );
|
|
93
71
|
|
|
94
|
-
|
|
72
|
+
for ( let i = 0; i < length; i ++ ) {
|
|
95
73
|
|
|
96
|
-
|
|
74
|
+
const index = i % stride;
|
|
97
75
|
|
|
98
|
-
|
|
76
|
+
const minElementValue = min.getComponent( index );
|
|
77
|
+
const maxElementValue = max.getComponent( index );
|
|
99
78
|
|
|
100
|
-
|
|
79
|
+
array[ i ] = MathUtils.lerp( minElementValue, maxElementValue, Math.random() );
|
|
101
80
|
|
|
102
81
|
}
|
|
103
82
|
|
|
104
|
-
|
|
83
|
+
const nodeType = this.getNodeType( builder );
|
|
84
|
+
|
|
85
|
+
output = buffer( array, 'vec4', object.count ).element( instanceIndex ).convert( nodeType );
|
|
86
|
+
//output = bufferAttribute( array, 'vec4', 4, 0 ).convert( nodeType );
|
|
105
87
|
|
|
106
88
|
} else {
|
|
107
89
|
|
|
@@ -6,8 +6,8 @@ import { vec3 } from '../shadernode/ShaderNode.js';
|
|
|
6
6
|
import { reference } from '../accessors/ReferenceNode.js';
|
|
7
7
|
import { texture } from '../accessors/TextureNode.js';
|
|
8
8
|
import { positionWorld } from '../accessors/PositionNode.js';
|
|
9
|
+
//import { step } from '../math/MathNode.js';
|
|
9
10
|
import { cond } from '../math/CondNode.js';
|
|
10
|
-
import MeshBasicNodeMaterial from '../materials/MeshBasicNodeMaterial.js';
|
|
11
11
|
|
|
12
12
|
import { Color, DepthTexture, NearestFilter } from 'three';
|
|
13
13
|
|
|
@@ -43,7 +43,7 @@ class AnalyticLightNode extends LightingNode {
|
|
|
43
43
|
|
|
44
44
|
if ( shadowNode === null ) {
|
|
45
45
|
|
|
46
|
-
if ( depthMaterial === null ) depthMaterial =
|
|
46
|
+
if ( depthMaterial === null ) depthMaterial = builder.createNodeMaterial( 'MeshBasicNodeMaterial' );
|
|
47
47
|
|
|
48
48
|
const shadow = this.light.shadow;
|
|
49
49
|
const rtt = builder.getRenderTarget( shadow.mapSize.width, shadow.mapSize.height );
|
|
@@ -51,6 +51,9 @@ class AnalyticLightNode extends LightingNode {
|
|
|
51
51
|
const depthTexture = new DepthTexture();
|
|
52
52
|
depthTexture.minFilter = NearestFilter;
|
|
53
53
|
depthTexture.magFilter = NearestFilter;
|
|
54
|
+
depthTexture.image.width = shadow.mapSize.width;
|
|
55
|
+
depthTexture.image.height = shadow.mapSize.height;
|
|
56
|
+
//depthTexture.compareFunction = THREE.LessCompare;
|
|
54
57
|
|
|
55
58
|
rtt.depthTexture = depthTexture;
|
|
56
59
|
|
|
@@ -128,7 +131,7 @@ class AnalyticLightNode extends LightingNode {
|
|
|
128
131
|
|
|
129
132
|
}
|
|
130
133
|
|
|
131
|
-
update( frame ) {
|
|
134
|
+
update( /*frame*/ ) {
|
|
132
135
|
|
|
133
136
|
const { light } = this;
|
|
134
137
|
|
|
@@ -24,11 +24,11 @@ class DirectionalLightNode extends AnalyticLightNode {
|
|
|
24
24
|
|
|
25
25
|
if ( lightingModelFunctionNode && lightingModelFunctionNode.direct ) {
|
|
26
26
|
|
|
27
|
-
lightingModelFunctionNode.direct
|
|
27
|
+
lightingModelFunctionNode.direct( {
|
|
28
28
|
lightDirection,
|
|
29
29
|
lightColor,
|
|
30
30
|
reflectedLight
|
|
31
|
-
}
|
|
31
|
+
} );
|
|
32
32
|
|
|
33
33
|
}
|
|
34
34
|
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import LightingNode from './LightingNode.js';
|
|
2
2
|
import { cache } from '../core/CacheNode.js';
|
|
3
3
|
import { context } from '../core/ContextNode.js';
|
|
4
|
-
import { roughness } from '../core/PropertyNode.js';
|
|
4
|
+
import { roughness, clearcoatRoughness } from '../core/PropertyNode.js';
|
|
5
5
|
import { equirectUV } from '../utils/EquirectUVNode.js';
|
|
6
6
|
import { specularMIPLevel } from '../utils/SpecularMIPLevelNode.js';
|
|
7
7
|
import { cameraViewMatrix } from '../accessors/CameraNode.js';
|
|
8
|
-
import { transformedNormalView, transformedNormalWorld } from '../accessors/NormalNode.js';
|
|
8
|
+
import { transformedClearcoatNormalView, transformedNormalView, transformedNormalWorld } from '../accessors/NormalNode.js';
|
|
9
9
|
import { positionViewDirection } from '../accessors/PositionNode.js';
|
|
10
10
|
import { addNodeClass } from '../core/Node.js';
|
|
11
11
|
import { float, vec2 } from '../shadernode/ShaderNode.js';
|
|
12
|
+
import { cubeTexture } from '../accessors/CubeTextureNode.js';
|
|
13
|
+
import { reference } from '../accessors/ReferenceNode.js';
|
|
12
14
|
|
|
13
15
|
class EnvironmentNode extends LightingNode {
|
|
14
16
|
|
|
@@ -22,114 +24,157 @@ class EnvironmentNode extends LightingNode {
|
|
|
22
24
|
|
|
23
25
|
construct( builder ) {
|
|
24
26
|
|
|
25
|
-
|
|
27
|
+
let envNode = this.envNode;
|
|
26
28
|
const properties = builder.getNodeProperties( this );
|
|
27
29
|
|
|
28
|
-
|
|
29
|
-
let radianceTextureUVNode;
|
|
30
|
-
let irradianceTextureUVNode;
|
|
30
|
+
if ( envNode.isTextureNode && envNode.value.isCubeTexture !== true ) {
|
|
31
31
|
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
const texture = envNode.value;
|
|
33
|
+
const renderer = builder.renderer;
|
|
34
34
|
|
|
35
|
-
|
|
35
|
+
// @TODO: Add dispose logic here
|
|
36
|
+
const cubeRTT = builder.getCubeRenderTarget( 512 ).fromEquirectangularTexture( renderer, texture );
|
|
36
37
|
|
|
37
|
-
|
|
38
|
+
envNode = cubeTexture( cubeRTT.texture );
|
|
38
39
|
|
|
39
|
-
|
|
40
|
-
reflectVec = roughness.mul( roughness ).mix( reflectVec, transformedNormalView ).normalize();
|
|
41
|
-
reflectVec = reflectVec.transformDirection( cameraViewMatrix );
|
|
40
|
+
}
|
|
42
41
|
|
|
43
|
-
|
|
42
|
+
//
|
|
44
43
|
|
|
45
|
-
|
|
44
|
+
const intensity = reference( 'envMapIntensity', 'float', builder.material ); // @TODO: Add materialEnvIntensity in MaterialNode
|
|
46
45
|
|
|
47
|
-
|
|
46
|
+
const radiance = context( envNode, createRadianceContext( roughness, transformedNormalView ) ).mul( intensity );
|
|
47
|
+
const irradiance = context( envNode, createIrradianceContext( transformedNormalWorld ) ).mul( Math.PI ).mul( intensity );
|
|
48
48
|
|
|
49
|
-
|
|
49
|
+
const isolateRadiance = cache( radiance );
|
|
50
50
|
|
|
51
|
-
|
|
51
|
+
//
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
builder.context.radiance.addAssign( isolateRadiance );
|
|
54
54
|
|
|
55
|
-
|
|
55
|
+
builder.context.iblIrradiance.addAssign( irradiance );
|
|
56
56
|
|
|
57
|
-
|
|
57
|
+
//
|
|
58
58
|
|
|
59
|
-
|
|
59
|
+
let isolateClearcoatRadiance = null;
|
|
60
60
|
|
|
61
|
-
|
|
61
|
+
if ( builder.context.clearcoatRadiance ) {
|
|
62
62
|
|
|
63
|
-
|
|
63
|
+
const clearcoatRadiance = context( envNode, createRadianceContext( clearcoatRoughness, transformedClearcoatNormalView ) ).mul( intensity );
|
|
64
64
|
|
|
65
|
-
|
|
66
|
-
getSamplerLevelNode: () => {
|
|
65
|
+
isolateClearcoatRadiance = cache( clearcoatRadiance );
|
|
67
66
|
|
|
68
|
-
|
|
67
|
+
builder.context.clearcoatRadiance.addAssign( isolateClearcoatRadiance );
|
|
69
68
|
|
|
70
|
-
|
|
71
|
-
getMIPLevelAlgorithmNode: ( textureNode, levelNode ) => {
|
|
69
|
+
}
|
|
72
70
|
|
|
73
|
-
|
|
71
|
+
//
|
|
74
72
|
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
properties.radiance = isolateRadiance;
|
|
74
|
+
properties.clearcoatRadiance = isolateClearcoatRadiance;
|
|
75
|
+
properties.irradiance = irradiance;
|
|
77
76
|
|
|
78
|
-
|
|
79
|
-
getUVNode: ( textureNode ) => {
|
|
77
|
+
}
|
|
80
78
|
|
|
81
|
-
|
|
79
|
+
}
|
|
82
80
|
|
|
83
|
-
|
|
81
|
+
const createRadianceContext = ( roughnessNode, normalViewNode ) => {
|
|
84
82
|
|
|
85
|
-
|
|
83
|
+
let reflectVec = null;
|
|
84
|
+
let textureUVNode = null;
|
|
86
85
|
|
|
87
|
-
|
|
86
|
+
return {
|
|
87
|
+
getUVNode: ( textureNode ) => {
|
|
88
88
|
|
|
89
|
-
|
|
89
|
+
let node = null;
|
|
90
90
|
|
|
91
|
-
|
|
91
|
+
if ( reflectVec === null ) {
|
|
92
92
|
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
reflectVec = positionViewDirection.negate().reflect( normalViewNode );
|
|
94
|
+
reflectVec = roughnessNode.mul( roughnessNode ).mix( reflectVec, normalViewNode ).normalize();
|
|
95
|
+
reflectVec = reflectVec.transformDirection( cameraViewMatrix );
|
|
95
96
|
|
|
96
|
-
|
|
97
|
+
}
|
|
97
98
|
|
|
98
|
-
|
|
99
|
+
if ( textureNode.isCubeTextureNode ) {
|
|
99
100
|
|
|
100
|
-
|
|
101
|
+
node = reflectVec;
|
|
102
|
+
|
|
103
|
+
} else if ( textureNode.isTextureNode ) {
|
|
101
104
|
|
|
102
|
-
|
|
105
|
+
if ( textureUVNode === null ) {
|
|
103
106
|
|
|
104
|
-
|
|
105
|
-
getSamplerLevelNode: () => {
|
|
107
|
+
// @TODO: Needed PMREM
|
|
106
108
|
|
|
107
|
-
|
|
109
|
+
textureUVNode = equirectUV( reflectVec );
|
|
108
110
|
|
|
109
|
-
|
|
110
|
-
getMIPLevelAlgorithmNode: ( textureNode, levelNode ) => {
|
|
111
|
+
}
|
|
111
112
|
|
|
112
|
-
|
|
113
|
+
node = textureUVNode;
|
|
113
114
|
|
|
114
115
|
}
|
|
115
|
-
} );
|
|
116
116
|
|
|
117
|
-
|
|
117
|
+
return node;
|
|
118
118
|
|
|
119
|
-
|
|
119
|
+
},
|
|
120
|
+
getSamplerLevelNode: () => {
|
|
120
121
|
|
|
121
|
-
|
|
122
|
+
return roughnessNode;
|
|
122
123
|
|
|
123
|
-
|
|
124
|
+
},
|
|
125
|
+
getMIPLevelAlgorithmNode: ( textureNode, levelNode ) => {
|
|
124
126
|
|
|
125
|
-
|
|
127
|
+
return specularMIPLevel( textureNode, levelNode );
|
|
126
128
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
+
}
|
|
130
|
+
};
|
|
129
131
|
|
|
130
|
-
|
|
132
|
+
};
|
|
131
133
|
|
|
132
|
-
|
|
134
|
+
const createIrradianceContext = ( normalWorldNode ) => {
|
|
135
|
+
|
|
136
|
+
let textureUVNode = null;
|
|
137
|
+
|
|
138
|
+
return {
|
|
139
|
+
getUVNode: ( textureNode ) => {
|
|
140
|
+
|
|
141
|
+
let node = null;
|
|
142
|
+
|
|
143
|
+
if ( textureNode.isCubeTextureNode ) {
|
|
144
|
+
|
|
145
|
+
node = normalWorldNode;
|
|
146
|
+
|
|
147
|
+
} else if ( textureNode.isTextureNode ) {
|
|
148
|
+
|
|
149
|
+
if ( textureUVNode === null ) {
|
|
150
|
+
|
|
151
|
+
// @TODO: Needed PMREM
|
|
152
|
+
|
|
153
|
+
textureUVNode = equirectUV( normalWorldNode );
|
|
154
|
+
textureUVNode = vec2( textureUVNode.x, textureUVNode.y.oneMinus() );
|
|
155
|
+
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
node = textureUVNode;
|
|
159
|
+
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
return node;
|
|
163
|
+
|
|
164
|
+
},
|
|
165
|
+
getSamplerLevelNode: () => {
|
|
166
|
+
|
|
167
|
+
return float( 1 );
|
|
168
|
+
|
|
169
|
+
},
|
|
170
|
+
getMIPLevelAlgorithmNode: ( textureNode, levelNode ) => {
|
|
171
|
+
|
|
172
|
+
return specularMIPLevel( textureNode, levelNode );
|
|
173
|
+
|
|
174
|
+
}
|
|
175
|
+
};
|
|
176
|
+
|
|
177
|
+
};
|
|
133
178
|
|
|
134
179
|
export default EnvironmentNode;
|
|
135
180
|
|
|
@@ -14,8 +14,8 @@ class HemisphereLightNode extends AnalyticLightNode {
|
|
|
14
14
|
|
|
15
15
|
super( light );
|
|
16
16
|
|
|
17
|
-
this.lightPositionNode = objectPosition;
|
|
18
|
-
this.lightDirectionNode =
|
|
17
|
+
this.lightPositionNode = objectPosition( light );
|
|
18
|
+
this.lightDirectionNode = this.lightPositionNode.normalize();
|
|
19
19
|
|
|
20
20
|
this.groundColorNode = uniform( new Color() );
|
|
21
21
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { tslFn } from '../shadernode/ShaderNode.js';
|
|
2
2
|
|
|
3
|
-
export const getDistanceAttenuation =
|
|
3
|
+
export const getDistanceAttenuation = tslFn( ( inputs ) => {
|
|
4
4
|
|
|
5
5
|
const { lightDistance, cutoffDistance, decayExponent } = inputs;
|
|
6
6
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import ContextNode from '../core/ContextNode.js';
|
|
2
|
-
import { temp } from '../core/VarNode.js';
|
|
3
2
|
import { add } from '../math/OperatorNode.js';
|
|
4
3
|
import { mix } from '../math/MathNode.js';
|
|
5
4
|
import { addNodeClass } from '../core/Node.js';
|
|
@@ -30,10 +29,10 @@ class LightingContextNode extends ContextNode {
|
|
|
30
29
|
const context = this.context = {}; // reset context
|
|
31
30
|
const properties = builder.getNodeProperties( this );
|
|
32
31
|
|
|
33
|
-
const directDiffuse =
|
|
34
|
-
directSpecular =
|
|
35
|
-
indirectDiffuse =
|
|
36
|
-
indirectSpecular =
|
|
32
|
+
const directDiffuse = vec3().temp(),
|
|
33
|
+
directSpecular = vec3().temp(),
|
|
34
|
+
indirectDiffuse = vec3().temp(),
|
|
35
|
+
indirectSpecular = vec3().temp();
|
|
37
36
|
|
|
38
37
|
let totalDiffuse = add( directDiffuse, indirectDiffuse );
|
|
39
38
|
|
|
@@ -44,7 +43,7 @@ class LightingContextNode extends ContextNode {
|
|
|
44
43
|
}
|
|
45
44
|
|
|
46
45
|
const totalSpecular = add( directSpecular, indirectSpecular );
|
|
47
|
-
const total = add( totalDiffuse, totalSpecular );
|
|
46
|
+
const total = add( totalDiffuse, totalSpecular ).temp();
|
|
48
47
|
|
|
49
48
|
const reflectedLight = {
|
|
50
49
|
directDiffuse,
|
|
@@ -55,21 +54,24 @@ class LightingContextNode extends ContextNode {
|
|
|
55
54
|
};
|
|
56
55
|
|
|
57
56
|
const lighting = {
|
|
58
|
-
radiance:
|
|
59
|
-
irradiance:
|
|
60
|
-
iblIrradiance:
|
|
61
|
-
ambientOcclusion:
|
|
57
|
+
radiance: vec3().temp(),
|
|
58
|
+
irradiance: vec3().temp(),
|
|
59
|
+
iblIrradiance: vec3().temp(),
|
|
60
|
+
ambientOcclusion: float( 1 ).temp()
|
|
62
61
|
};
|
|
63
62
|
|
|
63
|
+
context.reflectedLight = reflectedLight;
|
|
64
|
+
context.lightingModelNode = lightingModelNode || context.lightingModelNode;
|
|
65
|
+
|
|
64
66
|
Object.assign( properties, reflectedLight, lighting );
|
|
65
67
|
Object.assign( context, lighting );
|
|
66
68
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
+
// @TODO: Call needed return a new node ( or rename the ShaderNodeInternal.call() function ), it's not moment to run
|
|
70
|
+
if ( lightingModelNode && lightingModelNode.init ) lightingModelNode.init( context, builder.stack, builder );
|
|
69
71
|
|
|
70
|
-
if ( lightingModelNode && lightingModelNode.indirectDiffuse ) lightingModelNode.indirectDiffuse
|
|
71
|
-
if ( lightingModelNode && lightingModelNode.indirectSpecular ) lightingModelNode.indirectSpecular
|
|
72
|
-
if ( lightingModelNode && lightingModelNode.ambientOcclusion ) lightingModelNode.ambientOcclusion
|
|
72
|
+
if ( lightingModelNode && lightingModelNode.indirectDiffuse ) lightingModelNode.indirectDiffuse( context, builder.stack, builder );
|
|
73
|
+
if ( lightingModelNode && lightingModelNode.indirectSpecular ) lightingModelNode.indirectSpecular( context, builder.stack, builder );
|
|
74
|
+
if ( lightingModelNode && lightingModelNode.ambientOcclusion ) lightingModelNode.ambientOcclusion( context, builder.stack, builder );
|
|
73
75
|
|
|
74
76
|
return super.construct( builder );
|
|
75
77
|
|
|
@@ -39,7 +39,7 @@ class PointLightNode extends AnalyticLightNode {
|
|
|
39
39
|
const lightDirection = lVector.normalize();
|
|
40
40
|
const lightDistance = lVector.length();
|
|
41
41
|
|
|
42
|
-
const lightAttenuation = getDistanceAttenuation
|
|
42
|
+
const lightAttenuation = getDistanceAttenuation( {
|
|
43
43
|
lightDistance,
|
|
44
44
|
cutoffDistance: cutoffDistanceNode,
|
|
45
45
|
decayExponent: decayExponentNode
|
|
@@ -52,11 +52,11 @@ class PointLightNode extends AnalyticLightNode {
|
|
|
52
52
|
|
|
53
53
|
if ( lightingModelFunctionNode && lightingModelFunctionNode.direct ) {
|
|
54
54
|
|
|
55
|
-
lightingModelFunctionNode.direct
|
|
55
|
+
lightingModelFunctionNode.direct( {
|
|
56
56
|
lightDirection,
|
|
57
57
|
lightColor,
|
|
58
58
|
reflectedLight
|
|
59
|
-
}
|
|
59
|
+
} );
|
|
60
60
|
|
|
61
61
|
}
|
|
62
62
|
|
|
@@ -60,7 +60,7 @@ class SpotLightNode extends AnalyticLightNode {
|
|
|
60
60
|
|
|
61
61
|
const lightDistance = lVector.length();
|
|
62
62
|
|
|
63
|
-
const lightAttenuation = getDistanceAttenuation
|
|
63
|
+
const lightAttenuation = getDistanceAttenuation( {
|
|
64
64
|
lightDistance,
|
|
65
65
|
cutoffDistance: cutoffDistanceNode,
|
|
66
66
|
decayExponent: decayExponentNode
|
|
@@ -73,11 +73,11 @@ class SpotLightNode extends AnalyticLightNode {
|
|
|
73
73
|
|
|
74
74
|
if ( lightingModelFunctionNode && lightingModelFunctionNode.direct ) {
|
|
75
75
|
|
|
76
|
-
lightingModelFunctionNode.direct
|
|
76
|
+
lightingModelFunctionNode.direct( {
|
|
77
77
|
lightDirection,
|
|
78
78
|
lightColor,
|
|
79
79
|
reflectedLight
|
|
80
|
-
}
|
|
80
|
+
} );
|
|
81
81
|
|
|
82
82
|
}
|
|
83
83
|
|
|
@@ -21,21 +21,6 @@ class LineBasicNodeMaterial extends NodeMaterial {
|
|
|
21
21
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
copy( source ) {
|
|
25
|
-
|
|
26
|
-
this.colorNode = source.colorNode;
|
|
27
|
-
this.opacityNode = source.opacityNode;
|
|
28
|
-
|
|
29
|
-
this.alphaTestNode = source.alphaTestNode;
|
|
30
|
-
|
|
31
|
-
this.lightNode = source.lightNode;
|
|
32
|
-
|
|
33
|
-
this.positionNode = source.positionNode;
|
|
34
|
-
|
|
35
|
-
return super.copy( source );
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
|
|
39
24
|
}
|
|
40
25
|
|
|
41
26
|
export default LineBasicNodeMaterial;
|
|
@@ -20,21 +20,6 @@ class MeshBasicNodeMaterial extends NodeMaterial {
|
|
|
20
20
|
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
copy( source ) {
|
|
24
|
-
|
|
25
|
-
this.colorNode = source.colorNode;
|
|
26
|
-
this.opacityNode = source.opacityNode;
|
|
27
|
-
|
|
28
|
-
this.alphaTestNode = source.alphaTestNode;
|
|
29
|
-
|
|
30
|
-
this.lightNode = source.lightNode;
|
|
31
|
-
|
|
32
|
-
this.positionNode = source.positionNode;
|
|
33
|
-
|
|
34
|
-
return super.copy( source );
|
|
35
|
-
|
|
36
|
-
}
|
|
37
|
-
|
|
38
23
|
}
|
|
39
24
|
|
|
40
25
|
export default MeshBasicNodeMaterial;
|
|
@@ -31,16 +31,6 @@ class MeshNormalNodeMaterial extends NodeMaterial {
|
|
|
31
31
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
copy( source ) {
|
|
35
|
-
|
|
36
|
-
this.opacityNode = source.opacityNode;
|
|
37
|
-
|
|
38
|
-
this.positionNode = source.positionNode;
|
|
39
|
-
|
|
40
|
-
return super.copy( source );
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
|
|
44
34
|
}
|
|
45
35
|
|
|
46
36
|
export default MeshNormalNodeMaterial;
|
|
@@ -51,18 +51,9 @@ class MeshPhongNodeMaterial extends NodeMaterial {
|
|
|
51
51
|
|
|
52
52
|
copy( source ) {
|
|
53
53
|
|
|
54
|
-
this.colorNode = source.colorNode;
|
|
55
|
-
this.opacityNode = source.opacityNode;
|
|
56
|
-
|
|
57
|
-
this.alphaTestNode = source.alphaTestNode;
|
|
58
|
-
|
|
59
54
|
this.shininessNode = source.shininessNode;
|
|
60
55
|
this.specularNode = source.specularNode;
|
|
61
56
|
|
|
62
|
-
this.lightNode = source.lightNode;
|
|
63
|
-
|
|
64
|
-
this.positionNode = source.positionNode;
|
|
65
|
-
|
|
66
57
|
return super.copy( source );
|
|
67
58
|
|
|
68
59
|
}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { addNodeMaterial } from './NodeMaterial.js';
|
|
2
|
+
import { transformedClearcoatNormalView } from '../accessors/NormalNode.js';
|
|
3
|
+
import { clearcoat, clearcoatRoughness, sheen, sheenRoughness } from '../core/PropertyNode.js';
|
|
4
|
+
import { materialClearcoatNormal } from '../accessors/ExtendedMaterialNode.js';
|
|
5
|
+
import { materialClearcoat, materialClearcoatRoughness, materialSheen, materialSheenRoughness } from '../accessors/MaterialNode.js';
|
|
6
|
+
import { float, vec3 } from '../shadernode/ShaderNode.js';
|
|
2
7
|
import MeshStandardNodeMaterial from './MeshStandardNodeMaterial.js';
|
|
3
8
|
|
|
4
9
|
import { MeshPhysicalMaterial } from 'three';
|
|
@@ -38,6 +43,42 @@ class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
|
|
|
38
43
|
|
|
39
44
|
}
|
|
40
45
|
|
|
46
|
+
constructVariants( builder ) {
|
|
47
|
+
|
|
48
|
+
super.constructVariants( builder );
|
|
49
|
+
|
|
50
|
+
const { stack } = builder;
|
|
51
|
+
|
|
52
|
+
// CLEARCOAT
|
|
53
|
+
|
|
54
|
+
const clearcoatNode = this.clearcoatNode ? float( this.clearcoatNode ) : materialClearcoat;
|
|
55
|
+
const clearcoatRoughnessNode = this.clearcoatRoughnessNode ? float( this.clearcoatRoughnessNode ) : materialClearcoatRoughness;
|
|
56
|
+
|
|
57
|
+
stack.assign( clearcoat, clearcoatNode );
|
|
58
|
+
stack.assign( clearcoatRoughness, clearcoatRoughnessNode );
|
|
59
|
+
|
|
60
|
+
// SHEEN
|
|
61
|
+
|
|
62
|
+
const sheenNode = this.sheenNode ? vec3( this.sheenNode ) : materialSheen;
|
|
63
|
+
const sheenRoughnessNode = this.sheenRoughnessNode ? float( this.sheenRoughnessNode ) : materialSheenRoughness;
|
|
64
|
+
|
|
65
|
+
stack.assign( sheen, sheenNode );
|
|
66
|
+
stack.assign( sheenRoughness, sheenRoughnessNode );
|
|
67
|
+
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
constructNormal( builder ) {
|
|
71
|
+
|
|
72
|
+
super.constructNormal( builder );
|
|
73
|
+
|
|
74
|
+
// CLEARCOAT NORMAL
|
|
75
|
+
|
|
76
|
+
const clearcoatNormalNode = this.clearcoatNormalNode ? vec3( this.clearcoatNormalNode ) : materialClearcoatNormal;
|
|
77
|
+
|
|
78
|
+
builder.stack.assign( transformedClearcoatNormalView, clearcoatNormalNode );
|
|
79
|
+
|
|
80
|
+
}
|
|
81
|
+
|
|
41
82
|
copy( source ) {
|
|
42
83
|
|
|
43
84
|
this.clearcoatNode = source.clearcoatNode;
|