Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 0 additions & 21 deletions examples-testing/changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1442,27 +1442,6 @@ index 4f782d45f..0759cfcad 100644
const d = document.createElement('div');

d.innerHTML = '<h3>' + name + '</h3>';
diff --git a/examples-testing/examples/physics_ammo_instancing.ts b/examples-testing/examples/physics_ammo_instancing.ts
index 5cbee3260..400763ef9 100644
--- a/examples-testing/examples/physics_ammo_instancing.ts
+++ b/examples-testing/examples/physics_ammo_instancing.ts
@@ -1,12 +1,12 @@
import * as THREE from 'three';
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
-import { AmmoPhysics } from 'three/addons/physics/AmmoPhysics.js';
+import { AmmoPhysics, AmmoPhysicsObject } from 'three/addons/physics/AmmoPhysics.js';
import Stats from 'three/addons/libs/stats.module.js';

-let camera, scene, renderer, stats;
-let physics, position;
+let camera: THREE.PerspectiveCamera, scene: THREE.Scene, renderer: THREE.WebGLRenderer, stats: Stats;
+let physics: AmmoPhysicsObject, position: THREE.Vector3;

-let boxes, spheres;
+let boxes: THREE.InstancedMesh, spheres: THREE.InstancedMesh;

init();

diff --git a/examples-testing/examples/physics_jolt_instancing.ts b/examples-testing/examples/physics_jolt_instancing.ts
index 70980b8d5..e102f5577 100644
--- a/examples-testing/examples/physics_jolt_instancing.ts
Expand Down
7 changes: 1 addition & 6 deletions examples-testing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const exceptionList = [
'webgl_texture2darray',
'webgl_worker_offscreencanvas',
'webgpu_compute_particles_fluid',
'webgpu_compute_nanite-style',
'webgpu_compute_rasterizer',
'webgpu_compute_reduce',
'webgpu_compute_water',
'webgpu_instance_sprites',
Expand Down Expand Up @@ -79,11 +79,6 @@ const exceptionList = [
'webxr_xr_haptics',
'webxr_xr_marchingcubes',
'webxr_xr_paint',
'physics_ammo_break',
'physics_ammo_cloth',
'physics_ammo_rope',
'physics_ammo_terrain',
'physics_ammo_volume',
];

const re = /<script type="module">((.|\r|\n)+)<\/script>/;
Expand Down
44 changes: 16 additions & 28 deletions jsdoc-testing/changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7862,7 +7862,7 @@ index dfe9816f7..aa354534b 100644
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SpriteMaterial extends SpriteMaterialProperties {}
diff --git a/jsdoc-testing/jsdoc/src/materials/nodes/Line2NodeMaterial.d.ts b/jsdoc-testing/jsdoc/src/materials/nodes/Line2NodeMaterial.d.ts
index bcb397652..2447ed6e0 100644
index 861ba6447..f5ef59294 100644
--- a/jsdoc-testing/jsdoc/src/materials/nodes/Line2NodeMaterial.d.ts
+++ b/jsdoc-testing/jsdoc/src/materials/nodes/Line2NodeMaterial.d.ts
@@ -1,25 +1,9 @@
Expand Down Expand Up @@ -7943,15 +7943,16 @@ index bcb397652..2447ed6e0 100644
set worldUnits(value: boolean);
/**
* Whether the lines should sized in world units or not.
@@ -79,16 +60,46 @@ declare class Line2NodeMaterial extends NodeMaterial {
@@ -79,9 +60,39 @@ 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 @@ -7978,16 +7979,7 @@ index bcb397652..2447ed6e0 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 Expand Up @@ -8389,7 +8381,7 @@ index effc5951b..5ba479deb 100644
+
+export default MeshNormalNodeMaterial;
diff --git a/jsdoc-testing/jsdoc/src/materials/nodes/MeshPhongNodeMaterial.d.ts b/jsdoc-testing/jsdoc/src/materials/nodes/MeshPhongNodeMaterial.d.ts
index b55a9c942..d2d224b90 100644
index 374eb470a..d2d224b90 100644
--- a/jsdoc-testing/jsdoc/src/materials/nodes/MeshPhongNodeMaterial.d.ts
+++ b/jsdoc-testing/jsdoc/src/materials/nodes/MeshPhongNodeMaterial.d.ts
@@ -1,24 +1,12 @@
Expand Down Expand Up @@ -8472,7 +8464,7 @@ index b55a9c942..d2d224b90 100644
/**
* Overwritten since this type of material uses {@link BasicEnvironmentNode}
* to implement the default environment mapping.
@@ -50,15 +58,16 @@ declare class MeshPhongNodeMaterial extends NodeMaterial {
@@ -50,7 +58,7 @@ declare class MeshPhongNodeMaterial extends NodeMaterial {
* @param {NodeBuilder} builder - The current node builder.
* @return {?BasicEnvironmentNode<vec3>} The environment node.
*/
Expand All @@ -8481,10 +8473,9 @@ index b55a9c942..d2d224b90 100644
/**
* Setups the lighting model.
*
* @return {PhongLightingModel} The lighting model.
@@ -58,6 +66,8 @@ declare class MeshPhongNodeMaterial extends NodeMaterial {
*/
setupLightingModel(): PhongLightingModel;
- copy(source: any): NodeMaterial;
}
-import NodeMaterial from './NodeMaterial.js';
-import BasicEnvironmentNode from '../../nodes/lighting/BasicEnvironmentNode.js';
Expand Down Expand Up @@ -8962,7 +8953,7 @@ index ca33d8128..e23399cca 100644
+
+export default MeshSSSNodeMaterial;
diff --git a/jsdoc-testing/jsdoc/src/materials/nodes/MeshStandardNodeMaterial.d.ts b/jsdoc-testing/jsdoc/src/materials/nodes/MeshStandardNodeMaterial.d.ts
index 2128d9631..dd0366810 100644
index f81035d5a..dd0366810 100644
--- a/jsdoc-testing/jsdoc/src/materials/nodes/MeshStandardNodeMaterial.d.ts
+++ b/jsdoc-testing/jsdoc/src/materials/nodes/MeshStandardNodeMaterial.d.ts
@@ -1,24 +1,12 @@
Expand Down Expand Up @@ -9066,11 +9057,9 @@ index 2128d9631..dd0366810 100644
/**
* Setups the lighting model.
*
@@ -74,8 +81,9 @@ declare class MeshStandardNodeMaterial extends NodeMaterial {
* Setups the specular related node variables.
@@ -75,6 +82,8 @@ declare class MeshStandardNodeMaterial extends NodeMaterial {
*/
setupSpecular(): void;
- copy(source: any): NodeMaterial;
}
-import NodeMaterial from './NodeMaterial.js';
-import EnvironmentNode from '../../nodes/lighting/EnvironmentNode.js';
Expand Down Expand Up @@ -9135,7 +9124,7 @@ index 1ffe1bd1b..85436d1fe 100644
+
+export default MeshToonNodeMaterial;
diff --git a/jsdoc-testing/jsdoc/src/materials/nodes/NodeMaterial.d.ts b/jsdoc-testing/jsdoc/src/materials/nodes/NodeMaterial.d.ts
index 42249a0e6..d3d767f17 100644
index 9e2aa5a5f..782b5f114 100644
--- a/jsdoc-testing/jsdoc/src/materials/nodes/NodeMaterial.d.ts
+++ b/jsdoc-testing/jsdoc/src/materials/nodes/NodeMaterial.d.ts
@@ -1,37 +1,24 @@
Expand Down Expand Up @@ -9564,11 +9553,11 @@ index 42249a0e6..d3d767f17 100644
* Most classic material types have a node pendant e.g. for `MeshBasicMaterial`
* there is `MeshBasicNodeMaterial`. This utility method is intended for
@@ -497,7 +471,10 @@ declare class NodeMaterial extends Material {
* @param {NodeMaterial} source - The material to copy.
* @param {Material} source - The material to copy.
* @return {NodeMaterial} A reference to this node material.
*/
- copy(source: NodeMaterial): NodeMaterial;
+ copy(source: NodeMaterial): this;
- copy(source: Material): NodeMaterial;
+ copy(source: Material): this;
}
-import { Material } from '../Material.js';
-import NodeMaterialObserver from './manager/NodeMaterialObserver.js';
Expand Down Expand Up @@ -9746,7 +9735,7 @@ index edf904684..947f9df05 100644
+
+export default ShadowNodeMaterial;
diff --git a/jsdoc-testing/jsdoc/src/materials/nodes/SpriteNodeMaterial.d.ts b/jsdoc-testing/jsdoc/src/materials/nodes/SpriteNodeMaterial.d.ts
index 7f8da84d3..b25508365 100644
index 491e32e08..b25508365 100644
--- a/jsdoc-testing/jsdoc/src/materials/nodes/SpriteNodeMaterial.d.ts
+++ b/jsdoc-testing/jsdoc/src/materials/nodes/SpriteNodeMaterial.d.ts
@@ -1,25 +1,10 @@
Expand Down Expand Up @@ -9782,7 +9771,7 @@ index 7f8da84d3..b25508365 100644
/**
* The rotation of sprite materials is by default inferred from the `rotation`,
* property. This node property allows to overwrite the default and define
@@ -28,35 +13,58 @@ declare class SpriteNodeMaterial extends NodeMaterial {
@@ -28,34 +13,58 @@ declare class SpriteNodeMaterial extends NodeMaterial {
* If you don't want to overwrite the rotation but modify the existing
* value instead, use {@link materialRotation}.
*
Expand All @@ -9808,7 +9797,6 @@ index 7f8da84d3..b25508365 100644
- * @return {Node<vec3>} The position in view space.
- */
- setupPositionView(builder: NodeBuilder): Node<any>;
- copy(source: any): NodeMaterial;
+ scaleNode: Node | null;
set sizeAttenuation(value: boolean);
/**
Expand Down
2 changes: 1 addition & 1 deletion three.js
Submodule three.js updated 35 files
+0 −1 eslint.config.js
+1 −7 examples/files.json
+0 −1 examples/jsm/Addons.js
+0 −822 examples/jsm/libs/ammo.wasm.js
+ examples/jsm/libs/ammo.wasm.wasm
+0 −359 examples/jsm/physics/AmmoPhysics.js
+27 −23 examples/jsm/tsl/display/SSGINode.js
+0 −606 examples/physics_ammo_break.html
+0 −473 examples/physics_ammo_cloth.html
+0 −177 examples/physics_ammo_instancing.html
+0 −494 examples/physics_ammo_rope.html
+0 −452 examples/physics_ammo_terrain.html
+0 −515 examples/physics_ammo_volume.html
+ examples/screenshots/physics_ammo_break.jpg
+ examples/screenshots/physics_ammo_cloth.jpg
+ examples/screenshots/physics_ammo_instancing.jpg
+ examples/screenshots/physics_ammo_rope.jpg
+ examples/screenshots/physics_ammo_terrain.jpg
+ examples/screenshots/physics_ammo_volume.jpg
+ examples/screenshots/webgl_tsl_shadowmap.jpg
+ examples/screenshots/webgpu_compute_rasterizer.jpg
+ examples/screenshots/webgpu_modifier_curve.jpg
+ examples/screenshots/webgpu_shadowmap.jpg
+1 −6 examples/tags.json
+28 −36 examples/webgpu_compute_rasterizer.html
+0 −13 manual/en/physics.html
+0 −13 manual/zh/physics.html
+0 −26 src/materials/nodes/Line2NodeMaterial.js
+0 −9 src/materials/nodes/MeshPhongNodeMaterial.js
+0 −30 src/materials/nodes/MeshPhysicalNodeMaterial.js
+0 −13 src/materials/nodes/MeshSSSNodeMaterial.js
+0 −11 src/materials/nodes/MeshStandardNodeMaterial.js
+48 −28 src/materials/nodes/NodeMaterial.js
+0 −10 src/materials/nodes/SpriteNodeMaterial.js
+3 −0 src/renderers/webgpu/WebGPUBackend.js
1 change: 0 additions & 1 deletion types/three/examples/jsm/Addons.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ export * from "./objects/Water.js";
export { Water as Water2 } from "./objects/Water2.js";
export type { WaterOptions as Water2Options } from "./objects/Water2.js";

export * from "./physics/AmmoPhysics.js";
export * from "./physics/JoltPhysics.js";
export * from "./physics/RapierPhysics.js";

Expand Down
9 changes: 0 additions & 9 deletions types/three/examples/jsm/physics/AmmoPhysics.d.ts

This file was deleted.

7 changes: 0 additions & 7 deletions types/three/src/materials/nodes/Line2NodeMaterial.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,6 @@ 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
6 changes: 3 additions & 3 deletions types/three/src/materials/nodes/NodeMaterial.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,12 @@ declare class NodeMaterial extends Material {
*/
setDefaultValues(material: Material): void;
/**
* Copies the properties of the given node material to this instance.
* Copies the common properties of the given material to this instance.
*
* @param {NodeMaterial} source - The material to copy.
* @param {Material} source - The material to copy.
* @return {NodeMaterial} A reference to this node material.
*/
copy(source: NodeMaterial): this;
copy(source: Material): this;
}

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