diff --git a/Extensions/CCPageCurlNode/CCPageCurlNode.h b/Extensions/CCPageCurlNode/CCSpriteCurl.h similarity index 98% rename from Extensions/CCPageCurlNode/CCPageCurlNode.h rename to Extensions/CCPageCurlNode/CCSpriteCurl.h index 8a81f00..5111a81 100644 --- a/Extensions/CCPageCurlNode/CCPageCurlNode.h +++ b/Extensions/CCPageCurlNode/CCSpriteCurl.h @@ -37,7 +37,7 @@ typedef NS_ENUM(NSInteger, CCPageMode) // ----------------------------------------------------------------------- -@interface CCPageCurlNode : CCSpriteGrid +@interface CCSpriteCurl : CCSpriteGrid // ----------------------------------------------------------------------- diff --git a/Extensions/CCPageCurlNode/CCPageCurlNode.m b/Extensions/CCPageCurlNode/CCSpriteCurl.m similarity index 99% rename from Extensions/CCPageCurlNode/CCPageCurlNode.m rename to Extensions/CCPageCurlNode/CCSpriteCurl.m index 67542a0..c3562b3 100644 --- a/Extensions/CCPageCurlNode/CCPageCurlNode.m +++ b/Extensions/CCPageCurlNode/CCSpriteCurl.m @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#import "CCPageCurlNode.h" +#import "CCSpriteCurl.h" #import "CCCurlCylinder.h" // ----------------------------------------------------------------------- @@ -34,7 +34,7 @@ // ----------------------------------------------------------------------- -@implementation CCPageCurlNode +@implementation CCSpriteCurl { CCCurlCylinder *_curl; CGPoint _curlStart; diff --git a/Extensions/CCPageCurlNode/README.md b/Extensions/CCPageCurlNode/README.md index c261fb0..05cf2a7 100644 --- a/Extensions/CCPageCurlNode/README.md +++ b/Extensions/CCPageCurlNode/README.md @@ -1,4 +1,4 @@ -CCPageCurlNode +CCSpriteCurl ============== Type of class : Descendant of CCNode diff --git a/Extensions/CCTransitionCurl/CCTransitionCurlIn.m b/Extensions/CCTransitionCurl/CCTransitionCurlIn.m index ed0a492..3fac9cf 100644 --- a/Extensions/CCTransitionCurl/CCTransitionCurlIn.m +++ b/Extensions/CCTransitionCurl/CCTransitionCurlIn.m @@ -23,7 +23,7 @@ */ #import "CCTransitionCurlIn.h" -#import "CCPageCurlNode.h" +#import "CCSpriteCurl.h" // NOTE! // @@ -33,7 +33,7 @@ @implementation CCTransitionCurlIn { - CCPageCurlNode *_curl; + CCSpriteCurl *_curl; CGSize _curlSize; CCTransitionDirection _direction; } @@ -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]; diff --git a/Extensions/CCTransitionCurl/CCTransitionCurlOut.m b/Extensions/CCTransitionCurl/CCTransitionCurlOut.m index 6d6e495..63520cf 100644 --- a/Extensions/CCTransitionCurl/CCTransitionCurlOut.m +++ b/Extensions/CCTransitionCurl/CCTransitionCurlOut.m @@ -23,13 +23,13 @@ */ #import "CCTransitionCurlOut.h" -#import "CCPageCurlNode.h" +#import "CCSpriteCurl.h" // ----------------------------------------------------------------------- @implementation CCTransitionCurlOut { - CCPageCurlNode *_curl; + CCSpriteCurl *_curl; CGSize _curlSize; CCTransitionDirection _direction; } @@ -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]; diff --git a/Extensions/CCTransitionCurl/README.md b/Extensions/CCTransitionCurl/README.md index 5d2555d..2b219e9 100644 --- a/Extensions/CCTransitionCurl/README.md +++ b/Extensions/CCTransitionCurl/README.md @@ -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. diff --git a/cocos2d-iphone-ext.xcodeproj/project.pbxproj b/cocos2d-iphone-ext.xcodeproj/project.pbxproj index 4c173c6..3362ce5 100644 --- a/cocos2d-iphone-ext.xcodeproj/project.pbxproj +++ b/cocos2d-iphone-ext.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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 = ""; }; 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; }; @@ -388,16 +388,16 @@ path = Resources/Tests; sourceTree = ""; }; - 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 = ""; }; 0EB2EE151A6E8DFC00700971 /* CCEffectLine */ = { @@ -627,7 +627,7 @@ A66C5808193A0C24009D2BD4 /* Extensions */ = { isa = PBXGroup; children = ( - 0E8E481B1AA4963B00D95169 /* CCPageCurlNode */, + 0E8E481B1AA4963B00D95169 /* CCCurlNode */, 0E2C779F1AA48F5F00596345 /* CCTransitionCurl */, 0EFA56901A7BBCE2001C503B /* CCBusyNode */, 0EB2EE151A6E8DFC00700971 /* CCEffectLine */, @@ -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 */, diff --git a/cocos2d-iphone-ext.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate b/cocos2d-iphone-ext.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate index 91863bf..28e155a 100644 Binary files a/cocos2d-iphone-ext.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate and b/cocos2d-iphone-ext.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/cocos2d-iphone-ext/Classes/Tests/Test helper classes/bookPage.h b/cocos2d-iphone-ext/Classes/Tests/Test helper classes/bookPage.h index 0ee4976..ce388a2 100755 --- a/cocos2d-iphone-ext/Classes/Tests/Test helper classes/bookPage.h +++ b/cocos2d-iphone-ext/Classes/Tests/Test helper classes/bookPage.h @@ -9,11 +9,11 @@ #import "cocos2d.h" #import "cocos2d-ui.h" -#import "CCPageCurlNode.h" +#import "CCSpriteCurl.h" // ----------------------------------------------------------------------- -@interface bookPage : CCPageCurlNode +@interface bookPage : CCSpriteCurl // -----------------------------------------------------------------------