Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Transitions: Added deprecated classes to make it easier to migrate

  • Loading branch information...
commit 5e4cfa82ec784de36daf5389149e203a1403c941 1 parent 277a120
@ricardoquesada ricardoquesada authored
View
3  AUTHORS
@@ -242,6 +242,9 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
Added TintTo action
* mark at abitofthought:
author of the single threaded Fast Director
+ * Mark Sawicki:
+ Converted all transitions from: transitionName-Transition to Transition-trasitionName.
+ Converted TransitionTest to use the new naming convention
* master@hpi.cc:
updated patch for TMX per-tile properties.
Added Test for TMX per-tile properties
View
1  CHANGELOG
@@ -1,4 +1,5 @@
version 0.99.5-rc XX-Ago-2010
+ . [NEW] Transitions: new transition naming convention (issue #946)
. [FIX] Artifact fixer is a compile time option in ccConfig. Disabled by default
. [FIX] CocosDenshion: Added SDK4.0 compile check in CDAudioManager
. [FIX] Sprite: little optimization when using BatchNode + children
View
32 cocos2d-iphone.xcodeproj/project.pbxproj
@@ -181,8 +181,6 @@
5015043A113300F900A9CA65 /* CCProgressTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 50150434113300F900A9CA65 /* CCProgressTimer.m */; };
5015043B113300F900A9CA65 /* CCProgressTimerActions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50150435113300F900A9CA65 /* CCProgressTimerActions.h */; };
5015043C113300F900A9CA65 /* CCProgressTimerActions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50150436113300F900A9CA65 /* CCProgressTimerActions.m */; };
- 5015043D113300F900A9CA65 /* CCRadialTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50150437113300F900A9CA65 /* CCRadialTransition.h */; };
- 5015043E113300F900A9CA65 /* CCRadialTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50150438113300F900A9CA65 /* CCRadialTransition.m */; };
501504D111330E1700A9CA65 /* r1.png in Resources */ = {isa = PBXBuildFile; fileRef = 500165990E72DB0E0085673F /* r1.png */; };
501504D211330E1700A9CA65 /* r2.png in Resources */ = {isa = PBXBuildFile; fileRef = 5001659A0E72DB0E0085673F /* r2.png */; };
501504D311330E1700A9CA65 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50B2CB240E10EE4A00AE9530 /* Default.png */; };
@@ -636,8 +634,6 @@
50522A0E11B3E1E20061670F /* CDXPropertyModifierAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 50522A0C11B3E1E20061670F /* CDXPropertyModifierAction.m */; };
50545BFF105E8D6C00AB7C52 /* CCPageTurn3DAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 50545BFD105E8D6C00AB7C52 /* CCPageTurn3DAction.h */; };
50545C00105E8D6C00AB7C52 /* CCPageTurn3DAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 50545BFE105E8D6C00AB7C52 /* CCPageTurn3DAction.m */; };
- 50545C0A105E8E7200AB7C52 /* CCPageTurnTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50545C08105E8E7200AB7C52 /* CCPageTurnTransition.h */; };
- 50545C0B105E8E7200AB7C52 /* CCPageTurnTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50545C09105E8E7200AB7C52 /* CCPageTurnTransition.m */; };
505460F01061413300AB7C52 /* A Damn Mess.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 505460EA1061413300AB7C52 /* A Damn Mess.ttf */; };
505460F11061413300AB7C52 /* Abberancy.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 505460EB1061413300AB7C52 /* Abberancy.ttf */; };
505460F21061413300AB7C52 /* Abduction.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 505460EC1061413300AB7C52 /* Abduction.ttf */; };
@@ -1806,6 +1802,10 @@
DAABAA931059A42E00794EB3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D500B990D5A79CF00DBA0E3 /* QuartzCore.framework */; };
DAABAA941059A42E00794EB3 /* libcocos2d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5018F24D0DFDEAC400C013A5 /* libcocos2d.a */; };
DAABAA961059A42E00794EB3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 503092B210447296005F7AFC /* libz.dylib */; };
+ E0112F53120CB406006667F8 /* CCTransitionPageTurn.h in Headers */ = {isa = PBXBuildFile; fileRef = E0112F4F120CB406006667F8 /* CCTransitionPageTurn.h */; };
+ E0112F54120CB406006667F8 /* CCTransitionPageTurn.m in Sources */ = {isa = PBXBuildFile; fileRef = E0112F50120CB406006667F8 /* CCTransitionPageTurn.m */; };
+ E0112F55120CB406006667F8 /* CCTransitionRadial.h in Headers */ = {isa = PBXBuildFile; fileRef = E0112F51120CB406006667F8 /* CCTransitionRadial.h */; };
+ E0112F56120CB406006667F8 /* CCTransitionRadial.m in Sources */ = {isa = PBXBuildFile; fileRef = E0112F52120CB406006667F8 /* CCTransitionRadial.m */; };
E0A4A05911F72D79003B9D29 /* test_image_bgra8888.pvr in Resources */ = {isa = PBXBuildFile; fileRef = E0A4A05211F72D79003B9D29 /* test_image_bgra8888.pvr */; };
E0A4A05A11F72D79003B9D29 /* test_image_pvrtc2bpp.pvr in Resources */ = {isa = PBXBuildFile; fileRef = E0A4A05311F72D79003B9D29 /* test_image_pvrtc2bpp.pvr */; };
E0A4A05B11F72D79003B9D29 /* test_image_pvrtc4bpp.pvr in Resources */ = {isa = PBXBuildFile; fileRef = E0A4A05411F72D79003B9D29 /* test_image_pvrtc4bpp.pvr */; };
@@ -2817,8 +2817,6 @@
50150434113300F900A9CA65 /* CCProgressTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCProgressTimer.m; sourceTree = "<group>"; };
50150435113300F900A9CA65 /* CCProgressTimerActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProgressTimerActions.h; sourceTree = "<group>"; };
50150436113300F900A9CA65 /* CCProgressTimerActions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCProgressTimerActions.m; sourceTree = "<group>"; };
- 50150437113300F900A9CA65 /* CCRadialTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRadialTransition.h; sourceTree = "<group>"; };
- 50150438113300F900A9CA65 /* CCRadialTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRadialTransition.m; sourceTree = "<group>"; };
501504ED11330E1700A9CA65 /* ProgressActionsTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ProgressActionsTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
501504FF11330EA700A9CA65 /* ProgressActionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressActionsTest.h; path = tests/ProgressActionsTest.h; sourceTree = "<group>"; };
5015050011330EA700A9CA65 /* ProgressActionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressActionsTest.m; path = tests/ProgressActionsTest.m; sourceTree = "<group>"; };
@@ -3075,8 +3073,6 @@
50522A0C11B3E1E20061670F /* CDXPropertyModifierAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDXPropertyModifierAction.m; sourceTree = "<group>"; };
50545BFD105E8D6C00AB7C52 /* CCPageTurn3DAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPageTurn3DAction.h; sourceTree = "<group>"; };
50545BFE105E8D6C00AB7C52 /* CCPageTurn3DAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPageTurn3DAction.m; sourceTree = "<group>"; };
- 50545C08105E8E7200AB7C52 /* CCPageTurnTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPageTurnTransition.h; sourceTree = "<group>"; };
- 50545C09105E8E7200AB7C52 /* CCPageTurnTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPageTurnTransition.m; sourceTree = "<group>"; };
505460EA1061413300AB7C52 /* A Damn Mess.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "A Damn Mess.ttf"; sourceTree = "<group>"; };
505460EB1061413300AB7C52 /* Abberancy.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Abberancy.ttf; sourceTree = "<group>"; };
505460EC1061413300AB7C52 /* Abduction.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Abduction.ttf; sourceTree = "<group>"; };
@@ -3668,6 +3664,10 @@
DA90D87B1059A54D0039F26A /* FontTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontTest.h; path = tests/FontTest.h; sourceTree = "<group>"; };
DA90D87C1059A54D0039F26A /* FontTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FontTest.m; path = tests/FontTest.m; sourceTree = "<group>"; };
DAABAA9A1059A42E00794EB3 /* FontTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FontTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ E0112F4F120CB406006667F8 /* CCTransitionPageTurn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTransitionPageTurn.h; sourceTree = "<group>"; };
+ E0112F50120CB406006667F8 /* CCTransitionPageTurn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTransitionPageTurn.m; sourceTree = "<group>"; };
+ E0112F51120CB406006667F8 /* CCTransitionRadial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTransitionRadial.h; sourceTree = "<group>"; };
+ E0112F52120CB406006667F8 /* CCTransitionRadial.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTransitionRadial.m; sourceTree = "<group>"; };
E0A4A05211F72D79003B9D29 /* test_image_bgra8888.pvr */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_image_bgra8888.pvr; sourceTree = "<group>"; };
E0A4A05311F72D79003B9D29 /* test_image_pvrtc2bpp.pvr */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_image_pvrtc2bpp.pvr; sourceTree = "<group>"; };
E0A4A05411F72D79003B9D29 /* test_image_pvrtc4bpp.pvr */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_image_pvrtc4bpp.pvr; sourceTree = "<group>"; };
@@ -5359,10 +5359,10 @@
5018F2610DFDEAFF00C013A5 /* CCScene.m */,
502B3E980E09A59500886982 /* CCTransition.h */,
502B3E990E09A59500886982 /* CCTransition.m */,
- 50545C08105E8E7200AB7C52 /* CCPageTurnTransition.h */,
- 50545C09105E8E7200AB7C52 /* CCPageTurnTransition.m */,
- 50150437113300F900A9CA65 /* CCRadialTransition.h */,
- 50150438113300F900A9CA65 /* CCRadialTransition.m */,
+ E0112F4F120CB406006667F8 /* CCTransitionPageTurn.h */,
+ E0112F50120CB406006667F8 /* CCTransitionPageTurn.m */,
+ E0112F51120CB406006667F8 /* CCTransitionRadial.h */,
+ E0112F52120CB406006667F8 /* CCTransitionRadial.m */,
);
name = "Layers, Scenes, Transitions Nodes";
sourceTree = "<group>";
@@ -6336,7 +6336,6 @@
50316AD41029A126003ACFE7 /* CCMotionStreak.h in Headers */,
50316AD81029A137003ACFE7 /* CCRibbon.h in Headers */,
50545BFF105E8D6C00AB7C52 /* CCPageTurn3DAction.h in Headers */,
- 50545C0A105E8E7200AB7C52 /* CCPageTurnTransition.h in Headers */,
505462FC1062768000AB7C52 /* ccConfig.h in Headers */,
50AB629B109B75EC0036FD11 /* CCTileMapAtlas.h in Headers */,
50E2A15010A45E7F00D894CE /* CCSpriteFrame.h in Headers */,
@@ -6352,7 +6351,6 @@
0529445D11098D6F00E500F3 /* CCProfiling.h in Headers */,
50150439113300F900A9CA65 /* CCProgressTimer.h in Headers */,
5015043B113300F900A9CA65 /* CCProgressTimerActions.h in Headers */,
- 5015043D113300F900A9CA65 /* CCRadialTransition.h in Headers */,
50FBB2DA117613F500150761 /* CCPropertyAction.h in Headers */,
50D898F31192CB7500458C29 /* uthash.h in Headers */,
508EAC311193F8B0007F058D /* utlist.h in Headers */,
@@ -6362,6 +6360,8 @@
505F4C3911BFA6E7002DCD39 /* ESRenderer.h in Headers */,
E0C3655B11F0AE9B001C08F9 /* CCSpriteBatchNode.h in Headers */,
E0C54DCB11F9CF2700B9E4CB /* ccUtils.h in Headers */,
+ E0112F53120CB406006667F8 /* CCTransitionPageTurn.h in Headers */,
+ E0112F55120CB406006667F8 /* CCTransitionRadial.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9307,7 +9307,6 @@
50316AD51029A126003ACFE7 /* CCMotionStreak.m in Sources */,
50316AD91029A137003ACFE7 /* CCRibbon.m in Sources */,
50545C00105E8D6C00AB7C52 /* CCPageTurn3DAction.m in Sources */,
- 50545C0B105E8E7200AB7C52 /* CCPageTurnTransition.m in Sources */,
50AB629C109B75EC0036FD11 /* CCTileMapAtlas.m in Sources */,
50E2A15110A45E7F00D894CE /* CCSpriteFrame.m in Sources */,
502C8BE110A661E200D137BA /* CCSpriteFrameCache.m in Sources */,
@@ -9321,12 +9320,13 @@
0529445E11098D6F00E500F3 /* CCProfiling.m in Sources */,
5015043A113300F900A9CA65 /* CCProgressTimer.m in Sources */,
5015043C113300F900A9CA65 /* CCProgressTimerActions.m in Sources */,
- 5015043E113300F900A9CA65 /* CCRadialTransition.m in Sources */,
50FBB2DB117613F500150761 /* CCPropertyAction.m in Sources */,
5080435311BEE8D60039CA83 /* CCArray.m in Sources */,
505F4C3511BFA68B002DCD39 /* ES1Renderer.m in Sources */,
E0C3655C11F0AE9B001C08F9 /* CCSpriteBatchNode.m in Sources */,
E0C54DCA11F9CF2700B9E4CB /* ccUtils.c in Sources */,
+ E0112F54120CB406006667F8 /* CCTransitionPageTurn.m in Sources */,
+ E0112F56120CB406006667F8 /* CCTransitionRadial.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
33 cocos2d/CCPageTurnTransition.h
@@ -0,0 +1,33 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2009 Sindesso Pty Ltd http://www.sindesso.com/
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+/*
+
+EMPTY FILE
+
+Will be removed in cocos2d v1.0.1
+
+*/
+
View
33 cocos2d/CCPageTurnTransition.m
@@ -0,0 +1,33 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2009 Sindesso Pty Ltd http://www.sindesso.com/
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+/*
+
+EMPTY FILE
+
+Will be removed in cocos2d v1.0.1
+
+*/
+
View
33 cocos2d/CCRadialTransition.h
@@ -0,0 +1,33 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2009 Lam Pham
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+
+/*
+
+EMPTY FILE
+
+Will be removed in cocos2d v1.0.1
+
+*/
View
34 cocos2d/CCRadialTransition.m
@@ -0,0 +1,34 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2009 Lam Pham
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+
+/*
+
+EMPTY FILE
+
+Will be removed in cocos2d v1.0.1
+
+*/
+
View
34 cocos2d/CCTextureNode.h
@@ -1,19 +1,33 @@
-/* cocos2d for iPhone
- *
- * http://www.cocos2d-iphone.org
- *
- * Copyright (C) 2008,2009 Ricardo Quesada
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the 'cocos2d for iPhone' license.
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
*
- * You will find a copy of this license within the cocos2d for iPhone
- * distribution inside the "LICENSE" file.
+ * Copyright (c) 2009 Ricardo Quesada
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
*
*/
+
/*
EMPTY FILE
+Will be removed in cocos2d v1.0.1
+
*/
View
34 cocos2d/CCTextureNode.m
@@ -1,19 +1,33 @@
-/* cocos2d for iPhone
- *
- * http://www.cocos2d-iphone.org
- *
- * Copyright (C) 2008,2009 Ricardo Quesada
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the 'cocos2d for iPhone' license.
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
*
- * You will find a copy of this license within the cocos2d for iPhone
- * distribution inside the "LICENSE" file.
+ * Copyright (c) 2009 Ricardo Quesada
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
*
*/
+
/*
EMPTY FILE
+Will be removed in cocos2d v1.0.1
+
*/
View
163 cocos2d/CCTransition.h
@@ -91,6 +91,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCRotoZoomTransition : CCTransitionRotoZoom
+{}
+@end
+
+
/** CCTransitionJumpZoom:
Zoom out and jump the outgoing scene, and then jump and zoom in the incoming
*/
@@ -98,6 +104,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCJumpZoomTransition : CCTransitionJumpZoom
+{}
+@end
+
+
/** CCTransitionMoveInL:
Move in from to the left the incoming scene.
*/
@@ -109,6 +121,12 @@ typedef enum {
-(CCIntervalAction*) action;
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCMoveInLTransition : CCTransitionMoveInL
+{}
+@end
+
+
/** CCTransitionMoveInR:
Move in from to the right the incoming scene.
*/
@@ -116,6 +134,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCMoveInRTransition : CCTransitionMoveInR
+{}
+@end
+
+
/** CCTransitionMoveInT:
Move in from to the top the incoming scene.
*/
@@ -123,6 +147,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCMoveInTTransition : CCTransitionMoveInT
+{}
+@end
+
+
/** CCTransitionMoveInB:
Move in from to the bottom the incoming scene.
*/
@@ -130,6 +160,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCMoveInBTransition : CCTransitionMoveInB
+{}
+@end
+
+
/** CCTransitionSlideInL:
Slide in the incoming scene from the left border.
*/
@@ -141,6 +177,12 @@ typedef enum {
-(CCIntervalAction*) action;
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCSlideInLTransition : CCTransitionSlideInL
+{}
+@end
+
+
/** CCTransitionSlideInR:
Slide in the incoming scene from the right border.
*/
@@ -148,6 +190,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCSlideInRTransition : CCTransitionSlideInR
+{}
+@end
+
+
/** CCTransitionSlideInB:
Slide in the incoming scene from the bottom border.
*/
@@ -155,6 +203,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCSlideInBTransition : CCTransitionSlideInB
+{}
+@end
+
+
/** CCTransitionSlideInT:
Slide in the incoming scene from the top border.
*/
@@ -162,6 +216,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCSlideInTTransition : CCTransitionSlideInT
+{}
+@end
+
+
/**
Shrink the outgoing scene while grow the incoming scene
*/
@@ -169,6 +229,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCShrinkGrowTransition : CCTransitionShrinkGrow
+{}
+@end
+
+
/** CCTransitionFlipX:
Flips the screen horizontally.
The front face is the outgoing scene and the back face is the incoming scene.
@@ -177,6 +243,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFlipXTransition : CCTransitionFlipX
+{}
+@end
+
+
/** CCTransitionFlipY:
Flips the screen vertically.
The front face is the outgoing scene and the back face is the incoming scene.
@@ -185,6 +257,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFlipYTransition : CCTransitionFlipY
+{}
+@end
+
+
/** CCTransitionFlipAngular:
Flips the screen half horizontally and half vertically.
The front face is the outgoing scene and the back face is the incoming scene.
@@ -193,15 +271,26 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFlipAngularTransition : CCTransitionFlipAngular
+{}
+@end
+
+
/** CCTransitionZoomFlipX:
Flips the screen horizontally doing a zoom out/in
The front face is the outgoing scene and the back face is the incoming scene.
*/
@interface CCTransitionZoomFlipX : CCTransitionSceneOriented
-{
-}
+{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCZoomFlipXTransition : CCTransitionZoomFlipX
+{}
+@end
+
+
/** CCTransitionZoomFlipY:
Flips the screen vertically doing a little zooming out/in
The front face is the outgoing scene and the back face is the incoming scene.
@@ -210,6 +299,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCZoomFlipYTransition : CCTransitionZoomFlipY
+{}
+@end
+
+
/** CCTransitionZoomFlipAngular:
Flips the screen half horizontally and half vertically doing a little zooming out/in.
The front face is the outgoing scene and the back face is the incoming scene.
@@ -218,6 +313,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCZoomFlipAngularTransition : CCTransitionZoomFlipAngular
+{}
+@end
+
+
/** CCTransitionFade:
Fade out the outgoing scene and then fade in the incoming scene.'''
*/
@@ -233,16 +334,28 @@ typedef enum {
-(id) initWithDuration:(ccTime)duration scene:(CCScene*)scene withColor:(ccColor3B)color;
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFadeTransition : CCTransitionFade
+{}
+@end
+
+
+
/**
CCTransitionCrossFade:
Cross fades two scenes using the CCRenderTexture object.
*/
@class CCRenderTexture;
@interface CCTransitionCrossFade : CCTransitionScene
-{
-}
+{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCCrossFadeTransition : CCTransitionCrossFade
+{}
+@end
+
+
/** CCTransitionTurnOffTiles:
Turn off the tiles of the outgoing scene in random order
*/
@@ -250,6 +363,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCTurnOffTilesTransition : CCTransitionTurnOffTiles
+{}
+@end
+
+
/** CCTransitionSplitCols:
The odd columns goes upwards while the even columns goes downwards.
*/
@@ -258,6 +377,12 @@ typedef enum {
-(CCIntervalAction*) action;
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCSplitColsTransition : CCTransitionSplitCols
+{}
+@end
+
+
/** CCTransitionSplitRows:
The odd rows goes to the left while the even rows goes to the right.
*/
@@ -265,6 +390,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCSplitRowsTransition : CCTransitionSplitRows
+{}
+@end
+
+
/** CCTransitionFadeTR:
Fade the tiles of the outgoing scene from the left-bottom corner the to top-right corner.
*/
@@ -273,6 +404,12 @@ typedef enum {
-(CCIntervalAction*) actionWithSize:(ccGridSize) vector;
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFadeTRTransition : CCTransitionFadeTR
+{}
+@end
+
+
/** CCTransitionFadeBL:
Fade the tiles of the outgoing scene from the top-right corner to the bottom-left corner.
*/
@@ -280,6 +417,12 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFadeBLTransition : CCTransitionFadeBL
+{}
+@end
+
+
/** CCTransitionFadeUp:
* Fade the tiles of the outgoing scene from the bottom to the top.
*/
@@ -287,9 +430,21 @@ typedef enum {
{}
@end
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFadeUpTransition : CCTransitionFadeUp
+{}
+@end
+
+
/** CCTransitionFadeDown:
* Fade the tiles of the outgoing scene from the top to the bottom.
*/
@interface CCTransitionFadeDown : CCTransitionFadeTR
{}
@end
+
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCFadeDownTransition : CCTransitionFadeDown
+{}
+@end
+
View
82 cocos2d/CCTransition.m
@@ -1043,4 +1043,86 @@ -(CCIntervalAction*) actionWithSize: (ccGridSize) v
@end
+#pragma mark -
+#pragma mark Deprecated Transitions
+
+// XXX DEPRECATED. Will be removed in v1.0
+
+@implementation CCRotoZoomTransition
+@end
+
+@implementation CCJumpZoomTransition
+@end
+
+@implementation CCMoveInLTransition
+@end
+
+@implementation CCMoveInRTransition
+@end
+
+@implementation CCMoveInTTransition
+@end
+
+@implementation CCMoveInBTransition
+@end
+
+@implementation CCSlideInLTransition
+@end
+
+@implementation CCSlideInRTransition
+@end
+
+@implementation CCSlideInBTransition
+@end
+
+@implementation CCSlideInTTransition
+@end
+
+@implementation CCShrinkGrowTransition
+@end
+
+@implementation CCFlipXTransition
+@end
+
+@implementation CCFlipYTransition
+@end
+
+@implementation CCFlipAngularTransition
+@end
+
+@implementation CCZoomFlipXTransition
+@end
+
+@implementation CCZoomFlipYTransition
+@end
+
+@implementation CCZoomFlipAngularTransition
+@end
+
+@implementation CCFadeTransition
+@end
+
+@implementation CCCrossFadeTransition
+@end
+
+@implementation CCTurnOffTilesTransition
+@end
+
+@implementation CCSplitColsTransition
+@end
+
+@implementation CCSplitRowsTransition
+@end
+
+@implementation CCFadeTRTransition
+@end
+
+@implementation CCFadeBLTransition
+@end
+
+@implementation CCFadeUpTransition
+@end
+
+@implementation CCFadeDownTransition
+@end
View
13 cocos2d/CCTransitionPageTurn.h
@@ -26,21 +26,21 @@
#import "CCTransition.h"
-/**
+/** CCTransitionPageTurn transition.
* A transition which peels back the bottom right hand corner of a scene
* to transition to the scene beneath it simulating a page turn
*
* This uses a 3DAction so it's strongly recommended that depth buffering
* is turned on in CCDirector using:
*
- * [[CCDirector sharedDirector] setDepthBufferFormat:kDepthBuffer16];
+ * [[CCDirector sharedDirector] setDepthBufferFormat:kCCDepthBuffer16];
*
* @since v0.8.2
*/
-@interface CCPageTurnTransition : CCTransitionScene {
+@interface CCTransitionPageTurn : CCTransitionScene
+{
BOOL back_;
}
-
/**
* creates a base transition with duration and incoming scene
* if back is TRUE then the effect is reversed to appear as if the incoming
@@ -58,3 +58,8 @@
-(CCIntervalAction*) actionWithSize:(ccGridSize) vector;
@end
+
+DEPRECATED_ATTRIBUTE @interface CCPageTurnTransition : CCTransitionPageTurn
+{
+}
+@end
View
4 cocos2d/CCTransitionPageTurn.m
@@ -28,7 +28,11 @@
#import "CCPageTurn3DAction.h"
#import "CCDirector.h"
+// XXX Deprecated XXX Will be removed in v1.0.1
@implementation CCPageTurnTransition
+@end
+
+@implementation CCTransitionPageTurn
/** creates a base transition with duration and incoming scene */
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s backwards:(BOOL) back
View
25 cocos2d/CCTransitionRadial.h
@@ -27,13 +27,22 @@
#import "CCProgressTimer.h"
#import "CCProgressTimerActions.h"
-///
-// A counter colock-wise radial transition to the next scene
-///
-@interface CCRadialCCWTransition : CCTransitionScene
+/** CCTransitionRadialCCW transition.
+ A counter colock-wise radial transition to the next scene
+ */
+@interface CCTransitionRadialCCW : CCTransitionScene
+@end
+
+/* will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCRadialCCWTransition : CCTransitionRadialCCW
@end
-///
-// A counter colock-wise radial transition to the next scene
-///
-@interface CCRadialCWTransition : CCRadialCCWTransition
+
+/** CCTransitionRadialCW transition.
+ A counter colock-wise radial transition to the next scene
+*/
+@interface CCTransitionRadialCW : CCTransitionRadialCCW
+@end
+
+/* will be removed in v1.0.1 */
+DEPRECATED_ATTRIBUTE @interface CCRadialCWTransition : CCTransitionRadialCW
@end
View
19 cocos2d/CCTransitionRadial.m
@@ -36,7 +36,10 @@
kSceneRadial = 0xc001,
};
-@implementation CCRadialCCWTransition
+#pragma mark -
+#pragma mark Transition Radial CCW
+
+@implementation CCTransitionRadialCCW
-(void) sceneOrder
{
inSceneOnTop = NO;
@@ -98,9 +101,21 @@ -(void) onExit
}
@end
-@implementation CCRadialCWTransition
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+@implementation CCRadialCCWTransition
+@end
+
+#pragma mark -
+#pragma mark Transition Radial CW
+
+@implementation CCTransitionRadialCW
-(CCProgressTimerType) radialType
{
return kCCProgressTimerTypeRadialCW;
}
@end
+
+/* XXX DEPRECATED. Will be removed in v1.0.1 */
+@implementation CCRadialCWTransition
+@end
+
View
20 tests/TransitionsTest.m
@@ -10,7 +10,7 @@
#define TRANSITION_DURATION (1.2f)
-@interface FadeWhiteTransition : CCTransitionFade
+@interface FadeWhiteTransition : CCTransitionFade
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s;
@end
@interface FlipXLeftOver : CCTransitionFlipX
@@ -49,10 +49,10 @@ +(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s;
@interface ZoomFlipAngularRightOver : CCTransitionZoomFlipAngular
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s;
@end
-@interface PageTransitionForward : CCPageTurnTransition
+@interface TransitionPageForward : CCTransitionPageTurn
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s;
@end
-@interface PageTransitionBackward : CCPageTurnTransition
+@interface TransitionPageBackward : CCTransitionPageTurn
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s;
@end
@@ -124,13 +124,13 @@ +(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s {
}
@end
-@implementation PageTransitionForward
+@implementation TransitionPageForward
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s {
return [self transitionWithDuration:t scene:s backwards:NO];
}
@end
-@implementation PageTransitionBackward
+@implementation TransitionPageBackward
+(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s {
return [self transitionWithDuration:t scene:s backwards:YES];
}
@@ -143,10 +143,10 @@ +(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s {
static NSString *transitions[] = {
@"CCTransitionJumpZoom",
@"CCTransitionCrossFade",
- @"CCRadialCCWTransition",
- @"CCRadialCWTransition",
- @"PageTransitionForward",
- @"PageTransitionBackward",
+ @"CCTransitionRadialCCW",
+ @"CCTransitionRadialCW",
+ @"TransitionPageForward",
+ @"TransitionPageBackward",
@"CCTransitionFadeTR",
@"CCTransitionFadeBL",
@"CCTransitionFadeUp",
@@ -183,7 +183,7 @@ +(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s {
Class nextTransition()
{
// HACK: else NSClassFromString will fail
- [CCRadialCCWTransition node];
+ [CCTransitionRadialCCW node];
sceneIdx++;
sceneIdx = sceneIdx % ( sizeof(transitions) / sizeof(transitions[0]) );
Please sign in to comment.
Something went wrong with that request. Please try again.