Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cocos2d/cocos2d-objc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0d222f97e84af6041b50485485cff6e48ae82500
Choose a base ref
..
head repository: cocos2d/cocos2d-objc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 540e3dbd5e347680a684e1709dd30f7e51cd3349
Choose a head ref
Showing with 0 additions and 2 deletions.
  1. +0 −2 cocos2d/CCTransition.m
2 changes: 0 additions & 2 deletions cocos2d/CCTransition.m
View file
Original file line number Diff line number Diff line change
@@ -202,14 +202,12 @@ - (void)startTransition:(CCScene *)scene
_outgoingTexture = [CCRenderTexture renderTextureWithWidth:size.width height:size.height pixelFormat:_transitionPixelFormat depthStencilFormat:_transitionDepthStencilFormat];
_outgoingTexture.position = CGPointMake(size.width * 0.5f + rect.origin.x, size.height * 0.5f + rect.origin.y);
_outgoingTexture.contentScale /= _outgoingDownScale;
_outgoingTexture.projection = [CCDirector sharedDirector].projectionMatrix;
[self addChild:_outgoingTexture z:_outgoingOverIncoming];

// create texture for incoming scene
_incomingTexture = [CCRenderTexture renderTextureWithWidth:size.width height:size.height pixelFormat:_transitionPixelFormat depthStencilFormat:_transitionDepthStencilFormat];
_incomingTexture.position = CGPointMake(size.width * 0.5f + rect.origin.x, size.height * 0.5f + rect.origin.y);
_incomingTexture.contentScale /= _incomingDownScale;
_incomingTexture.projection = [CCDirector sharedDirector].projectionMatrix;
[self addChild:_incomingTexture];

// make sure scene is rendered at least once at progress 0.0