Explorar o código

Merge pull request #11139 from donmccurdy/feat-gltf-uv2-shaders

[glTF] Patch uv2 naming for shaders.
Mr.doob %!s(int64=8) %!d(string=hai) anos
pai
achega
ae6007a58c
Modificáronse 2 ficheiros con 10 adicións e 0 borrados
  1. 5 0
      examples/js/loaders/GLTF2Loader.js
  2. 5 0
      examples/js/loaders/GLTFLoader.js

+ 5 - 0
examples/js/loaders/GLTF2Loader.js

@@ -735,6 +735,11 @@ THREE.GLTF2Loader = ( function () {
 					shaderText = shaderText.replace( regEx, 'uv' );
 					shaderText = shaderText.replace( regEx, 'uv' );
 					break;
 					break;
 
 
+				case 'TEXCOORD_1':
+
+					shaderText = shaderText.replace( regEx, 'uv2' );
+					break;
+
 				case 'COLOR_0':
 				case 'COLOR_0':
 				case 'COLOR0':
 				case 'COLOR0':
 				case 'COLOR':
 				case 'COLOR':

+ 5 - 0
examples/js/loaders/GLTFLoader.js

@@ -745,6 +745,11 @@ THREE.GLTFLoader = ( function () {
 					shaderText = shaderText.replace( regEx, 'uv' );
 					shaderText = shaderText.replace( regEx, 'uv' );
 					break;
 					break;
 
 
+				case 'TEXCOORD_1':
+
+					shaderText = shaderText.replace( regEx, 'uv2' );
+					break;
+
 				case 'COLOR_0':
 				case 'COLOR_0':
 				case 'COLOR0':
 				case 'COLOR0':
 				case 'COLOR':
 				case 'COLOR':