@gnsx/three 0.185.16 → 0.186.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 +10 -82600
- package/build/three.core.js +1303 -728
- package/build/three.module.js +439 -338
- package/build/three.tsl.js +74 -44
- package/build/three.webgpu.js +6036 -2184
- package/build/three.webgpu.nodes.js +6020 -2184
- package/examples/jsm/Addons.js +6 -6
- package/examples/jsm/controls/ArcballControls.js +1 -1
- package/examples/jsm/controls/FirstPersonControls.js +44 -20
- package/examples/jsm/controls/OrbitControls.js +9 -0
- package/examples/jsm/controls/TrackballControls.js +109 -4
- package/examples/jsm/csm/CSMShadowNode.js +13 -0
- package/examples/jsm/exporters/GLTFExporter.js +23 -7
- package/examples/jsm/exporters/USDZExporter.js +2 -2
- package/examples/jsm/generators/CityGenerator.js +377 -45
- package/examples/jsm/generators/ForestGenerator.js +12 -12
- package/examples/jsm/generators/TerrainGenerator.js +49 -37
- package/examples/jsm/generators/TreeGenerator.js +70 -76
- package/examples/jsm/generators/city/BenchGenerator.js +127 -0
- package/examples/jsm/generators/city/CarGenerator.js +479 -0
- package/examples/jsm/generators/city/CityGeneratorUtils.js +31 -0
- package/examples/jsm/generators/city/HydrantGenerator.js +106 -0
- package/examples/jsm/generators/city/InstancedMeshGenerator.js +86 -0
- package/examples/jsm/generators/city/PersonGenerator.js +447 -0
- package/examples/jsm/generators/city/SidewalkGenerator.js +33 -38
- package/examples/jsm/generators/city/SkyscraperGenerator.js +448 -48
- package/examples/jsm/generators/city/StreetTreeGenerator.js +231 -0
- package/examples/jsm/generators/city/StreetlightGenerator.js +100 -0
- package/examples/jsm/generators/city/TrafficlightGenerator.js +106 -0
- package/examples/jsm/generators/city/TrashcanGenerator.js +100 -0
- package/examples/jsm/geometries/BoxLineGeometry.js +1 -1
- package/examples/jsm/geometries/ParametricGeometry.js +1 -1
- package/examples/jsm/geometries/RoundedBoxGeometry.js +1 -1
- package/examples/jsm/gpgpu/CountingSort.js +271 -0
- package/examples/jsm/helpers/LightProbeGridHelper.js +60 -239
- package/examples/jsm/helpers/LightProbeGridHelperWebGL.js +221 -0
- package/examples/jsm/inspector/Extension.js +94 -0
- package/examples/jsm/inspector/Inspector.js +145 -41
- package/examples/jsm/inspector/RendererInspector.js +100 -52
- package/examples/jsm/inspector/extensions/color-grading/ColorGrading.js +2609 -0
- package/examples/jsm/inspector/extensions/color-grading/ColorWheel.js +352 -0
- package/examples/jsm/inspector/extensions/color-grading/CurveEditor.js +599 -0
- package/examples/jsm/inspector/extensions/color-grading/LUT3DStyle.js +1201 -0
- package/examples/jsm/inspector/extensions/color-grading/LUTMath.js +788 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/BrightnessModule.js +72 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/ColorWheelModule.js +112 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/ContrastModule.js +82 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/CurvesModule.js +109 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/ExposureHueModule.js +110 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/ExposureModule.js +73 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/HueModule.js +78 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/ImportedCubeModule.js +89 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/Module.js +285 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/OutputModule.js +101 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/RendererModule.js +225 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/SatVibranceModule.js +102 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/SaturationModule.js +76 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/VibranceModule.js +76 -0
- package/examples/jsm/inspector/extensions/color-grading/modules/WhiteBalanceModule.js +86 -0
- package/examples/jsm/inspector/extensions/tsl-graph/TSLGraphEditor.js +26 -31
- package/examples/jsm/inspector/extensions/tsl-graph/TSLGraphLoader.js +1 -0
- package/examples/jsm/inspector/tabs/Memory.js +0 -2
- package/examples/jsm/inspector/tabs/Settings.js +4 -0
- package/examples/jsm/inspector/tabs/Timeline.js +223 -171
- package/examples/jsm/inspector/tabs/Viewer.js +515 -21
- package/examples/jsm/inspector/ui/List.js +15 -9
- package/examples/jsm/inspector/ui/Profiler.js +170 -14
- package/examples/jsm/inspector/ui/Style.js +269 -23
- package/examples/jsm/inspector/ui/Tab.js +2 -0
- package/examples/jsm/inspector/ui/Values.js +14 -2
- package/examples/jsm/interactive/HTMLMesh.js +19 -3
- package/examples/jsm/lighting/LightProbeGrid.js +484 -889
- package/examples/jsm/lighting/LightProbeGridUtils.js +107 -0
- package/examples/jsm/lighting/LightProbeGridWebGL.js +841 -0
- package/examples/jsm/lighting/vxgi/VXGIConeTracer.js +194 -0
- package/examples/jsm/lighting/vxgi/VXGINode.js +660 -0
- package/examples/jsm/lighting/vxgi/VXGISceneCollector.js +478 -0
- package/examples/jsm/lighting/vxgi/VXGIVolume.js +1430 -0
- package/examples/jsm/lights/SunLight.js +95 -0
- package/examples/jsm/lights/SunLightNode.js +56 -0
- package/examples/jsm/lights/SunLightShadow.js +319 -0
- package/examples/jsm/lights/SunShadowNode.js +312 -0
- package/examples/jsm/loaders/3DMLoader.js +150 -49
- package/examples/jsm/loaders/3MFLoader.js +202 -1
- package/examples/jsm/loaders/FBXLoader.js +81 -5
- package/examples/jsm/loaders/GLTFGaussianSplatLoaderExtension.js +330 -0
- package/examples/jsm/loaders/GLTFLoader.js +79 -14
- package/examples/jsm/loaders/GaussianSplatPLYLoader.js +386 -0
- package/examples/jsm/loaders/KSPLATLoader.js +463 -0
- package/examples/jsm/loaders/MaterialXLoader.js +111 -1010
- package/examples/jsm/loaders/PCDLoader.js +1 -1
- package/examples/jsm/loaders/SPLATLoader.js +139 -0
- package/examples/jsm/loaders/SPZLoader.js +561 -0
- package/examples/jsm/loaders/materialx/MaterialXArchive.js +108 -0
- package/examples/jsm/loaders/materialx/MaterialXDocument.js +878 -0
- package/examples/jsm/loaders/materialx/MaterialXHextile.js +183 -0
- package/examples/jsm/loaders/materialx/MaterialXInterfaceValidation.js +376 -0
- package/examples/jsm/loaders/materialx/MaterialXLog.js +75 -0
- package/examples/jsm/loaders/materialx/MaterialXNodeInterfaceRegistry.js +4 -0
- package/examples/jsm/loaders/materialx/MaterialXNodeLibrary.js +1021 -0
- package/examples/jsm/loaders/materialx/MaterialXSurfaceMappings.js +661 -0
- package/examples/jsm/loaders/materialx/MaterialXUtils.js +57 -0
- package/examples/jsm/loaders/materialx/compile/MaterialXCompileRegistry.js +997 -0
- package/examples/jsm/loaders/materialx/parse/MaterialXParser.js +28 -0
- package/examples/jsm/loaders/usd/USDAParser.js +15 -2
- package/examples/jsm/loaders/usd/USDCParser.js +1 -4
- package/examples/jsm/loaders/usd/USDComposer.js +80 -42
- package/examples/jsm/materials/WoodNodeMaterial.js +6 -108
- package/examples/jsm/misc/RollerCoaster.js +2 -2
- package/examples/jsm/misc/SculptGL.LICENSE.txt +21 -0
- package/examples/jsm/misc/Sculptor.js +1679 -0
- package/examples/jsm/misc/SculptorMesh.js +1504 -0
- package/examples/jsm/misc/SculptorTools.js +1180 -0
- package/examples/jsm/misc/SculptorUtils.js +345 -0
- package/examples/jsm/misc/TubePainter.js +28 -16
- package/examples/jsm/misc/VolumeSlice.js +24 -24
- package/examples/jsm/modifiers/SimplifyModifier.js +63 -556
- package/examples/jsm/objects/GaussianSplat.js +1039 -0
- package/examples/jsm/objects/Sky.js +66 -45
- package/examples/jsm/objects/SkyMesh.js +70 -51
- package/examples/jsm/physics/JoltPhysics.js +1 -1
- package/examples/jsm/postprocessing/AfterimagePass.js +4 -2
- package/examples/jsm/postprocessing/BloomPass.js +2 -2
- package/examples/jsm/postprocessing/GTAOPass.js +1 -1
- package/examples/jsm/postprocessing/OutlinePass.js +5 -5
- package/examples/jsm/postprocessing/SAOPass.js +1 -1
- package/examples/jsm/postprocessing/SSAOPass.js +1 -1
- package/examples/jsm/postprocessing/SSRPass.js +4 -2
- package/examples/jsm/postprocessing/SavePass.js +1 -1
- package/examples/jsm/postprocessing/TAARenderPass.js +1 -1
- package/examples/jsm/postprocessing/UnrealBloomPass.js +30 -13
- package/examples/jsm/renderers/CSS2DRenderer.js +29 -5
- package/examples/jsm/shaders/DepthLimitedBlurShader.js +4 -1
- package/examples/jsm/shaders/ExposureShader.js +1 -1
- package/examples/jsm/shaders/FilmShader.js +2 -1
- package/examples/jsm/transpiler/AST.js +21 -2
- package/examples/jsm/transpiler/GLSLDecoder.js +498 -8
- package/examples/jsm/transpiler/TSLEncoder.js +82 -10
- package/examples/jsm/transpiler/WGSLEncoder.js +33 -4
- package/examples/jsm/tsl/WebGLNodesHandler.js +29 -39
- package/examples/jsm/tsl/display/AfterImageNode.js +2 -0
- package/examples/jsm/tsl/display/AnaglyphPassNode.js +3 -2
- package/examples/jsm/tsl/display/BilateralBlurNode.js +5 -2
- package/examples/jsm/tsl/display/BloomNode.js +55 -30
- package/examples/jsm/tsl/display/DenoiseNode.js +21 -1
- package/examples/jsm/tsl/display/DepthOfFieldNode.js +24 -6
- package/examples/jsm/tsl/display/DotScreenNode.js +11 -11
- package/examples/jsm/tsl/display/FSR1Node.js +8 -4
- package/examples/jsm/tsl/display/GTAONode.js +199 -86
- package/examples/jsm/tsl/display/GaussianBlurNode.js +65 -52
- package/examples/jsm/tsl/display/GodraysNode.js +5 -2
- package/examples/jsm/tsl/display/ImportanceSampledEnvironment.js +2 -2
- package/examples/jsm/tsl/display/LensflareNode.js +5 -2
- package/examples/jsm/tsl/display/OITPassNode.js +352 -0
- package/examples/jsm/tsl/display/OutlineNode.js +2 -0
- package/examples/jsm/tsl/display/ParallaxBarrierPassNode.js +3 -2
- package/examples/jsm/tsl/display/RGBShiftNode.js +9 -9
- package/examples/jsm/tsl/display/RecurrentDenoiseNode.js +7 -4
- package/examples/jsm/tsl/display/RetroPassNode.js +1 -1
- package/examples/jsm/tsl/display/SMAANode.js +22 -61
- package/examples/jsm/tsl/display/SSAAPassNode.js +2 -4
- package/examples/jsm/tsl/display/SSAONode.js +436 -0
- package/examples/jsm/tsl/display/SSGINode.js +5 -2
- package/examples/jsm/tsl/display/SSRNode.js +7 -2
- package/examples/jsm/tsl/display/SSSNode.js +5 -2
- package/examples/jsm/tsl/display/SharpenNode.js +5 -4
- package/examples/jsm/tsl/display/StereoCompositePassNode.js +1 -3
- package/examples/jsm/tsl/display/StereoPassNode.js +1 -3
- package/examples/jsm/tsl/display/TAAUNode.js +22 -125
- package/examples/jsm/tsl/display/TRAANode.js +16 -142
- package/examples/jsm/tsl/display/TemporalReprojectNode.js +21 -15
- package/examples/jsm/tsl/display/depthAwareBlur.js +63 -0
- package/examples/jsm/tsl/display/hashBlur.js +3 -2
- package/examples/jsm/tsl/lighting/ClusteredLightsNode.js +38 -27
- package/examples/jsm/tsl/lighting/LightProbeGridNode.js +136 -0
- package/examples/jsm/tsl/math/voronoiNoise.js +112 -0
- package/examples/jsm/tsl/shadows/TileShadowNode.js +4 -6
- package/examples/jsm/tsl/utils/Raymarching.js +5 -5
- package/examples/jsm/tsl/utils/SoftParticles.js +60 -0
- package/examples/jsm/tsl/utils/TAAUtils.js +195 -0
- package/examples/jsm/utils/BufferGeometryUtils.js +14 -14
- package/examples/jsm/utils/GaussianSplatUtils.js +229 -0
- package/examples/jsm/utils/WebGLTextureUtils.js +1 -1
- package/examples/jsm/utils/WebGPUTextureUtils.js +1 -1
- package/examples/jsm/webxr/WebGLXRFallback.js +2 -16
- package/examples/jsm/webxr/XRControllerModelFactory.js +16 -4
- package/package.json +9 -16
- package/src/Three.Core.js +2 -1
- package/src/Three.TSL.js +73 -43
- package/src/Three.WebGPU.Nodes.js +1 -0
- package/src/Three.WebGPU.js +1 -0
- package/src/animation/AnimationClip.js +15 -2
- package/src/animation/AnimationObjectGroup.js +18 -6
- package/src/animation/AnimationUtils.js +26 -0
- package/src/animation/KeyframeTrack.js +37 -0
- package/src/constants.js +23 -1
- package/src/core/BufferAttribute.js +3 -2
- package/src/core/BufferGeometry.js +1 -1
- package/src/core/InterleavedBuffer.js +5 -1
- package/src/core/Object3D.js +40 -12
- package/src/core/Raycaster.js +4 -0
- package/src/core/RenderTarget.js +99 -9
- package/src/core/RenderTarget3D.js +12 -8
- package/src/extras/Controls.js +0 -8
- package/src/extras/PMREMGenerator.js +99 -205
- package/src/geometries/TorusGeometry.js +1 -1
- package/src/helpers/ArrowHelper.js +2 -0
- package/src/helpers/AxesHelper.js +2 -0
- package/src/helpers/Box3Helper.js +2 -0
- package/src/helpers/BoxHelper.js +2 -0
- package/src/helpers/CameraHelper.js +2 -0
- package/src/helpers/DirectionalLightHelper.js +2 -0
- package/src/helpers/GridHelper.js +2 -0
- package/src/helpers/HemisphereLightHelper.js +2 -0
- package/src/helpers/PlaneHelper.js +2 -0
- package/src/helpers/PointLightHelper.js +2 -0
- package/src/helpers/PolarGridHelper.js +2 -0
- package/src/helpers/SkeletonHelper.js +2 -0
- package/src/helpers/SpotLightHelper.js +2 -0
- package/src/lights/Light.js +0 -10
- package/src/lights/LightShadow.js +43 -12
- package/src/lights/SpotLightShadow.js +18 -0
- package/src/loaders/BufferGeometryLoader.js +5 -0
- package/src/loaders/ImageBitmapLoader.js +3 -1
- package/src/loaders/ObjectLoader.js +8 -5
- package/src/materials/Material.js +80 -57
- package/src/materials/MeshPhysicalMaterial.js +32 -0
- package/src/materials/nodes/Line2NodeMaterial.js +17 -8
- package/src/materials/nodes/MeshPhysicalNodeMaterial.js +42 -5
- package/src/materials/nodes/NodeMaterial.js +19 -13
- package/src/materials/nodes/PointsNodeMaterial.js +2 -1
- package/src/materials/nodes/manager/NodeMaterialObserver.js +282 -55
- package/src/math/Frustum.js +9 -0
- package/src/math/FrustumArray.js +1 -1
- package/src/math/MathUtils.js +5 -3
- package/src/math/Matrix4.js +2 -9
- package/src/math/Plane.js +30 -1
- package/src/math/Quaternion.js +0 -10
- package/src/math/Ray.js +95 -45
- package/src/math/Triangle.js +0 -2
- package/src/math/Vector3.js +2 -2
- package/src/math/Vector4.js +0 -4
- package/src/math/interpolants/BezierInterpolant.js +36 -23
- package/src/nodes/Nodes.js +2 -0
- package/src/nodes/TSL.js +11 -3
- package/src/nodes/accessors/Batch.js +85 -13
- package/src/nodes/accessors/BufferAttributeNode.js +1 -1
- package/src/nodes/accessors/BuiltinNode.js +1 -1
- package/src/nodes/accessors/Instance.js +19 -18
- package/src/nodes/accessors/MaterialNode.js +9 -0
- package/src/nodes/accessors/ModelNode.js +85 -9
- package/src/nodes/accessors/ReferenceBaseNode.js +1 -70
- package/src/nodes/accessors/ReferenceElementNode.js +72 -0
- package/src/nodes/accessors/ReferenceNode.js +1 -70
- package/src/nodes/accessors/Skinning.js +124 -12
- package/src/nodes/accessors/StorageTextureNode.js +7 -3
- package/src/nodes/accessors/Texture3DNode.js +1 -1
- package/src/nodes/accessors/TextureNode.js +51 -21
- package/src/nodes/accessors/TextureSizeNode.js +4 -2
- package/src/nodes/accessors/UniformArrayNode.js +30 -5
- package/src/nodes/code/CodeNode.js +1 -1
- package/src/nodes/code/FunctionNode.js +12 -2
- package/src/nodes/core/ArrayNode.js +2 -2
- package/src/nodes/core/ContextNode.js +57 -4
- package/src/nodes/core/IndexNode.js +69 -4
- package/src/nodes/core/InspectorNode.js +2 -2
- package/src/nodes/core/MRTNode.js +44 -2
- package/src/nodes/core/Node.js +6 -3
- package/src/nodes/core/NodeBuilder.js +65 -50
- package/src/nodes/core/NodeFrame.js +11 -3
- package/src/nodes/core/NodeUtils.js +88 -0
- package/src/nodes/core/PropertyNode.js +8 -0
- package/src/nodes/core/StackNode.js +0 -1
- package/src/nodes/core/StructNode.js +4 -3
- package/src/nodes/core/UniformGroupNode.js +3 -2
- package/src/nodes/core/UniformNode.js +26 -12
- package/src/nodes/core/VarNode.js +0 -1
- package/src/nodes/display/BumpMapNode.js +2 -2
- package/src/nodes/display/ColorAdjustment.js +1 -1
- package/src/nodes/display/PassNode.js +76 -15
- package/src/nodes/display/ScreenNode.js +22 -65
- package/src/nodes/fog/Fog.js +4 -4
- package/src/nodes/functions/BSDF/BRDF_GGX.js +6 -6
- package/src/nodes/functions/BSDF/BRDF_Sheen.js +1 -1
- package/src/nodes/functions/BSDF/DFGLUT.js +2 -1
- package/src/nodes/functions/BSDF/LTC.js +1 -1
- package/src/nodes/functions/PhongLightingModel.js +1 -1
- package/src/nodes/functions/PhysicalLightingModel.js +83 -25
- package/src/nodes/functions/ToonLightingModel.js +2 -2
- package/src/nodes/functions/material/getParallaxCorrectNormal.js +3 -3
- package/src/nodes/gpgpu/AtomicFunctionNode.js +64 -13
- package/src/nodes/gpgpu/BarrierNode.js +13 -4
- package/src/nodes/gpgpu/ComputeBuiltinNode.js +1 -1
- package/src/nodes/gpgpu/ComputeNode.js +20 -17
- package/src/nodes/gpgpu/SubgroupFunctionNode.js +165 -37
- package/src/nodes/gpgpu/WorkgroupInfoNode.js +44 -6
- package/src/nodes/lighting/EnvironmentNode.js +40 -4
- package/src/nodes/lighting/LightsNode.js +20 -4
- package/src/nodes/lighting/ShadowBaseNode.js +158 -1
- package/src/nodes/lighting/ShadowFilterNode.js +2 -106
- package/src/nodes/lighting/ShadowNode.js +22 -91
- package/src/nodes/materialx/{lib/mx_hsv.js → MaterialXColor.js} +3 -6
- package/src/nodes/materialx/{lib/mx_transform_color.js → MaterialXColorTransform.js} +3 -6
- package/src/nodes/materialx/MaterialXCore.js +37 -0
- package/src/nodes/materialx/MaterialXNodes.js +64 -72
- package/src/nodes/materialx/{lib/mx_noise.js → MaterialXNoise.js} +426 -197
- package/src/nodes/math/BitcountNode.js +24 -4
- package/src/nodes/math/MathNode.js +4 -4
- package/src/nodes/math/MathUtils.js +15 -4
- package/src/nodes/math/OperatorNode.js +2 -2
- package/src/nodes/math/PackFloatNode.js +29 -1
- package/src/nodes/math/Packed4x8IntegerNode.js +433 -0
- package/src/nodes/math/UnpackFloatNode.js +30 -2
- package/src/nodes/parsers/GLSLNodeFunction.js +1 -1
- package/src/nodes/pmrem/PMREMNode.js +1 -1
- package/src/nodes/pmrem/PMREMUtils.js +31 -74
- package/src/nodes/shapes/Shapes.js +1 -1
- package/src/nodes/tsl/TSLCore.js +1 -31
- package/src/nodes/utils/EventNode.js +75 -0
- package/src/nodes/utils/LoopNode.js +54 -13
- package/src/nodes/utils/PostProcessingUtils.js +23 -2
- package/src/nodes/utils/RTTNode.js +97 -32
- package/src/nodes/utils/ReflectorNode.js +8 -4
- package/src/nodes/utils/RotateNode.js +85 -8
- package/src/nodes/utils/SpriteUtils.js +58 -23
- package/src/objects/BatchedMesh.js +6 -0
- package/src/objects/InstancedMesh.js +1 -1
- package/src/objects/LOD.js +1 -1
- package/src/objects/Line.js +12 -0
- package/src/objects/Mesh.js +12 -0
- package/src/objects/Points.js +12 -0
- package/src/objects/Sprite.js +12 -0
- package/src/renderers/WebGLRenderer.js +93 -27
- package/src/renderers/common/Animation.js +12 -2
- package/src/renderers/common/Backend.js +38 -10
- package/src/renderers/common/BindGroup.js +0 -1
- package/src/renderers/common/Bindings.js +50 -4
- package/src/renderers/common/BundleGroup.js +4 -0
- package/src/renderers/common/ClippingContext.js +11 -1
- package/src/renderers/common/Color4.js +9 -0
- package/src/renderers/common/Constants.js +0 -5
- package/src/renderers/common/DirectRenderPipeline.js +233 -0
- package/src/renderers/common/Geometries.js +24 -3
- package/src/renderers/common/Info.js +3 -3
- package/src/renderers/common/InspectorBase.js +37 -8
- package/src/renderers/common/Lighting.js +11 -4
- package/src/renderers/common/Pipelines.js +6 -4
- package/src/renderers/common/QuadMesh.js +16 -2
- package/src/renderers/common/RenderContext.js +8 -0
- package/src/renderers/common/RenderList.js +53 -19
- package/src/renderers/common/RenderLists.js +58 -11
- package/src/renderers/common/RenderObject.js +14 -0
- package/src/renderers/common/RenderObjects.js +14 -9
- package/src/renderers/common/RenderPipeline.js +52 -44
- package/src/renderers/common/Renderer.js +226 -55
- package/src/renderers/common/Storage3DTexture.js +16 -0
- package/src/renderers/common/Textures.js +3 -3
- package/src/renderers/common/XRManager.js +79 -72
- package/src/renderers/common/extras/PMREMGenerator.js +76 -144
- package/src/renderers/common/nodes/NodeManager.js +144 -6
- package/src/renderers/common/nodes/NodeStorageBuffer.js +3 -1
- package/src/renderers/common/nodes/NodeUniformBuffer.js +3 -1
- package/src/renderers/shaders/DFGLUTData.js +2 -1
- package/src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl.js +4 -2
- package/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js +48 -0
- package/src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl.js +53 -4
- package/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js +20 -2
- package/src/renderers/shaders/ShaderChunk/lights_pars_begin.glsl.js +20 -0
- package/src/renderers/shaders/ShaderChunk/lights_physical_fragment.glsl.js +6 -0
- package/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js +61 -57
- package/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl.js +82 -0
- package/src/renderers/shaders/ShaderChunk/shadowmap_pars_vertex.glsl.js +9 -0
- package/src/renderers/shaders/ShaderChunk/shadowmap_vertex.glsl.js +8 -1
- package/src/renderers/shaders/ShaderChunk/shadowmask_pars_fragment.glsl.js +15 -0
- package/src/renderers/shaders/ShaderLib/meshphysical.glsl.js +4 -0
- package/src/renderers/shaders/ShaderLib.js +1 -0
- package/src/renderers/shaders/UniformsLib.js +16 -0
- package/src/renderers/webgl/WebGLAnimation.js +2 -2
- package/src/renderers/webgl/WebGLCapabilities.js +2 -2
- package/src/renderers/webgl/WebGLLights.js +74 -4
- package/src/renderers/webgl/WebGLMaterials.js +6 -0
- package/src/renderers/webgl/WebGLOutput.js +36 -24
- package/src/renderers/webgl/WebGLProgram.js +3 -0
- package/src/renderers/webgl/WebGLPrograms.js +8 -0
- package/src/renderers/webgl/WebGLRenderLists.js +6 -10
- package/src/renderers/webgl/WebGLShadowMap.js +47 -44
- package/src/renderers/webgl/WebGLTextures.js +7 -7
- package/src/renderers/webgl-fallback/WebGLBackend.js +153 -45
- package/src/renderers/webgl-fallback/nodes/GLSLNodeBuilder.js +83 -29
- package/src/renderers/webgl-fallback/utils/WebGLState.js +163 -17
- package/src/renderers/webgl-fallback/utils/WebGLTextureUtils.js +32 -5
- package/src/renderers/webgl-fallback/utils/WebGLTimestampQueryPool.js +11 -4
- package/src/renderers/webgpu/WebGPUBackend.js +513 -145
- package/src/renderers/webgpu/nodes/WGSLNodeBuilder.js +99 -20
- package/src/renderers/webgpu/nodes/WGSLNodeFunction.js +2 -1
- package/src/renderers/webgpu/utils/WebGPUAttributeUtils.js +3 -12
- package/src/renderers/webgpu/utils/WebGPUBindingUtils.js +24 -14
- package/src/renderers/webgpu/utils/WebGPUPipelineUtils.js +80 -14
- package/src/renderers/webgpu/utils/WebGPUTextureUtils.js +62 -7
- package/src/renderers/webgpu/utils/WebGPUTimestampQueryPool.js +9 -3
- package/src/renderers/webgpu/utils/WebGPUUtils.js +16 -4
- package/src/renderers/webxr/WebXRManager.js +25 -2
- package/src/scenes/Scene.js +3 -3
- package/src/textures/CompressedArrayTexture.js +16 -0
- package/src/textures/Data3DTexture.js +16 -0
- package/src/textures/DataArrayTexture.js +16 -0
- package/src/textures/DepthTexture.js +3 -3
- package/src/textures/Texture.js +3 -3
- package/src/textures/{Source.js → TextureSource.js} +39 -8
- package/build/three.core.min.js +0 -6
- package/build/three.module.min.js +0 -6
- package/build/three.tsl.min.js +0 -6
- package/build/three.webgpu.min.js +0 -6
- package/build/three.webgpu.nodes.min.js +0 -6
- package/examples/jsm/libs/ecsy.module.js +0 -1792
- package/examples/jsm/loaders/LottieLoader.js +0 -130
- package/src/nodes/functions/BSDF/BRDF_GGX_Multiscatter.js +0 -52
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import {
|
|
2
|
+
abs,
|
|
3
|
+
add,
|
|
4
|
+
clamp,
|
|
5
|
+
cos,
|
|
6
|
+
dFdx,
|
|
7
|
+
dFdy,
|
|
8
|
+
div,
|
|
9
|
+
dot,
|
|
10
|
+
element,
|
|
11
|
+
floor,
|
|
12
|
+
fract,
|
|
13
|
+
max,
|
|
14
|
+
mix,
|
|
15
|
+
mul,
|
|
16
|
+
pow,
|
|
17
|
+
sin,
|
|
18
|
+
step,
|
|
19
|
+
sub,
|
|
20
|
+
vec2,
|
|
21
|
+
vec3,
|
|
22
|
+
} from '@gnsx/three/tsl';
|
|
23
|
+
|
|
24
|
+
const HEXTILE_SQRT3_2 = Math.sqrt( 3 ) * 2;
|
|
25
|
+
const HEXTILE_EPSILON = 1e-6;
|
|
26
|
+
const HEXTILE_PI_OVER_180 = Math.PI / 180;
|
|
27
|
+
|
|
28
|
+
function toRadians( degrees ) {
|
|
29
|
+
|
|
30
|
+
return mul( degrees, HEXTILE_PI_OVER_180 );
|
|
31
|
+
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function mxHextileHash( point ) {
|
|
35
|
+
|
|
36
|
+
const x = element( point, 0 );
|
|
37
|
+
const y = element( point, 1 );
|
|
38
|
+
const p3Base = vec3( x, y, x );
|
|
39
|
+
const p3Scaled = mul( p3Base, vec3( 0.1031, 0.103, 0.0973 ) );
|
|
40
|
+
const p3Fract = fract( p3Scaled );
|
|
41
|
+
const p3YZX = vec3( element( p3Fract, 1 ), element( p3Fract, 2 ), element( p3Fract, 0 ) );
|
|
42
|
+
const p3Offset = add( p3YZX, 33.33 );
|
|
43
|
+
const p3 = add( p3Fract, dot( p3Fract, p3Offset ) );
|
|
44
|
+
const lhs = add( vec2( element( p3, 0 ), element( p3, 0 ) ), vec2( element( p3, 1 ), element( p3, 2 ) ) );
|
|
45
|
+
const rhs = vec2( element( p3, 2 ), element( p3, 1 ) );
|
|
46
|
+
return fract( mul( lhs, rhs ) );
|
|
47
|
+
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
function mxSchlickGain( x, r ) {
|
|
51
|
+
|
|
52
|
+
const rr = clamp( r, 0.001, 0.999 );
|
|
53
|
+
const a = mul( sub( div( 1, rr ), 2 ), sub( 1, mul( 2, x ) ) );
|
|
54
|
+
const low = div( x, add( a, 1 ) );
|
|
55
|
+
const high = div( sub( a, x ), sub( a, 1 ) );
|
|
56
|
+
return mix( low, high, step( 0.5, x ) );
|
|
57
|
+
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
function normalizeBlendWeights( weights ) {
|
|
61
|
+
|
|
62
|
+
const wx = element( weights, 0 );
|
|
63
|
+
const wy = element( weights, 1 );
|
|
64
|
+
const wz = element( weights, 2 );
|
|
65
|
+
const sum = add( add( wx, wy ), wz );
|
|
66
|
+
return div( weights, sum );
|
|
67
|
+
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function mxRotate2d( point, sine, cosine ) {
|
|
71
|
+
|
|
72
|
+
return vec2( sub( mul( cosine, element( point, 0 ) ), mul( sine, element( point, 1 ) ) ), add( mul( sine, element( point, 0 ) ), mul( cosine, element( point, 1 ) ) ) );
|
|
73
|
+
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function toTileCenter( tileId ) {
|
|
77
|
+
|
|
78
|
+
const scaled = div( tileId, HEXTILE_SQRT3_2 );
|
|
79
|
+
const sx = element( scaled, 0 );
|
|
80
|
+
const sy = element( scaled, 1 );
|
|
81
|
+
return vec2( add( sx, mul( 0.5, sy ) ), mul( 0.8660254, sy ) );
|
|
82
|
+
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
export function mxHextileComputeBlendWeights( luminanceWeights, tileWeights, falloff ) {
|
|
86
|
+
|
|
87
|
+
const weighted = mul( luminanceWeights, pow( tileWeights, vec3( 7, 7, 7 ) ) );
|
|
88
|
+
const normalized = normalizeBlendWeights( weighted );
|
|
89
|
+
const gained = vec3(
|
|
90
|
+
mxSchlickGain( element( normalized, 0 ), falloff ),
|
|
91
|
+
mxSchlickGain( element( normalized, 1 ), falloff ),
|
|
92
|
+
mxSchlickGain( element( normalized, 2 ), falloff ),
|
|
93
|
+
);
|
|
94
|
+
const gainedNormalized = normalizeBlendWeights( gained );
|
|
95
|
+
const applyFalloff = step( HEXTILE_EPSILON, abs( sub( falloff, 0.5 ) ) );
|
|
96
|
+
return mix( normalized, gainedNormalized, applyFalloff );
|
|
97
|
+
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export function mxHextileCoord( coord, rotation, rotationRange, scale, scaleRange, offset, offsetRange ) {
|
|
101
|
+
|
|
102
|
+
const st = mul( coord, HEXTILE_SQRT3_2 );
|
|
103
|
+
const stSkewed = vec2( add( element( st, 0 ), mul( - 0.57735027, element( st, 1 ) ) ), mul( 1.15470054, element( st, 1 ) ) );
|
|
104
|
+
const stFrac = fract( stSkewed );
|
|
105
|
+
const tx = element( stFrac, 0 );
|
|
106
|
+
const ty = element( stFrac, 1 );
|
|
107
|
+
const tz = sub( sub( 1, tx ), ty );
|
|
108
|
+
const s = step( 0, sub( 0, tz ) );
|
|
109
|
+
const s2 = sub( mul( 2, s ), 1 );
|
|
110
|
+
const w1 = mul( sub( 0, tz ), s2 );
|
|
111
|
+
const w2 = sub( s, mul( ty, s2 ) );
|
|
112
|
+
const w3 = sub( s, mul( tx, s2 ) );
|
|
113
|
+
const baseId = floor( stSkewed );
|
|
114
|
+
const oneMinusS = sub( 1, s );
|
|
115
|
+
const id1 = add( baseId, vec2( s, s ) );
|
|
116
|
+
const id2 = add( baseId, vec2( s, oneMinusS ) );
|
|
117
|
+
const id3 = add( baseId, vec2( oneMinusS, s ) );
|
|
118
|
+
|
|
119
|
+
const ctr1 = toTileCenter( id1 );
|
|
120
|
+
const ctr2 = toTileCenter( id2 );
|
|
121
|
+
const ctr3 = toTileCenter( id3 );
|
|
122
|
+
|
|
123
|
+
const seedOffset = vec2( 0.12345, 0.12345 );
|
|
124
|
+
const rand1 = mxHextileHash( add( id1, seedOffset ) );
|
|
125
|
+
const rand2 = mxHextileHash( add( id2, seedOffset ) );
|
|
126
|
+
const rand3 = mxHextileHash( add( id3, seedOffset ) );
|
|
127
|
+
|
|
128
|
+
const rr = vec2( toRadians( element( rotationRange, 0 ) ), toRadians( element( rotationRange, 1 ) ) );
|
|
129
|
+
const rrMin = element( rr, 0 );
|
|
130
|
+
const rrMax = element( rr, 1 );
|
|
131
|
+
const randX = vec3( element( rand1, 0 ), element( rand2, 0 ), element( rand3, 0 ) );
|
|
132
|
+
const rotations = mix( vec3( rrMin, rrMin, rrMin ), vec3( rrMax, rrMax, rrMax ), mul( randX, rotation ) );
|
|
133
|
+
const randY = vec3( element( rand1, 1 ), element( rand2, 1 ), element( rand3, 1 ) );
|
|
134
|
+
const scaleMin = element( scaleRange, 0 );
|
|
135
|
+
const scaleMax = element( scaleRange, 1 );
|
|
136
|
+
const randomScale = mix( vec3( scaleMin, scaleMin, scaleMin ), vec3( scaleMax, scaleMax, scaleMax ), randY );
|
|
137
|
+
const scales = mix( vec3( 1, 1, 1 ), randomScale, scale );
|
|
138
|
+
const offsetMin = element( offsetRange, 0 );
|
|
139
|
+
const offsetMax = element( offsetRange, 1 );
|
|
140
|
+
const offset1 = mix( vec2( offsetMin, offsetMin ), vec2( offsetMax, offsetMax ), mul( rand1, offset ) );
|
|
141
|
+
const offset2 = mix( vec2( offsetMin, offsetMin ), vec2( offsetMax, offsetMax ), mul( rand2, offset ) );
|
|
142
|
+
const offset3 = mix( vec2( offsetMin, offsetMin ), vec2( offsetMax, offsetMax ), mul( rand3, offset ) );
|
|
143
|
+
|
|
144
|
+
const sampleCoord = ( center, randomOffset, rotationValue, sampleScale ) => {
|
|
145
|
+
|
|
146
|
+
const delta = sub( coord, center );
|
|
147
|
+
const rotated = mxRotate2d( delta, sin( rotationValue ), cos( rotationValue ) );
|
|
148
|
+
const safeScale = max( sampleScale, HEXTILE_EPSILON );
|
|
149
|
+
return add( add( div( rotated, vec2( safeScale, safeScale ) ), center ), randomOffset );
|
|
150
|
+
|
|
151
|
+
};
|
|
152
|
+
|
|
153
|
+
const sampleDerivative = ( derivative, rotationValue, sampleScale ) => {
|
|
154
|
+
|
|
155
|
+
const rotated = mxRotate2d( derivative, sin( rotationValue ), cos( rotationValue ) );
|
|
156
|
+
const safeScale = max( sampleScale, HEXTILE_EPSILON );
|
|
157
|
+
return div( rotated, vec2( safeScale, safeScale ) );
|
|
158
|
+
|
|
159
|
+
};
|
|
160
|
+
|
|
161
|
+
const ddx = dFdx( coord );
|
|
162
|
+
const ddy = dFdy( coord );
|
|
163
|
+
|
|
164
|
+
return {
|
|
165
|
+
coords: [
|
|
166
|
+
sampleCoord( ctr1, offset1, element( rotations, 0 ), element( scales, 0 ) ),
|
|
167
|
+
sampleCoord( ctr2, offset2, element( rotations, 1 ), element( scales, 1 ) ),
|
|
168
|
+
sampleCoord( ctr3, offset3, element( rotations, 2 ), element( scales, 2 ) ),
|
|
169
|
+
],
|
|
170
|
+
ddx: [
|
|
171
|
+
sampleDerivative( ddx, element( rotations, 0 ), element( scales, 0 ) ),
|
|
172
|
+
sampleDerivative( ddx, element( rotations, 1 ), element( scales, 1 ) ),
|
|
173
|
+
sampleDerivative( ddx, element( rotations, 2 ), element( scales, 2 ) ),
|
|
174
|
+
],
|
|
175
|
+
ddy: [
|
|
176
|
+
sampleDerivative( ddy, element( rotations, 0 ), element( scales, 0 ) ),
|
|
177
|
+
sampleDerivative( ddy, element( rotations, 1 ), element( scales, 1 ) ),
|
|
178
|
+
sampleDerivative( ddy, element( rotations, 2 ), element( scales, 2 ) ),
|
|
179
|
+
],
|
|
180
|
+
weights: vec3( w1, w2, w3 ),
|
|
181
|
+
};
|
|
182
|
+
|
|
183
|
+
}
|
|
@@ -0,0 +1,376 @@
|
|
|
1
|
+
import { MtlXLibrary } from './MaterialXNodeLibrary.js';
|
|
2
|
+
import { MaterialXLogCodes } from './MaterialXLog.js';
|
|
3
|
+
import registryData from './MaterialXNodeInterfaceRegistry.js';
|
|
4
|
+
|
|
5
|
+
const SKIP_ELEMENTS = new Set( [ 'materialx', 'input', 'output' ] );
|
|
6
|
+
const CONTAINER_ELEMENTS = new Set( [ 'nodegraph' ] );
|
|
7
|
+
|
|
8
|
+
const LIBRARY_FALLBACK_OUTPUT = 'out';
|
|
9
|
+
|
|
10
|
+
function formatInputElement( inputNodeX ) {
|
|
11
|
+
|
|
12
|
+
const attrs = [];
|
|
13
|
+
for ( const name of [ 'name', 'type', 'nodename', 'nodegraph', 'interfacename', 'output', 'value' ] ) {
|
|
14
|
+
|
|
15
|
+
const value = inputNodeX.getAttribute( name );
|
|
16
|
+
if ( value !== null && value !== '' ) {
|
|
17
|
+
|
|
18
|
+
attrs.push( `${name}="${value}"` );
|
|
19
|
+
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
return `<input ${attrs.join( ' ' )}>`;
|
|
25
|
+
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function formatNodeElement( nodeX ) {
|
|
29
|
+
|
|
30
|
+
const attrs = [];
|
|
31
|
+
for ( const name of [ 'name', 'type', 'nodedef' ] ) {
|
|
32
|
+
|
|
33
|
+
const value = nodeX.getAttribute( name );
|
|
34
|
+
if ( value !== null && value !== '' ) {
|
|
35
|
+
|
|
36
|
+
attrs.push( `${name}="${value}"` );
|
|
37
|
+
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
return `<${nodeX.element} ${attrs.join( ' ' )}>`;
|
|
43
|
+
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
function scoreNodedefCandidate( candidateName, nodeX ) {
|
|
47
|
+
|
|
48
|
+
const candidate = registryData.resolved[ candidateName ];
|
|
49
|
+
if ( ! candidate ) return - 1;
|
|
50
|
+
|
|
51
|
+
let score = 0;
|
|
52
|
+
const nodeType = nodeX.type;
|
|
53
|
+
const outputType = candidate.outputs.out || Object.values( candidate.outputs )[ 0 ];
|
|
54
|
+
if ( nodeType && outputType === nodeType ) {
|
|
55
|
+
|
|
56
|
+
score += 4;
|
|
57
|
+
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
for ( const child of nodeX.children ) {
|
|
61
|
+
|
|
62
|
+
if ( child.element !== 'input' ) continue;
|
|
63
|
+
const expectedType = candidate.inputs[ child.name ];
|
|
64
|
+
if ( ! expectedType || ! child.type ) continue;
|
|
65
|
+
if ( expectedType === child.type ) {
|
|
66
|
+
|
|
67
|
+
score += 3;
|
|
68
|
+
|
|
69
|
+
} else if ( typesCompatible( expectedType, child.type ) ) {
|
|
70
|
+
|
|
71
|
+
score += 1;
|
|
72
|
+
|
|
73
|
+
} else {
|
|
74
|
+
|
|
75
|
+
score -= 2;
|
|
76
|
+
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
return score;
|
|
82
|
+
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function resolveInterface( nodeX ) {
|
|
86
|
+
|
|
87
|
+
const nodedefName = nodeX.getAttribute( 'nodedef' );
|
|
88
|
+
if ( nodedefName && registryData.resolved[ nodedefName ] ) {
|
|
89
|
+
|
|
90
|
+
return { source: 'nodedef', name: nodedefName, ...registryData.resolved[ nodedefName ] };
|
|
91
|
+
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
const candidates = registryData.byNode[ nodeX.element ] || [];
|
|
95
|
+
if ( candidates.length > 0 ) {
|
|
96
|
+
|
|
97
|
+
let selected = candidates[ 0 ];
|
|
98
|
+
let bestScore = - Infinity;
|
|
99
|
+
|
|
100
|
+
for ( const candidateName of candidates ) {
|
|
101
|
+
|
|
102
|
+
const score = scoreNodedefCandidate( candidateName, nodeX );
|
|
103
|
+
if ( score > bestScore ) {
|
|
104
|
+
|
|
105
|
+
bestScore = score;
|
|
106
|
+
selected = candidateName;
|
|
107
|
+
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
const resolved = registryData.resolved[ selected ];
|
|
113
|
+
if ( resolved ) {
|
|
114
|
+
|
|
115
|
+
return { source: 'nodedef', name: selected, ...resolved };
|
|
116
|
+
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
const libraryEntry = MtlXLibrary[ nodeX.element ];
|
|
122
|
+
if ( libraryEntry ) {
|
|
123
|
+
|
|
124
|
+
const inputs = Object.fromEntries( libraryEntry.params.map( ( param ) => [ param, null ] ) );
|
|
125
|
+
const outputs = nodeX.type ? { [ LIBRARY_FALLBACK_OUTPUT ]: nodeX.type } : {};
|
|
126
|
+
return { source: 'library', name: nodeX.element, node: nodeX.element, inputs, outputs };
|
|
127
|
+
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
return null;
|
|
131
|
+
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
function resolveReferencedNode( inputNodeX ) {
|
|
135
|
+
|
|
136
|
+
const materialX = inputNodeX.materialX;
|
|
137
|
+
const referencePath = inputNodeX.referencePath;
|
|
138
|
+
if ( ! referencePath ) return null;
|
|
139
|
+
|
|
140
|
+
return materialX.getMaterialXNode( referencePath ) || null;
|
|
141
|
+
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
function resolveSourceOutputType( sourceNodeX, outputName ) {
|
|
145
|
+
|
|
146
|
+
if ( sourceNodeX.element === 'output' ) {
|
|
147
|
+
|
|
148
|
+
return {
|
|
149
|
+
interface: null,
|
|
150
|
+
outputType: sourceNodeX.type,
|
|
151
|
+
outputName: sourceNodeX.name || 'out',
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
const sourceInterface = resolveInterface( sourceNodeX );
|
|
157
|
+
if ( ! sourceInterface ) return { interface: null, outputType: null, outputName };
|
|
158
|
+
|
|
159
|
+
if ( outputName ) {
|
|
160
|
+
|
|
161
|
+
if ( sourceInterface.outputs[ outputName ] ) {
|
|
162
|
+
|
|
163
|
+
return {
|
|
164
|
+
interface: sourceInterface,
|
|
165
|
+
outputType: sourceInterface.outputs[ outputName ],
|
|
166
|
+
outputName,
|
|
167
|
+
};
|
|
168
|
+
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
return {
|
|
172
|
+
interface: sourceInterface,
|
|
173
|
+
outputType: null,
|
|
174
|
+
outputName,
|
|
175
|
+
};
|
|
176
|
+
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
if ( sourceNodeX.type && sourceNodeX.type !== 'multioutput' ) {
|
|
180
|
+
|
|
181
|
+
return {
|
|
182
|
+
interface: sourceInterface,
|
|
183
|
+
outputType: sourceNodeX.type,
|
|
184
|
+
outputName: 'out',
|
|
185
|
+
};
|
|
186
|
+
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if ( sourceInterface.outputs.out ) {
|
|
190
|
+
|
|
191
|
+
return {
|
|
192
|
+
interface: sourceInterface,
|
|
193
|
+
outputType: sourceInterface.outputs.out,
|
|
194
|
+
outputName: 'out',
|
|
195
|
+
};
|
|
196
|
+
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
const declaredOutputs = Object.entries( sourceInterface.outputs );
|
|
200
|
+
if ( declaredOutputs.length === 1 ) {
|
|
201
|
+
|
|
202
|
+
const [ singleName, singleType ] = declaredOutputs[ 0 ];
|
|
203
|
+
return {
|
|
204
|
+
interface: sourceInterface,
|
|
205
|
+
outputType: singleType,
|
|
206
|
+
outputName: singleName,
|
|
207
|
+
};
|
|
208
|
+
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
if ( sourceNodeX.type ) {
|
|
212
|
+
|
|
213
|
+
return {
|
|
214
|
+
interface: sourceInterface,
|
|
215
|
+
outputType: sourceNodeX.type,
|
|
216
|
+
outputName: null,
|
|
217
|
+
};
|
|
218
|
+
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
return { interface: sourceInterface, outputType: null, outputName: null };
|
|
222
|
+
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
function typesCompatible( expectedType, actualType ) {
|
|
226
|
+
|
|
227
|
+
if ( ! expectedType || ! actualType ) return true;
|
|
228
|
+
if ( expectedType === actualType ) return true;
|
|
229
|
+
if ( ( expectedType === 'float' && actualType === 'integer' ) || ( expectedType === 'integer' && actualType === 'float' ) ) {
|
|
230
|
+
|
|
231
|
+
return true;
|
|
232
|
+
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
return false;
|
|
236
|
+
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
function validatePortConnection( inputNodeX, parentNodeX, log ) {
|
|
240
|
+
|
|
241
|
+
const sourceNodeX = resolveReferencedNode( inputNodeX );
|
|
242
|
+
if ( ! sourceNodeX ) return;
|
|
243
|
+
|
|
244
|
+
const { outputType } = resolveSourceOutputType( sourceNodeX, inputNodeX.output );
|
|
245
|
+
const inputSnippet = formatInputElement( inputNodeX );
|
|
246
|
+
|
|
247
|
+
if ( inputNodeX.output && outputType === null ) {
|
|
248
|
+
|
|
249
|
+
log.add(
|
|
250
|
+
MaterialXLogCodes.INVALID_OUTPUT_CONNECTION,
|
|
251
|
+
`No output found for port connection: ${inputSnippet}`,
|
|
252
|
+
parentNodeX.name,
|
|
253
|
+
);
|
|
254
|
+
return;
|
|
255
|
+
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
const inputType = inputNodeX.type;
|
|
259
|
+
if ( inputType && outputType && typesCompatible( inputType, outputType ) === false ) {
|
|
260
|
+
|
|
261
|
+
log.add(
|
|
262
|
+
MaterialXLogCodes.TYPE_MISMATCH,
|
|
263
|
+
`Mismatched types in port connection: ${inputSnippet}`,
|
|
264
|
+
parentNodeX.name,
|
|
265
|
+
);
|
|
266
|
+
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
function validateNodeInputs( nodeX, log ) {
|
|
272
|
+
|
|
273
|
+
if ( nodeX.element === 'materialx' ) {
|
|
274
|
+
|
|
275
|
+
for ( const child of nodeX.children ) {
|
|
276
|
+
|
|
277
|
+
validateNodeInputs( child, log );
|
|
278
|
+
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
return;
|
|
282
|
+
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
if ( SKIP_ELEMENTS.has( nodeX.element ) ) return;
|
|
286
|
+
if ( CONTAINER_ELEMENTS.has( nodeX.element ) ) {
|
|
287
|
+
|
|
288
|
+
for ( const child of nodeX.children ) {
|
|
289
|
+
|
|
290
|
+
validateNodeInputs( child, log );
|
|
291
|
+
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
return;
|
|
295
|
+
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
const nodeInterface = resolveInterface( nodeX );
|
|
299
|
+
if ( nodeInterface ) {
|
|
300
|
+
|
|
301
|
+
for ( const child of nodeX.children ) {
|
|
302
|
+
|
|
303
|
+
if ( child.element !== 'input' ) continue;
|
|
304
|
+
|
|
305
|
+
const inputName = child.name;
|
|
306
|
+
if ( ! inputName ) continue;
|
|
307
|
+
|
|
308
|
+
if ( nodeInterface.inputs[ inputName ] === undefined ) {
|
|
309
|
+
|
|
310
|
+
log.add(
|
|
311
|
+
MaterialXLogCodes.UNKNOWN_INPUT,
|
|
312
|
+
`Node interface error: Input '${inputName}' doesn't match declaration: ${formatNodeElement( nodeX )}`,
|
|
313
|
+
nodeX.name,
|
|
314
|
+
);
|
|
315
|
+
|
|
316
|
+
} else if (
|
|
317
|
+
child.type &&
|
|
318
|
+
nodeInterface.inputs[ inputName ] &&
|
|
319
|
+
child.hasReference === false &&
|
|
320
|
+
typesCompatible( nodeInterface.inputs[ inputName ], child.type ) === false
|
|
321
|
+
) {
|
|
322
|
+
|
|
323
|
+
log.add(
|
|
324
|
+
MaterialXLogCodes.TYPE_MISMATCH,
|
|
325
|
+
`Input '${inputName}' type '${child.type}' doesn't match nodedef type '${nodeInterface.inputs[ inputName ]}' on ${formatNodeElement( nodeX )}`,
|
|
326
|
+
nodeX.name,
|
|
327
|
+
);
|
|
328
|
+
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
if ( child.hasReference ) {
|
|
332
|
+
|
|
333
|
+
validatePortConnection( child, nodeX, log );
|
|
334
|
+
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
} else if ( MtlXLibrary[ nodeX.element ] === undefined && nodeX.element !== 'surfacematerial' ) {
|
|
340
|
+
|
|
341
|
+
// Defer unsupported-node warnings to compile-time behavior.
|
|
342
|
+
for ( const child of nodeX.children ) {
|
|
343
|
+
|
|
344
|
+
if ( child.element === 'input' && child.hasReference ) {
|
|
345
|
+
|
|
346
|
+
validatePortConnection( child, nodeX, log );
|
|
347
|
+
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
for ( const child of nodeX.children ) {
|
|
355
|
+
|
|
356
|
+
if ( child.element !== 'input' && child.element !== 'output' ) {
|
|
357
|
+
|
|
358
|
+
validateNodeInputs( child, log );
|
|
359
|
+
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
function createStrictInterfaceValidator() {
|
|
367
|
+
|
|
368
|
+
return function validateMaterialXInterfaces( rootNode, log ) {
|
|
369
|
+
|
|
370
|
+
validateNodeInputs( rootNode, log );
|
|
371
|
+
|
|
372
|
+
};
|
|
373
|
+
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
export { createStrictInterfaceValidator };
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
const MaterialXLogCodes = {
|
|
2
|
+
UNSUPPORTED_NODE: {
|
|
3
|
+
label: 'unsupported-node',
|
|
4
|
+
severity: 'error',
|
|
5
|
+
},
|
|
6
|
+
IGNORED_SURFACE_INPUT: {
|
|
7
|
+
label: 'ignored-surface-input',
|
|
8
|
+
severity: 'warning',
|
|
9
|
+
},
|
|
10
|
+
MISSING_REFERENCE: {
|
|
11
|
+
label: 'missing-reference',
|
|
12
|
+
severity: 'error',
|
|
13
|
+
},
|
|
14
|
+
MISSING_MATERIAL: {
|
|
15
|
+
label: 'missing-material',
|
|
16
|
+
severity: 'error',
|
|
17
|
+
},
|
|
18
|
+
INVALID_VALUE: {
|
|
19
|
+
label: 'invalid-value',
|
|
20
|
+
severity: 'error',
|
|
21
|
+
},
|
|
22
|
+
UNKNOWN_INPUT: {
|
|
23
|
+
label: 'unknown-input',
|
|
24
|
+
severity: 'error',
|
|
25
|
+
},
|
|
26
|
+
INVALID_OUTPUT_CONNECTION: {
|
|
27
|
+
label: 'invalid-output-connection',
|
|
28
|
+
severity: 'error',
|
|
29
|
+
},
|
|
30
|
+
TYPE_MISMATCH: {
|
|
31
|
+
label: 'type-mismatch',
|
|
32
|
+
severity: 'error',
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
class MaterialXLog {
|
|
37
|
+
|
|
38
|
+
constructor() {
|
|
39
|
+
|
|
40
|
+
this.entries = [];
|
|
41
|
+
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
get errors() {
|
|
45
|
+
|
|
46
|
+
return this.entries.filter( ( entry ) => entry.severity === 'error' );
|
|
47
|
+
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
get warnings() {
|
|
51
|
+
|
|
52
|
+
return this.entries.filter( ( entry ) => entry.severity === 'warning' );
|
|
53
|
+
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
add( code, message, nodeName ) {
|
|
57
|
+
|
|
58
|
+
const entry = {
|
|
59
|
+
code: code.label,
|
|
60
|
+
severity: code.severity,
|
|
61
|
+
message,
|
|
62
|
+
};
|
|
63
|
+
if ( nodeName !== undefined && nodeName !== null ) {
|
|
64
|
+
|
|
65
|
+
entry.nodeName = nodeName;
|
|
66
|
+
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
this.entries.push( entry );
|
|
70
|
+
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export { MaterialXLogCodes, MaterialXLog };
|