File tree Expand file tree Collapse file tree 4 files changed +12
-6
lines changed Expand file tree Collapse file tree 4 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -1765,7 +1765,7 @@ -(CCRenderState *)renderState
1765
1765
_shaderUniforms = nil ;
1766
1766
} else {
1767
1767
// Since the node has unique uniforms, it cannot be batched or use the fast path.
1768
- _renderState = [[ CCRenderState alloc ] initWithBlendMode : _blendMode shader: _shader shaderUniforms: _shaderUniforms copyUniforms: NO ];
1768
+ _renderState = [CCRenderState renderStateWithBlendMode : _blendMode shader: _shader shaderUniforms: _shaderUniforms copyUniforms: NO ];
1769
1769
}
1770
1770
}
1771
1771
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ -(CCRenderState *)renderState
54
54
BOOL copyUniforms = self.hasDefaultShaderUniforms ;
55
55
56
56
// Create an uncached renderstate so the texture can be released before the renderstate cache is flushed.
57
- _renderState = [[ CCRenderState alloc ] initWithBlendMode : _blendMode shader: _shader shaderUniforms: self .shaderUniforms copyUniforms: copyUniforms];
57
+ _renderState = [CCRenderState renderStateWithBlendMode : _blendMode shader: _shader shaderUniforms: self .shaderUniforms copyUniforms: copyUniforms];
58
58
}
59
59
60
60
return _renderState;
Original file line number Diff line number Diff line change @@ -172,12 +172,13 @@ extern const NSString *CCBlendEquationAlpha;
172
172
// / Create a cached blending mode for a given blending mode, shader and main texture.
173
173
+(instancetype )renderStateWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader mainTexture : (CCTexture *)mainTexture ;
174
174
175
- // / Create an uncached blending mode for a given blending mode, shader and set of uncopied uniform values.
176
- -(instancetype )initWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms __deprecated;
177
-
178
175
// / Create an uncached blending mode for a given blending mode, shader and set of uniform values.
179
176
// / Allowing the uniform dictionary to be copied allows the render state to be immutable and used more optimally.
180
- -(instancetype )initWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms copyUniforms : (BOOL )copyUniforms ;
177
+ +(instancetype )renderStateWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms copyUniforms : (BOOL )copyUniforms ;
178
+
179
+ // / Initialize an uncached blending mode for a given blending mode, shader and set of uncopied uniform values.
180
+ // / Use [CCRenderState renderStateWithBlendMode:blendMode shader:shader shaderUniforms:shaderUniforms copyUniforms:NO] instead.
181
+ -(instancetype )initWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms __deprecated;
181
182
182
183
@end
183
184
Original file line number Diff line number Diff line change @@ -318,6 +318,11 @@ +(instancetype)renderStateWithBlendMode:(CCBlendMode *)blendMode shader:(CCShade
318
318
return [CCRENDERSTATE_CACHE objectForKey: renderState];
319
319
}
320
320
321
+ +(instancetype )renderStateWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms copyUniforms : (BOOL )copyUniforms
322
+ {
323
+ return [[self alloc ] initWithBlendMode: blendMode shader: shader shaderUniforms: shaderUniforms copyUniforms: copyUniforms];
324
+ }
325
+
321
326
-(id )copyWithZone : (NSZone *)zone
322
327
{
323
328
if (_immutable){
You can’t perform that action at this time.
0 commit comments