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 @@ -1719,7 +1719,7 @@ -(CCRenderState *)renderState
1719
1719
_shaderUniforms = nil ;
1720
1720
} else {
1721
1721
// Since the node has unique uniforms, it cannot be batched or use the fast path.
1722
- _renderState = [[ CCRenderState alloc ] initWithBlendMode : _blendMode shader: _shader shaderUniforms: _shaderUniforms copyUniforms: NO ];
1722
+ _renderState = [CCRenderState renderStateWithBlendMode : _blendMode shader: _shader shaderUniforms: _shaderUniforms copyUniforms: NO ];
1723
1723
}
1724
1724
}
1725
1725
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ -(CCRenderState *)renderState
63
63
BOOL copyUniforms = self.hasDefaultShaderUniforms ;
64
64
65
65
// Create an uncached renderstate so the texture can be released before the renderstate cache is flushed.
66
- _renderState = [[ CCRenderState alloc ] initWithBlendMode : _blendMode shader: _shader shaderUniforms: self .shaderUniforms copyUniforms: copyUniforms];
66
+ _renderState = [CCRenderState renderStateWithBlendMode : _blendMode shader: _shader shaderUniforms: self .shaderUniforms copyUniforms: copyUniforms];
67
67
}
68
68
69
69
return _renderState;
Original file line number Diff line number Diff line change @@ -173,12 +173,13 @@ extern const NSString *CCBlendEquationAlpha;
173
173
// / Create a cached blending mode for a given blending mode, shader and main texture.
174
174
+(instancetype )renderStateWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader mainTexture : (CCTexture *)mainTexture ;
175
175
176
- // / Create an uncached blending mode for a given blending mode, shader and set of uncopied uniform values.
177
- -(instancetype )initWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms __deprecated;
178
-
179
176
// / Create an uncached blending mode for a given blending mode, shader and set of uniform values.
180
177
// / Allowing the uniform dictionary to be copied allows the render state to be immutable and used more optimally.
181
- -(instancetype )initWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms copyUniforms : (BOOL )copyUniforms ;
178
+ +(instancetype )renderStateWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms copyUniforms : (BOOL )copyUniforms ;
179
+
180
+ // / Initialize an uncached blending mode for a given blending mode, shader and set of uncopied uniform values.
181
+ // / Use [CCRenderState renderStateWithBlendMode:blendMode shader:shader shaderUniforms:shaderUniforms copyUniforms:NO] instead.
182
+ -(instancetype )initWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms __deprecated;
182
183
183
184
@end
184
185
Original file line number Diff line number Diff line change @@ -302,6 +302,11 @@ +(instancetype)renderStateWithBlendMode:(CCBlendMode *)blendMode shader:(CCShade
302
302
return [CCRENDERSTATE_CACHE objectForKey: renderState];
303
303
}
304
304
305
+ +(instancetype )renderStateWithBlendMode : (CCBlendMode *)blendMode shader : (CCShader *)shader shaderUniforms : (NSDictionary *)shaderUniforms copyUniforms : (BOOL )copyUniforms
306
+ {
307
+ return [[self alloc ] initWithBlendMode: blendMode shader: shader shaderUniforms: shaderUniforms copyUniforms: copyUniforms];
308
+ }
309
+
305
310
-(id )copyWithZone : (NSZone *)zone
306
311
{
307
312
if (_immutable){
You can’t perform that action at this time.
0 commit comments