Skip to content

Commit

Permalink
CCPageCurlNode renamed to CCSpriteCurl
Browse files Browse the repository at this point in the history
  • Loading branch information
Birkemose committed Mar 2, 2015
1 parent 5eb5375 commit 57e14fb
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ typedef NS_ENUM(NSInteger, CCPageMode)

// -----------------------------------------------------------------------

@interface CCPageCurlNode : CCSpriteGrid
@interface CCSpriteCurl : CCSpriteGrid

// -----------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* THE SOFTWARE.
*/

#import "CCPageCurlNode.h"
#import "CCSpriteCurl.h"
#import "CCCurlCylinder.h"

// -----------------------------------------------------------------------
Expand All @@ -34,7 +34,7 @@

// -----------------------------------------------------------------------

@implementation CCPageCurlNode
@implementation CCSpriteCurl
{
CCCurlCylinder *_curl;
CGPoint _curlStart;
Expand Down
2 changes: 1 addition & 1 deletion Extensions/CCPageCurlNode/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CCPageCurlNode
CCSpriteCurl
==============

Type of class : Descendant of CCNode
Expand Down
6 changes: 3 additions & 3 deletions Extensions/CCTransitionCurl/CCTransitionCurlIn.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

#import "CCTransitionCurlIn.h"
#import "CCPageCurlNode.h"
#import "CCSpriteCurl.h"

// NOTE!
//
Expand All @@ -33,7 +33,7 @@

@implementation CCTransitionCurlIn
{
CCPageCurlNode *_curl;
CCSpriteCurl *_curl;
CGSize _curlSize;
CCTransitionDirection _direction;
}
Expand Down Expand Up @@ -67,7 +67,7 @@ - (void)startTransition:(CCScene *)scene
// If the compiler fails with "Property incomingTexture not found ..." you can solve it two ways
// 1) Download latest V3.4 version of Cocos2D and replace it
// 2) Add the line "@property (nonatomic, readonly) CCRenderTexture *incomingTexture;" (without quotes) to CCTransition.h along with the other properties
_curl = [[CCPageCurlNode alloc] initWithTexture:self.incomingTexture.texture
_curl = [[CCSpriteCurl alloc] initWithTexture:self.incomingTexture.texture
rect:(CGRect){CGPointZero, [CCDirector sharedDirector].viewSize}
rotated:NO];

Expand Down
6 changes: 3 additions & 3 deletions Extensions/CCTransitionCurl/CCTransitionCurlOut.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
*/

#import "CCTransitionCurlOut.h"
#import "CCPageCurlNode.h"
#import "CCSpriteCurl.h"

// -----------------------------------------------------------------------

@implementation CCTransitionCurlOut
{
CCPageCurlNode *_curl;
CCSpriteCurl *_curl;
CGSize _curlSize;
CCTransitionDirection _direction;
}
Expand Down Expand Up @@ -62,7 +62,7 @@ - (void)startTransition:(CCScene *)scene
// If the compiler fails with "Property outgoingTexture not found ..." you can solve it two ways
// 1) Download latest V3.4 version of Cocos2D and replace it
// 2) Add the line "@property (nonatomic, readonly) CCRenderTexture *outgoingTexture;" (without quotes) to CCTransition.h along with the other properties
_curl = [[CCPageCurlNode alloc] initWithTexture:self.outgoingTexture.texture
_curl = [[CCSpriteCurl alloc] initWithTexture:self.outgoingTexture.texture
rect:(CGRect){CGPointZero, [CCDirector sharedDirector].viewSize}
rotated:NO];

Expand Down
2 changes: 1 addition & 1 deletion Extensions/CCTransitionCurl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CCTransitionCurl
================

Type of class : Descendant of CCTransition
Uses extension : CCSpriteGrid, CCPageCurlNode
Uses extension : CCSpriteGrid, CCSpriteCurl

Transition which flips new scene in and out, as a page in a book.

Expand Down
18 changes: 9 additions & 9 deletions cocos2d-iphone-ext.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
0E8E48051AA4943C00D95169 /* CCTransitionCurlTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E48041AA4943C00D95169 /* CCTransitionCurlTest.m */; };
0E8E48191AA495EE00D95169 /* bookPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E48161AA495EE00D95169 /* bookPage.m */; };
0E8E48211AA4964D00D95169 /* CCCurlCylinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E481D1AA4964D00D95169 /* CCCurlCylinder.m */; };
0E8E48221AA4964D00D95169 /* CCPageCurlNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E481F1AA4964D00D95169 /* CCPageCurlNode.m */; };
0E8E48221AA4964D00D95169 /* CCSpriteCurl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E481F1AA4964D00D95169 /* CCSpriteCurl.m */; };
0E8E48291AA4966800D95169 /* CCTransitionCurlIn.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E48251AA4966800D95169 /* CCTransitionCurlIn.m */; };
0E8E482A1AA4966800D95169 /* CCTransitionCurlOut.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8E48271AA4966800D95169 /* CCTransitionCurlOut.m */; };
0E8E48441AA49F5800D95169 /* moon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0E8E48431AA49F5800D95169 /* moon.png */; };
Expand Down Expand Up @@ -168,8 +168,8 @@
0E8E48161AA495EE00D95169 /* bookPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bookPage.m; path = "Classes/Tests/Test helper classes/bookPage.m"; sourceTree = "<group>"; };
0E8E481C1AA4964D00D95169 /* CCCurlCylinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCCurlCylinder.h; path = Extensions/CCPageCurlNode/CCCurlCylinder.h; sourceTree = SOURCE_ROOT; };
0E8E481D1AA4964D00D95169 /* CCCurlCylinder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCCurlCylinder.m; path = Extensions/CCPageCurlNode/CCCurlCylinder.m; sourceTree = SOURCE_ROOT; };
0E8E481E1AA4964D00D95169 /* CCPageCurlNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPageCurlNode.h; path = Extensions/CCPageCurlNode/CCPageCurlNode.h; sourceTree = SOURCE_ROOT; };
0E8E481F1AA4964D00D95169 /* CCPageCurlNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCPageCurlNode.m; path = Extensions/CCPageCurlNode/CCPageCurlNode.m; sourceTree = SOURCE_ROOT; };
0E8E481E1AA4964D00D95169 /* CCSpriteCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCSpriteCurl.h; path = Extensions/CCPageCurlNode/CCSpriteCurl.h; sourceTree = SOURCE_ROOT; };
0E8E481F1AA4964D00D95169 /* CCSpriteCurl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSpriteCurl.m; path = Extensions/CCPageCurlNode/CCSpriteCurl.m; sourceTree = SOURCE_ROOT; };
0E8E48201AA4964D00D95169 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = Extensions/CCPageCurlNode/README.md; sourceTree = SOURCE_ROOT; };
0E8E48241AA4966800D95169 /* CCTransitionCurlIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTransitionCurlIn.h; path = Extensions/CCTransitionCurl/CCTransitionCurlIn.h; sourceTree = SOURCE_ROOT; };
0E8E48251AA4966800D95169 /* CCTransitionCurlIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCTransitionCurlIn.m; path = Extensions/CCTransitionCurl/CCTransitionCurlIn.m; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -388,16 +388,16 @@
path = Resources/Tests;
sourceTree = "<group>";
};
0E8E481B1AA4963B00D95169 /* CCPageCurlNode */ = {
0E8E481B1AA4963B00D95169 /* CCCurlNode */ = {
isa = PBXGroup;
children = (
0E8E48201AA4964D00D95169 /* README.md */,
0E8E481C1AA4964D00D95169 /* CCCurlCylinder.h */,
0E8E481D1AA4964D00D95169 /* CCCurlCylinder.m */,
0E8E481E1AA4964D00D95169 /* CCPageCurlNode.h */,
0E8E481F1AA4964D00D95169 /* CCPageCurlNode.m */,
0E8E481E1AA4964D00D95169 /* CCSpriteCurl.h */,
0E8E481F1AA4964D00D95169 /* CCSpriteCurl.m */,
);
name = CCPageCurlNode;
name = CCCurlNode;
sourceTree = "<group>";
};
0EB2EE151A6E8DFC00700971 /* CCEffectLine */ = {
Expand Down Expand Up @@ -627,7 +627,7 @@
A66C5808193A0C24009D2BD4 /* Extensions */ = {
isa = PBXGroup;
children = (
0E8E481B1AA4963B00D95169 /* CCPageCurlNode */,
0E8E481B1AA4963B00D95169 /* CCCurlNode */,
0E2C779F1AA48F5F00596345 /* CCTransitionCurl */,
0EFA56901A7BBCE2001C503B /* CCBusyNode */,
0EB2EE151A6E8DFC00700971 /* CCEffectLine */,
Expand Down Expand Up @@ -947,7 +947,7 @@
0E2A746719D311230054F5B6 /* clothRope.m in Sources */,
0EFA569D1A7BBE3B001C503B /* CCBusyNodeTest.m in Sources */,
A66C5836193A0C87009D2BD4 /* CCSpineSkin.m in Sources */,
0E8E48221AA4964D00D95169 /* CCPageCurlNode.m in Sources */,
0E8E48221AA4964D00D95169 /* CCSpriteCurl.m in Sources */,
0E9A092A199CDDD10049E409 /* CCLayerSmoothLineTest.m in Sources */,
0ECEB48819D29EB100BDBB9E /* clothNode.m in Sources */,
0EB2EE391A6E997400700971 /* CCEffectLineTest.m in Sources */,
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

#import "cocos2d.h"
#import "cocos2d-ui.h"
#import "CCPageCurlNode.h"
#import "CCSpriteCurl.h"

// -----------------------------------------------------------------------

@interface bookPage : CCPageCurlNode
@interface bookPage : CCSpriteCurl

// -----------------------------------------------------------------------

Expand Down

0 comments on commit 57e14fb

Please sign in to comment.