Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3

Former-commit-id: ce9c249

Author: jjxtra

AUTHORS

@@ -24,6 +24,9 @@ People and companies, who have contributed, in alphabetical order.
 * Apportable (http://www.apportable.com)
     Making it all happen
 
+* Christian Enevoldsen
+    Improved scroll view class
+
 * Dominik Hadl
     Templates, scripts and other ninja stuff
 
@@ -43,15 +46,18 @@ People and companies, who have contributed, in alphabetical order.
     CCPhysics
     Being the unstopable force
     An incredible number of contributions and suggestions
+    3.1 render core
 
 * Viktor Lidholt
     All UI classes
     Coordination and planning
     Sprite Builder integration
     Countless other contributions
 
-Thanks to Wangsheng, Shintaro Kaneko, frranck and Yannick Loriot, for various minor contributions.
-Also thanks to those who contributed on git, and took part in the discussions (Ben-G mentioned, but no-one forgotten) even if their suggestions didn't make it to release.
+Thanks to Wangsheng, Shintaro Kaneko, frranck and Yannick Loriot, Magician, masanorythm, Jogn Vu for various minor contributions.
+Also thanks to all those who contributed on git, helped us testing, and took part in the discussions even if their suggestions didn't make it to release.
+
+Special thanks to Ben-G from makegameswith.us, for making several outstanding V3 tutorials
 
 cocos2d for iPhone 2.1 authors
 ------------------------------

CHANGELOG.REMOVED.git-id

@@ -1 +1 @@
-ca561deefc0ea7927449584e141b54564d3f4571
+6e1cd46977a7946e62267dbe763d39393441b18a

RELEASE TODO.txt

@@ -0,0 +1,31 @@
+To release a new version, please check the following steps.
+
+1)
+Update the file VERSION with latest version number.
+Add no CR/LF or any other formatting to the file.
+
+2)
+Update install.sh
+Edit the line 
+COCOS2D_VER="Cocos2D-v3.x.x”
+with the correct version number
+
+3)
+Update cocos2d.m, with the correct version number
+
+4)
+Add any new authors to the AUTHORS file
+
+5)
+Add major changes and additions to the file RELEASE_NOTES
+
+6)
+Tag the release, with the according version number
+
+7)
+Currently two set of files are made available to the users, upon release
+a) A DMG, automating the install process
+b) a ZIP, allowing for manual install
+
+Note:
+The file change log should be updated when git is merged.

RELEASE_NOTES

@@ -1,4 +1,15 @@
-===== cocos2d for iPhone 2.1.0 Release Notes =====
+===== cocos2d for iPhone 3.0.0 Release Notes =====
 
-Please, see the online document:
-https://github.com/cocos2d/cocos2d-iphone/wiki/cocos2d-v2.1-release-notes
+FIX Invalid time intervals for scheduled timers
+FIX Updated installer
+NEW Full support for 64 bit
+FIX Retina control
+FIX Adjustments to layouts
+FIX Changes to Z behaviour
+FIX Font sizing fixes
+NEW Sine actions
+FIX Portraid / landscape fixes
+NEW Improved scroll view
+NEW Betetr versioning
+NEW Better and more in depth tests
+NEW A lot of preparations for 3.1

cocos2d-ui-tests/tests/CCRendererTest.m

@@ -4,6 +4,56 @@
 @interface CCRendererTest : TestBase @end
 @implementation CCRendererTest
 
+-(void)renderTextureHelper:(CCNode *)stage size:(CGSize)size
+{
+	CCColor *color = [CCColor colorWithRed:0.0 green:0.0 blue:0.5 alpha:0.5];
+	CCNode *node = [CCNodeColor nodeWithColor:color width:128 height:128];
+	[stage addChild:node];
+	
+	CCNodeColor *colorNode = [CCNodeColor nodeWithColor:[CCColor greenColor] width:32 height:32];
+	colorNode.anchorPoint = ccp(0.5, 0.5);
+	colorNode.position = ccp(size.width, 0);
+	[colorNode runAction:[CCActionRepeatForever actionWithAction:[CCActionSequence actions:
+		[CCActionMoveTo actionWithDuration:1.0 position:ccp(0, size.height)],
+		[CCActionMoveTo actionWithDuration:1.0 position:ccp(size.width, 0)],
+		nil
+	]]];
+	[node addChild:colorNode];
+	
+	CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Sprites/bird.png"];
+	sprite.opacity = 0.5;
+	[sprite runAction:[CCActionRepeatForever actionWithAction:[CCActionSequence actions:
+		[CCActionMoveTo actionWithDuration:1.0 position:ccp(size.width, size.height)],
+		[CCActionMoveTo actionWithDuration:1.0 position:ccp(0, 0)],
+		nil
+	]]];
+	[node addChild:sprite];
+}
+
+-(void)setupRenderTextureTest
+{
+	self.subTitle = @"Testing CCRenderTexture.";
+	
+	CGSize size = CGSizeMake(128, 128);
+	
+	CCNode *stage = [CCNode node];
+	stage.contentSize = size;
+	stage.anchorPoint = ccp(0.5, 0.5);
+	stage.positionType = CCPositionTypeNormalized;
+	stage.position = ccp(0.25, 0.5);
+	[self.contentNode addChild:stage];
+	
+	[self renderTextureHelper:stage size:size];
+	
+	CCRenderTexture *renderTexture = [CCRenderTexture renderTextureWithWidth:size.width height:size.height pixelFormat:CCTexturePixelFormat_RGBA8888];
+	renderTexture.positionType = CCPositionTypeNormalized;
+	renderTexture.position = ccp(0.75, 0.5);
+	[self.contentNode addChild:renderTexture];
+	
+	[self renderTextureHelper:renderTexture size:size];
+	renderTexture.autoDraw = YES;
+}
+
 - (void)setupMotionStreakNodeTest
 {
 	self.subTitle = @"Testing CCMotionStreak";

cocos2d/CCDirector.m

@@ -444,6 +444,29 @@ -(CGSize)viewSizeInPixels
 	return _winSizeInPixels;
 }
 
