소스 검색

PR feedback

Felix Herbst 2 년 전
부모
커밋
c31806c135
2개의 변경된 파일2개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 6
      examples/jsm/utils/TextureUtils.js
  2. 1 1
      examples/misc_exporter_gltf.html

+ 1 - 6
examples/jsm/utils/TextureUtils.js

@@ -30,16 +30,11 @@ export function decompress( texture, maxTextureSize, renderer = null ) {
             uniform sampler2D blitTexture; 
             uniform sampler2D blitTexture; 
             varying vec2 vUv;
             varying vec2 vUv;
 
 
-            // took from threejs 05fc79cd52b79e8c3e8dec1e7dca72c5c39983a4
-            vec4 conv_LinearTosRGB( in vec4 value ) {
-                return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.a );
-            }
-
             void main(){ 
             void main(){ 
                 gl_FragColor = vec4(vUv.xy, 0, 1);
                 gl_FragColor = vec4(vUv.xy, 0, 1);
                 
                 
                 #ifdef IS_SRGB
                 #ifdef IS_SRGB
-                gl_FragColor = conv_LinearTosRGB( texture2D( blitTexture, vUv) );
+                gl_FragColor = LinearTosRGB( texture2D( blitTexture, vUv) );
                 #else
                 #else
                 gl_FragColor = texture2D( blitTexture, vUv);
                 gl_FragColor = texture2D( blitTexture, vUv);
                 #endif
                 #endif

+ 1 - 1
examples/misc_exporter_gltf.html

@@ -500,7 +500,7 @@
 				h.add( params, 'exportModel' ).name( 'Export Model' );
 				h.add( params, 'exportModel' ).name( 'Export Model' );
 				h.add( params, 'exportObjects' ).name( 'Export Sphere With Grid' );
 				h.add( params, 'exportObjects' ).name( 'Export Sphere With Grid' );
 				h.add( params, 'exportSceneObject' ).name( 'Export Scene 1 and Object' );
 				h.add( params, 'exportSceneObject' ).name( 'Export Scene 1 and Object' );
-				h.add( params, 'exportCompressedObject' ).name( 'Export Coffeemat (compressed)' );
+				h.add( params, 'exportCompressedObject' ).name( 'Export Coffeemat (from compressed data)' );
 
 
 				gui.open();
 				gui.open();