NodeMaterial: Remove WebGLNodeBuilder (#28167)

* Remove WebGLNodeBuilder * Update webgpu_materials_lightmap.jpg
mrdoob · Apr 20, 2024 · c5dcab6 · c5dcab6
1 parent 812cf86
commit c5dcab6
Show file tree

Hide file tree

Showing 46 changed files with 31 additions and 3,064 deletions.
diff --git a/docs/api/ar/loaders/ObjectLoader.html b/docs/api/ar/loaders/ObjectLoader.html
@@ -53,7 +53,7 @@ <h2>مثال الكود</h2>
 
 		<h2>أمثلة (Examples)</h2>
 
-		<p>[example:webgl_materials_lightmap WebGL / materials / lightmap]</p>
+		<p>[example:webgpu_materials_lightmap WebGL / materials / lightmap]</p>
 
 		<h2>المنشئ (Constructor)</h2>
 

diff --git a/docs/api/ar/materials/ShaderMaterial.html b/docs/api/ar/materials/ShaderMaterial.html
@@ -109,7 +109,6 @@ <h2>أمثلة (Examples)</h2>
 		[example:webgl_lights_hemisphere webgl / lights / hemisphere]<br />
 		[example:webgl_marchingcubes webgl / marchingcubes]<br />
 		[example:webgl_materials_envmaps webgl / materials / envmaps]<br />
-		[example:webgl_materials_lightmap webgl / materials / lightmap]<br />
 		[example:webgl_materials_wireframe webgl / materials / wireframe]<br />
 		[example:webgl_modifier_tessellation webgl / modifier / tessellation]<br />
 		[example:webgl_postprocessing_dof2 webgl / postprocessing / dof2]<br />

diff --git a/docs/api/en/loaders/ObjectLoader.html b/docs/api/en/loaders/ObjectLoader.html
@@ -53,7 +53,7 @@ <h2>Code Example</h2>
 
 		<h2>Examples</h2>
 
-		<p>[example:webgl_materials_lightmap WebGL / materials / lightmap]</p>
+		<p>[example:webgpu_materials_lightmap WebGL / materials / lightmap]</p>
 
 		<h2>Constructor</h2>
 

diff --git a/docs/api/en/materials/ShaderMaterial.html b/docs/api/en/materials/ShaderMaterial.html
@@ -115,7 +115,6 @@ <h2>Examples</h2>
 			[example:webgl_lights_hemisphere webgl / lights / hemisphere]<br />
 			[example:webgl_marchingcubes webgl / marchingcubes]<br />
 			[example:webgl_materials_envmaps webgl / materials / envmaps]<br />
-			[example:webgl_materials_lightmap webgl / materials / lightmap]<br />
 			[example:webgl_materials_wireframe webgl / materials / wireframe]<br />
 			[example:webgl_modifier_tessellation webgl / modifier / tessellation]<br />
 			[example:webgl_postprocessing_dof2 webgl / postprocessing / dof2]<br />

diff --git a/docs/api/fr/materials/ShaderMaterial.html b/docs/api/fr/materials/ShaderMaterial.html
@@ -107,7 +107,6 @@ <h2>Exemples</h2>
 			[example:webgl_lights_hemisphere webgl / lights / hemisphere]<br />
 			[example:webgl_marchingcubes webgl / marchingcubes]<br />
 			[example:webgl_materials_envmaps webgl / materials / envmaps]<br />
-			[example:webgl_materials_lightmap webgl / materials / lightmap]<br />
 			[example:webgl_materials_wireframe webgl / materials / wireframe]<br />
 			[example:webgl_modifier_tessellation webgl / modifier / tessellation]<br />
 			[example:webgl_postprocessing_dof2 webgl / postprocessing / dof2]<br />

diff --git a/docs/api/it/loaders/ObjectLoader.html b/docs/api/it/loaders/ObjectLoader.html
@@ -56,7 +56,7 @@ <h2>Codice di Esempio</h2>
 		<h2>Esempi</h2>
 
 		<p>
-			[example:webgl_materials_lightmap WebGL / materials / lightmap]
+			[example:webgpu_materials_lightmap WebGL / materials / lightmap]
 		</p>
 
 		<h2>Costruttore</h2>

diff --git a/docs/api/it/materials/ShaderMaterial.html b/docs/api/it/materials/ShaderMaterial.html
@@ -109,7 +109,6 @@ <h2>Esempi</h2>
 			[example:webgl_lights_hemisphere webgl / lights / hemisphere]<br />
 			[example:webgl_marchingcubes webgl / marchingcubes]<br />
 			[example:webgl_materials_envmaps webgl / materials / envmaps]<br />
-			[example:webgl_materials_lightmap webgl / materials / lightmap]<br />
 			[example:webgl_materials_wireframe webgl / materials / wireframe]<br />
 			[example:webgl_modifier_tessellation webgl / modifier / tessellation]<br />
 			[example:webgl_postprocessing_dof2 webgl / postprocessing / dof2]<br />

diff --git a/docs/api/zh/loaders/ObjectLoader.html b/docs/api/zh/loaders/ObjectLoader.html
@@ -54,7 +54,7 @@ <h2>代码示例</h2>
 		<h2>例子</h2>
 
 		<p>
-			[example:webgl_materials_lightmap WebGL / materials / lightmap]
+			[example:webgpu_materials_lightmap WebGL / materials / lightmap]
 		</p>
 
 		<h2>构造函数</h2>

diff --git a/docs/api/zh/materials/ShaderMaterial.html b/docs/api/zh/materials/ShaderMaterial.html
@@ -97,7 +97,6 @@ <h2>例子</h2>
 			[example:webgl_lights_hemisphere webgl / lights / hemisphere]<br />
 			[example:webgl_marchingcubes webgl / marchingcubes]<br />
 			[example:webgl_materials_envmaps webgl / materials / envmaps]<br />
-			[example:webgl_materials_lightmap webgl / materials / lightmap]<br />
 			[example:webgl_materials_wireframe webgl / materials / wireframe]<br />
 			[example:webgl_modifier_tessellation webgl / modifier / tessellation]<br />
 			[example:webgl_postprocessing_dof2 webgl / postprocessing / dof2]<br />

diff --git a/examples/files.json b/examples/files.json
@@ -153,7 +153,6 @@
 		"webgl_materials_envmaps_exr",
 		"webgl_materials_envmaps_groundprojected",
 		"webgl_materials_envmaps_hdr",
-		"webgl_materials_lightmap",
 		"webgl_materials_matcap",
 		"webgl_materials_normalmap",
 		"webgl_materials_normalmap_object_space",
@@ -225,17 +224,6 @@
 		"webgl_water",
 		"webgl_water_flowmap"
 	],