+-(CGRect)viewportRect
+{
+	// TODO It's _possible_ that a user will use a non-axis aligned projection. Weird, but possible.
+	kmMat4 projection;
+	kmGLGetMatrix(KM_GL_PROJECTION, &projection);
+	
+	kmMat4 projectionInv;
+	kmMat4Inverse(&projectionInv, &projection);
+	
+	// Calculate z=0 using -> transform*[0, 0, 0, 1]/w
+	kmScalar zClip = projection.mat[14]/projection.mat[15];
+	
+	// Bottom left and top right coordinates of viewport in clip coords.
+	kmVec3 clipBL = {-1.0, -1.0, zClip};
+	kmVec3 clipTR = { 1.0,  1.0, zClip};
+	
+	kmVec3 glBL, glTR;
+	kmVec3TransformCoord(&glBL, &clipBL, &projectionInv);
+	kmVec3TransformCoord(&glTR, &clipTR, &projectionInv);
+	
+	return CGRectMake(glBL.x, glBL.y, glTR.x - glBL.x, glTR.y - glBL.y);
+}
+
 -(CGSize)designSize
 {
 	// Return the viewSize unless designSize has been set.

cocos2d/CCDirector_Private.h

@@ -46,6 +46,9 @@
  */
 @property (nonatomic,readwrite,strong) CCActionManager *actionManager;
 
+/// Rect of the visible screen area in GL coordinates.
+@property(nonatomic, readonly) CGRect viewportRect;
+
 /* Sets the glViewport*/
 -(void) setViewport;
 

cocos2d/CCTransition.m

@@ -112,7 +112,7 @@ - (id)initWithDuration:(NSTimeInterval)duration
     _outgoingOverIncoming = NO;
 
     // find out where the outgoing scene will end (if it is a transition with movement)
-    CGSize size = [CCDirector sharedDirector].designSize;
+    CGSize size = [CCDirector sharedDirector].viewportRect.size;
     switch (direction) {
         case CCTransitionDirectionDown: _outgoingDestination = CGPointMake(0, -size.height); break;
         case CCTransitionDirectionLeft: _outgoingDestination = CGPointMake(-size.width, 0); break;
@@ -188,21 +188,25 @@ - (void)startTransition:(CCScene *)scene
 
     // create render textures
     // get viewport size
-    CGSize size = [CCDirector sharedDirector].designSize;
+    CGRect rect = [CCDirector sharedDirector].viewportRect;
+		
+		// Make sure we aren't rounding down.
+		rect.size.width = ceil(rect.size.width);
+		rect.size.height = ceil(rect.size.height);
 
     // create texture for outgoing scene
-    _outgoingTexture = [CCRenderTexture renderTextureWithWidth:size.width / _outgoingDownScale
-                                                        height:size.height / _outgoingDownScale
+    _outgoingTexture = [CCRenderTexture renderTextureWithWidth:rect.size.width / _outgoingDownScale
+                                                        height:rect.size.height / _outgoingDownScale
                                                    pixelFormat:_transitionPixelFormat];
-    _outgoingTexture.position = CGPointMake(size.width * 0.5f, size.height * 0.5f);
+    _outgoingTexture.position = CGPointMake(rect.size.width * 0.5f + rect.origin.x, rect.size.height * 0.5f + rect.origin.y);
     _outgoingTexture.scale = _outgoingDownScale;
     [self addChild:_outgoingTexture z:_outgoingOverIncoming];
 
     // create texture for incoming scene
-    _incomingTexture = [CCRenderTexture renderTextureWithWidth:size.width / _incomingDownScale
-                                                        height:size.height / _incomingDownScale
+    _incomingTexture = [CCRenderTexture renderTextureWithWidth:rect.size.width / _incomingDownScale
+                                                        height:rect.size.height / _incomingDownScale
                                                    pixelFormat:_transitionPixelFormat];
-    _incomingTexture.position = CGPointMake(size.width * 0.5f, size.height * 0.5f);
+    _incomingTexture.position = CGPointMake(rect.size.width * 0.5f + rect.origin.x, rect.size.height * 0.5f + rect.origin.y);
     _incomingTexture.scale = _incomingDownScale;
     [self addChild:_incomingTexture];
 

cocos2d/cocos2d.m

@@ -27,7 +27,7 @@
 
 #import <Foundation/Foundation.h>
 #import "cocos2d.h"
-const char *cocos2d_version = "cocos2d-iphone version 3.0.alpha";
+const char *cocos2d_version = "Cocos2D-iPhone version 3.0.0";
 
 NSString *cocos2dVersion()
 {

install.sh

@@ -13,7 +13,7 @@
 # Variables setup
 # ----------------------------------------------------
 SCRIPT_VER="v0.9.5"
-COCOS2D_VER="Cocos2D-v3.0.0.RC.2"
+COCOS2D_VER="Cocos2D-v3.0.0"
 COCOS2D_DST_DIR="cocos2d v3.x"
 SCRIPT_DIR="$(dirname $0)"