Fixed misusage of material.type.

mrdoob · Jun 10, 2020 · 70ea4fd · 70ea4fd · Mugen87 · Jun 11, 2020
1 parent 7b361d7
commit 70ea4fd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/examples/js/objects/Sky.js b/examples/js/objects/Sky.js
@@ -20,6 +20,7 @@ THREE.Sky = function () {
 	var shader = THREE.Sky.SkyShader;
 
 	var material = new THREE.ShaderMaterial( {
+		name: 'SkyShader',
 		fragmentShader: shader.fragmentShader,
 		vertexShader: shader.vertexShader,
 		uniforms: THREE.UniformsUtils.clone( shader.uniforms ),

diff --git a/examples/jsm/objects/Sky.js b/examples/jsm/objects/Sky.js
@@ -28,6 +28,7 @@ var Sky = function () {
 	var shader = Sky.SkyShader;
 
 	var material = new ShaderMaterial( {
+		name: 'SkyShader',
 		fragmentShader: shader.fragmentShader,
 		vertexShader: shader.vertexShader,
 		uniforms: UniformsUtils.clone( shader.uniforms ),

diff --git a/src/extras/PMREMGenerator.js b/src/extras/PMREMGenerator.js
@@ -608,6 +608,8 @@ function _getBlurShader( maxSamples ) {
 	const poleAxis = new Vector3( 0, 1, 0 );
 	const shaderMaterial = new RawShaderMaterial( {
 
+		name: 'SphericalGaussianBlur',
+
 		defines: { 'n': maxSamples },
 
 		uniforms: {
@@ -674,8 +676,6 @@ void main() {
 
 	} );
 
-	shaderMaterial.type = 'SphericalGaussianBlur';
-
 	return shaderMaterial;
 
 }
@@ -685,6 +685,8 @@ function _getEquirectShader() {
 	const texelSize = new Vector2( 1, 1 );
 	const shaderMaterial = new RawShaderMaterial( {
 
+		name: 'EquirectangularToCubeUV',
+
 		uniforms: {
 			'envMap': { value: null },
 			'texelSize': { value: texelSize },
@@ -731,8 +733,6 @@ void main() {
 
 	} );
 
-	shaderMaterial.type = 'EquirectangularToCubeUV';
-
 	return shaderMaterial;
 
 }
@@ -741,6 +741,8 @@ function _getCubemapShader() {
 
 	const shaderMaterial = new RawShaderMaterial( {
 
+		name: 'CubemapToCubeUV',
+
 		uniforms: {
 			'envMap': { value: null },
 			'inputEncoding': { value: ENCODINGS[ LinearEncoding ] },
@@ -770,8 +772,6 @@ void main() {
 
 	} );
 
-	shaderMaterial.type = 'CubemapToCubeUV';
-
 	return shaderMaterial;
 
 }

diff --git a/src/renderers/WebGLCubeRenderTarget.js b/src/renderers/WebGLCubeRenderTarget.js
@@ -89,7 +89,7 @@ WebGLCubeRenderTarget.prototype.fromEquirectangularTexture = function ( renderer
 
 	const material = new ShaderMaterial( {
 
-		type: 'CubemapFromEquirect',
+		name: 'CubemapFromEquirect',
 
 		uniforms: cloneUniforms( shader.uniforms ),
 		vertexShader: shader.vertexShader,

diff --git a/src/renderers/webgl/WebGLBackground.js b/src/renderers/webgl/WebGLBackground.js
@@ -63,7 +63,7 @@ function WebGLBackground( renderer, state, objects, premultipliedAlpha ) {
 				boxMesh = new Mesh(
 					new BoxBufferGeometry( 1, 1, 1 ),
 					new ShaderMaterial( {
-						type: 'BackgroundCubeMaterial',
+						name: 'BackgroundCubeMaterial',
 						uniforms: cloneUniforms( ShaderLib.cube.uniforms ),
 						vertexShader: ShaderLib.cube.vertexShader,
 						fragmentShader: ShaderLib.cube.fragmentShader,
@@ -125,7 +125,7 @@ function WebGLBackground( renderer, state, objects, premultipliedAlpha ) {
 				planeMesh = new Mesh(
 					new PlaneBufferGeometry( 2, 2 ),
 					new ShaderMaterial( {
-						type: 'BackgroundMaterial',
+						name: 'BackgroundMaterial',
 						uniforms: cloneUniforms( ShaderLib.background.uniforms ),
 						vertexShader: ShaderLib.background.vertexShader,
 						fragmentShader: ShaderLib.background.fragmentShader,