Ver Fonte

Refactored KERNEL_SIZE define out of convolution shader lib.

This is ugly, but allows to use different kernel sizes, making it useful not just for Gaussian blur (which is slow with large kernel).
alteredq há 14 anos atrás
pai
commit
bc88bdb67b
3 ficheiros alterados com 4 adições e 4 exclusões
  1. 0 0
      build/ThreeExtras.js
  2. 2 2
      examples/postprocessing.html
  3. 2 2
      src/extras/ShaderUtils.js

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
build/ThreeExtras.js


+ 2 - 2
examples/postprocessing.html

@@ -187,8 +187,8 @@
                 materialConvolution = new THREE.MeshShaderMaterial( {
 
                     uniforms: convolution_uniforms,
-                    vertex_shader: convolution_shader.vertex_shader,
-                    fragment_shader: convolution_shader.fragment_shader
+                    vertex_shader:   "#define KERNEL_SIZE 25.0\n" + convolution_shader.vertex_shader,
+                    fragment_shader: "#define KERNEL_SIZE 25\n"   + convolution_shader.fragment_shader
 
                 } );
 

+ 2 - 2
src/extras/ShaderUtils.js

@@ -341,7 +341,7 @@ var ShaderUtils = {
 		"varying vec2 vUv;",
 		
 		"uniform vec2 uImageIncrement;",
-		"#define KERNEL_SIZE 25.0",
+		//"#define KERNEL_SIZE 25.0",
 		
 		"void main(void) {",
 		
@@ -359,7 +359,7 @@ var ShaderUtils = {
 		"uniform sampler2D tDiffuse;",
 		"uniform vec2 uImageIncrement;",
 		
-		"#define KERNEL_SIZE 25",
+		//"#define KERNEL_SIZE 25",
 		"uniform float cKernel[KERNEL_SIZE];",
 		
 		"void main(void) {",

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff