blur

kylin1011lu · Feb 15, 2017 · c819ef7 · c819ef7
1 parent e4dc31f
commit c819ef7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/...糊.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate b/...糊.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/OpenGLES06-图像膨胀腐蚀模糊/OpenGLES06-图像膨胀腐蚀模糊/OpenGLESView.m b/OpenGLES06-图像膨胀腐蚀模糊/OpenGLES06-图像膨胀腐蚀模糊/OpenGLESView.m
@@ -110,18 +110,16 @@ - (void)setupFrameAndRenderBuffer
 
 - (void)setupGLProgram
 {
-//    NSString *vertFile = [[NSBundle mainBundle] pathForResource:@"corrode_vert.glsl" ofType:nil];
-//    NSString *fragFile = [[NSBundle mainBundle] pathForResource:@"corrode_frag.glsl" ofType:nil];
-//    _program = createGLProgramFromFile(vertFile.UTF8String, fragFile.UTF8String);
+    //NSString *vertFile = [[NSBundle mainBundle] pathForResource:@"corrode_vert.glsl" ofType:nil];
+    //NSString *fragFile = [[NSBundle mainBundle] pathForResource:@"corrode_frag.glsl" ofType:nil];
+
+//    NSString *vertFile = [[NSBundle mainBundle] pathForResource:@"blur_vert.glsl" ofType:nil];
+//    NSString *fragFile = [[NSBundle mainBundle] pathForResource:@"blur_frag.glsl" ofType:nil];
+
+    NSString *vertFile = [[NSBundle mainBundle] pathForResource:@"expand_vert.glsl" ofType:nil];
+    NSString *fragFile = [[NSBundle mainBundle] pathForResource:@"expand_frag.glsl" ofType:nil];
 
-    NSString *vertFile = [[NSBundle mainBundle] pathForResource:@"blur_vert.glsl" ofType:nil];
-    NSString *fragFile = [[NSBundle mainBundle] pathForResource:@"blur_frag.glsl" ofType:nil];
     _program = createGLProgramFromFile(vertFile.UTF8String, fragFile.UTF8String);
-
-//    NSString *vertFile = [[NSBundle mainBundle] pathForResource:@"expand_vert.glsl" ofType:nil];
-//    NSString *fragFile = [[NSBundle mainBundle] pathForResource:@"expand_frag.glsl" ofType:nil];
-//    _program = createGLProgramFromFile(vertFile.UTF8String, fragFile.UTF8String);
-
     glUseProgram(_program);
 }
 

diff --git a/OpenGLES06-图像膨胀腐蚀模糊/OpenGLES06-图像膨胀腐蚀模糊/Shader/blur_frag.glsl b/OpenGLES06-图像膨胀腐蚀模糊/OpenGLES06-图像膨胀腐蚀模糊/Shader/blur_frag.glsl
@@ -23,5 +23,6 @@ void main()
         }
     }
 
+    //gl_FragColor = texture2D(image, vTexcoord);
     gl_FragColor = vec4(vec3(color), 1.0);
 }
diff --git a/OpenGLES06-图像膨胀腐蚀模糊/OpenGLES06-图像膨胀腐蚀模糊/Shader/expand_frag.glsl b/OpenGLES06-图像膨胀腐蚀模糊/OpenGLES06-图像膨胀腐蚀模糊/Shader/expand_frag.glsl
@@ -6,7 +6,7 @@ varying vec2 vTexcoord;
 
 void main()
 {
-    float block = 200.0;
+    float block = 300.0;
     float delta = 1.0/block;
     vec4 maxColor = vec4(-1.0);
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,5 +23,6 @@ void main() @@
             }
         }
+        //gl_FragColor = texture2D(image, vTexcoord);
         gl_FragColor = vec4(vec3(color), 1.0);
     }