Skip to content

Line2NodeMaterial: Fix clone() losing worldUnits, dashed, and linewidth #2095

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
Methuselah96 merged 7 commits into from
Mar 26, 2026
Merged

Line2NodeMaterial: Fix clone() losing worldUnits, dashed, and linewidth #2095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
978fc28
Update three.js
Methuselah96 Mar 26, 2026
6d5f5f1
Add jsdoc
Methuselah96 Mar 26, 2026
2ffdb39
Update patch and delete jsdoc
Methuselah96 Mar 26, 2026
11da89b
Update declarations
Methuselah96 Mar 26, 2026
558f5b1
Add jsdoc
Methuselah96 Mar 26, 2026
fe95a3d
Update patch and delete jsdoc
Methuselah96 Mar 26, 2026
db68f40
Update declarations
Methuselah96 Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions jsdoc-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7927,7 +7927,7 @@ index e44d5d72d..f676390c3 100644
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SpriteMaterial extends SpriteMaterialProperties {}
diff --git a/jsdoc-testing/jsdoc/materials/nodes/Line2NodeMaterial.d.ts b/jsdoc-testing/jsdoc/materials/nodes/Line2NodeMaterial.d.ts
index 1637e7e49..8ba16fe20 100644
index 82f46fddc..ff70c04d5 100644
--- a/jsdoc-testing/jsdoc/materials/nodes/Line2NodeMaterial.d.ts
+++ b/jsdoc-testing/jsdoc/materials/nodes/Line2NodeMaterial.d.ts
@@ -1,76 +1,50 @@
Expand Down Expand Up @@ -8018,16 +8018,15 @@ index 1637e7e49..8ba16fe20 100644
* @default false
*/
get worldUnits(): boolean;
@@ -78,9 +52,35 @@ declare class Line2NodeMaterial extends NodeMaterial {
@@ -78,16 +52,42 @@ declare class Line2NodeMaterial extends NodeMaterial {
/**
* Whether the lines should be dashed or not.
*
- * @type {boolean}
* @default false
*/
get dashed(): boolean;
}
-import NodeMaterial from './NodeMaterial.js';
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface Line2NodeMaterialParameters extends Partial<MapColorPropertiesToColorRepresentations<Line2NodeMaterialNodeProperties>>, LineDashedMaterialParameters {}
Expand All @@ -8050,7 +8049,16 @@ index 1637e7e49..8ba16fe20 100644
+ */
+ readonly isLine2NodeMaterial: boolean;
+ setValues(values?: Line2NodeMaterialParameters): void;
+}
/**
* Copies the properties of the given material to this instance.
*
* @param {Line2NodeMaterial} source - The material to copy.
* @return {Line2NodeMaterial} A reference to this material.
*/
- copy(source: Line2NodeMaterial): Line2NodeMaterial;
+ copy(source: Line2NodeMaterial): this;
}
-import NodeMaterial from './NodeMaterial.js';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Line2NodeMaterial extends Line2NodeMaterialNodeProperties, LineDashedMaterialProperties {}
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 16 files
+110 −124 build/three.cjs
+0 −1 build/three.core.js
+1 −1 build/three.core.min.js
+110 −123 build/three.module.js
+1 −1 build/three.module.min.js
+7 −1 build/three.tsl.js
+1 −1 build/three.tsl.min.js
+498 −342 build/three.webgpu.js
+1 −1 build/three.webgpu.min.js
+498 −342 build/three.webgpu.nodes.js
+1 −1 build/three.webgpu.nodes.min.js
+17 −1 examples/jsm/inspector/ui/Tab.js
+2 −1 src/loaders/DataTextureLoader.js
+3 −3 src/loaders/ObjectLoader.js
+27 −0 src/materials/nodes/Line2NodeMaterial.js
+1 −0 src/renderers/WebGLRenderer.js
7 changes: 7 additions & 0 deletions types/three/src/materials/nodes/Line2NodeMaterial.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ declare class Line2NodeMaterial extends NodeMaterial {
*/
readonly isLine2NodeMaterial: boolean;
setValues(values?: Line2NodeMaterialParameters): void;
/**
* Copies the properties of the given material to this instance.
*
* @param {Line2NodeMaterial} source - The material to copy.
* @return {Line2NodeMaterial} A reference to this material.
*/
copy(source: Line2NodeMaterial): this;
}

// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down
Loading