-	"webgl / nodes": [
-		"webgl_nodes_loader_gltf_iridescence",
-		"webgl_nodes_loader_gltf_transmission",
-		"webgl_nodes_loader_gltf_sheen",
-		"webgl_nodes_loader_materialx",
-		"webgl_nodes_materials_instance_uniform",
-		"webgl_nodes_materials_physical_clearcoat",
-		"webgl_nodes_materials_standard",
-		"webgl_nodes_materialx_noise",
-		"webgl_nodes_points"
-	],
 	"webgl / postprocessing": [
 		"webgl_postprocessing",
 		"webgl_postprocessing_3dlut",
@@ -354,6 +342,7 @@
 		"webgpu_loader_gltf_transmission",
 		"webgpu_loader_materialx",
 		"webgpu_materials",
+		"webgpu_materials_lightmap",
 		"webgpu_materials_sss",
 		"webgpu_materials_transmission",
 		"webgpu_materials_video",

diff --git a/examples/jsm/nodes/accessors/MaterialNode.js b/examples/jsm/nodes/accessors/MaterialNode.js
@@ -91,7 +91,7 @@ class MaterialNode extends Node {
 
 			if ( material.specularMap && material.specularMap.isTexture === true ) {
 
-				node = this.getTexture( scope ).r;
+				node = this.getTexture( 'specular' ).r;
 
 			} else {