枚举冲突

roselind · Sep 6, 2016 · 1d3cb8d · 1d3cb8d
1 parent 9929c65
commit 1d3cb8d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/BigShow1949/Classes/03 - ViewLayout(视图布局)/RGCardViewLayout/.DS_Store b/BigShow1949/Classes/03 - ViewLayout(视图布局)/RGCardViewLayout/.DS_Store
diff --git a/...ses/09 - Animations(动画)/01 - 弹出菜单/01 - ContextMenu/YFContextMenu/YFContextMenuTableView.m b/...ses/09 - Animations(动画)/01 - 弹出菜单/01 - ContextMenu/YFContextMenu/YFContextMenuTableView.m
@@ -48,7 +48,7 @@ @implementation YFContextMenuTableView
 - (instancetype)initWithTableViewDelegateDataSource:(id<UITableViewDelegate, UITableViewDataSource>)delegateDataSource {
     self = [self init];
     if (self) {
-        self.delegate = delegateDataSource;
+//        self.delegate = delegateDataSource;
         self.dataSource = delegateDataSource;
     }
     return self;

diff --git a/BigShow1949/Classes/09 - Animations(动画)/03 - 水纹/05 - 水波浪/RippleModel/RippleView.m b/BigShow1949/Classes/09 - Animations(动画)/03 - 水纹/05 - 水波浪/RippleModel/RippleView.m
@@ -20,7 +20,7 @@
     UNIFORM_RGB,
     NUM_UNIFORMS
 };
-GLint uniforms[NUM_UNIFORMS];
+GLint uniforms_ripple[NUM_UNIFORMS];
 
 enum
 {
@@ -73,7 +73,7 @@ - (void)setupGL
     [EAGLContext setCurrentContext:self.context];
     [self loadShaders];
     glUseProgram(_program);
-    glUniform1i(uniforms[UNIFORM_RGB], 0);
+    glUniform1i(uniforms_ripple[UNIFORM_RGB], 0);
 }
 
 - (void)setupBuffers
@@ -270,7 +270,7 @@ - (BOOL)loadShaders
         }
         return NO;
     }
-    uniforms[UNIFORM_RGB] = glGetUniformLocation(_program, "SamplerRGB");
+    uniforms_ripple[UNIFORM_RGB] = glGetUniformLocation(_program, "SamplerRGB");
     if (vertShader) {
         glDetachShader(_program, vertShader);
         glDeleteShader(vertShader);