Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'develop' into reorderSprite

  • Loading branch information...
commit e4fdea1940b6072022690dcd7f63fdfd6ca3cff8 2 parents 992938f + 7c7f805
Ricardo Quesada ricardoquesada authored

Showing 21 changed files with 108 additions and 105 deletions. Show diff stats Hide diff stats

  1. +6 4 AUTHORS
  2. +3 1 CHANGELOG
  3. +1 10 CocosDenshion/CocosDenshion/CocosDenshion.m
  4. +3 10 cocos2d/Support/CCArray.m
  5. +4 4 templates/cocos2d_app/Classes/{HelloWorldScene.h → HelloWorldLayer.h}
  6. +7 6 templates/{cocos2d_mac/Classes/HelloWorldScene.m → cocos2d_app/Classes/HelloWorldLayer.m}
  7. +2 2 templates/cocos2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.m
  8. +6 6 templates/cocos2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
  9. +5 6 templates/cocos2d_box2d_app/Classes/{HelloWorldScene.h → HelloWorldLayer.h}
  10. +9 7 templates/cocos2d_box2d_app/Classes/{HelloWorldScene.mm → HelloWorldLayer.mm}
  11. +2 2 templates/cocos2d_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.mm
  12. +6 6 templates/cocos2d_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
  13. +6 5 templates/cocos2d_chipmunk_app/Classes/{HelloWorldScene.h → HelloWorldLayer.h}
  14. +21 8 templates/cocos2d_chipmunk_app/Classes/{HelloWorldScene.m → HelloWorldLayer.m}
  15. +2 2 templates/cocos2d_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.m
  16. +6 6 templates/cocos2d_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
  17. +4 4 templates/cocos2d_mac/Classes/{HelloWorldScene.h → HelloWorldLayer.h}
  18. +7 6 templates/{cocos2d_app/Classes/HelloWorldScene.m → cocos2d_mac/Classes/HelloWorldLayer.m}
  19. +2 2 templates/cocos2d_mac/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.m
  20. +6 6 templates/cocos2d_mac/___PROJECTNAME___.xcodeproj/project.pbxproj
  21. +0 2  tests/ActionsTest.m
10 AUTHORS
@@ -284,6 +284,7 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
284 284 Added reorder node performance test
285 285 Added multisampling anti-aliasing support in EAGLView, ESRenderer
286 286 RenderTexture: getUIImageFromBuffer supports RetinaDisplay. patch.
  287 + CCArray: check for bounds in insertObjectAtIndex. patch.
287 288 * marcu.catalin:
288 289 Menu items are not consumed is items are not visible
289 290 * Mark Cooke:
@@ -337,6 +338,11 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
337 338 Texture fails gracefully if PVR image can't be loaded (patch)
338 339 * Patrick Wolowicz:
339 340 mkatlas: added artifact removal by copying borders to margins
  341 + * Paul Hampson (TBBle) (http://blog.tbble.org/)
  342 + CCSpriteFrameCache textureFileName is relative to path
  343 + CCSprite: correctly overrides setIsRelativeAnchorPoint
  344 + libpng doesn't compile pngtest.c. patch.
  345 + Templates: HelloWorld -> HelloWorldLayer and other improvements. patch.
340 346 * Piero Tofy (http://indieappsalliance.org):
341 347 Web: Author of the scraper script used to parse games data in the cocos2d site
342 348 * Pieter van de Bruggen
@@ -427,10 +433,6 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
427 433 Added ProfilingTimer: Director and Particles supports it when enabled
428 434 * svenito:
429 435 Fixed artifacts in PageTurnTransition
430   - * TBBle (http://blog.tbble.org/)
431   - CCSpriteFrameCache textureFileName is relative to path
432   - CCSprite: correctly overrides setIsRelativeAnchorPoint
433   - libpng doesn't compile pngtest.c. patch.
434 436 * TheArsenik:
435 437 added BezierTo action
436 438 * thoechsm:
4 CHANGELOG
... ... @@ -1,4 +1,4 @@
1   -version 1.0-beta - XX-XXX-2011
  1 +version 1.0-beta - 01-Mar-2011
2 2 . [NEW] Actions: Repeat and RepeatForEver has getter/setter for the inner action (issue #1110)
3 3 . [NEW] LayerGradient: Added "compressed interpolation" (default mode) in order to display all graident's colors in any vector
4 4 . [NEW-MAC] Added CC_DIRECTOR_INIT(). It is possible to create a Mac Window programatically
@@ -7,6 +7,7 @@ version 1.0-beta - XX-XXX-2011
7 7 . [FIX] CocosDenshion: Fixed excessively large or negative gain values cause distorted audio in the simulator.
8 8 . [FIX] CocosDenshion: Added guards to prevent memory corruption caused by invalid parameters
9 9 . [FIX] CocosDenshion: Define some constants for defaults, make const parameter on buffer asynch load method
  10 +. [FIX] CCArray: insertObjectAtIndex checks bounds (issue #1121)
10 11 . [FIX] Director: Fixed possible crash when purging the TextureCache
11 12 . [FIX] Layer: Deprecated. CCMultiplexLayer deprecated. New name is CCLayerMultiplex
12 13 . [FIX] Particles: consumes less memory (12 bytes less per particle) and are a bit faster
@@ -16,6 +17,7 @@ version 1.0-beta - XX-XXX-2011
16 17 . [FIX] Sprite: flipx/flipy don't modify the contentSize (issue #1073)
17 18 . [FIX] SpriteFrame: setRect sets pixels too. setRectInPixels sets points too (issue #1088)
18 19 . [FIX] Templates: ItunesArtwork renamed to iTunesArtwork (issue #1092)
  20 +. [FIX] Templates: HelloWorld -> HelloWorldLayer and other improvements (issue #873)
19 21 . [FIX] TextureCache: asyncObject#dealloc uses CCLOGINFO instead of CCLOG (issue #1096)
20 22 . [FIX] TiledMap: TMX maps work with zlib compression (Tiled v0.6)
21 23 . [FIX-MAC] Director: runLoop enables NSTimers events (issue #1107)
11 CocosDenshion/CocosDenshion/CocosDenshion.m
@@ -836,12 +836,7 @@ - (ALuint)playSound:(int) soundId sourceGroupId:(int)sourceGroupId pitch:(float)
836 836 #endif
837 837 return CD_MUTE;
838 838 }
839   -
840   -#if TARGET_IPHONE_SIMULATOR
841   - //Fix for issue reported by Walzer, prevents speaker destruction when running in simulator ;)
842   - gain = clampf(gain, 0.0f, 2.0f);
843   -#endif
844   -
  839 +
845 840 int sourceIndex = [self _getSourceIndexForSourceGroup:sourceGroupId];//This method ensures sourceIndex is valid
846 841
847 842 if (sourceIndex != CD_NO_SOURCE) {
@@ -1076,10 +1071,6 @@ - (void) setPitch:(float) newPitchValue {
1076 1071
1077 1072 - (void) setGain:(float) newGainValue {
1078 1073 if (!mute_) {
1079   -#if TARGET_IPHONE_SIMULATOR
1080   - //Fix for issue reported by Walzer, prevents speaker destruction when running in simulator ;)
1081   - gain = clampf(gain, 0.0f, 2.0f);
1082   -#endif
1083 1074 alSourcef(_sourceId, AL_GAIN, newGainValue);
1084 1075 } else {
1085 1076 _preMuteGain = newGainValue;
13 cocos2d/Support/CCArray.m
@@ -81,8 +81,6 @@ - (id) initWithNSArray:(NSArray*)otherArray
81 81 return self;
82 82 }
83 83
84   -
85   -
86 84 - (id) initWithCoder:(NSCoder*)coder
87 85 {
88 86 self = [self initWithNSArray:[coder decodeObjectForKey:@"nsarray"]];
@@ -93,8 +91,6 @@ - (void)encodeWithCoder:(NSCoder *)coder
93 91 [coder encodeObject:[self getNSArray] forKey:@"nsarray"];
94 92 }
95 93
96   -
97   -
98 94 - (NSUInteger) count
99 95 {
100 96 return data->num;
@@ -112,9 +108,7 @@ - (NSUInteger) indexOfObject:(id)object
112 108
113 109 - (id) objectAtIndex:(NSUInteger)index
114 110 {
115   - if( index >= data->num )
116   - [NSException raise:NSRangeException
117   - format: @"index out of range in objectAtIndex(%d)", data->num ];
  111 + NSAssert2( index < data->num && index >= 0, @"index out of range in objectAtIndex(%d), index %i", data->num, index );
118 112
119 113 return data->arr[index];
120 114 }
@@ -166,9 +160,8 @@ - (void) insertObject:(id)object atIndex:(NSUInteger)index
166 160
167 161 - (void) removeLastObject
168 162 {
169   - if( data->num == 0 )
170   - [NSException raise:NSRangeException
171   - format: @"no objects added"];
  163 + NSAssert( data->num > 0, @"no objects added" );
  164 +
172 165 ccArrayRemoveObjectAtIndex(data, data->num-1);
173 166 }
174 167
8 templates/cocos2d_app/Classes/HelloWorldScene.h → templates/cocos2d_app/Classes/HelloWorldLayer.h
@@ -10,12 +10,12 @@
10 10 // When you import this file, you import all the cocos2d classes
11 11 #import "cocos2d.h"
12 12
13   -// HelloWorld Layer
14   -@interface HelloWorld : CCLayer
  13 +// HelloWorldLayer
  14 +@interface HelloWorldLayer : CCLayer
15 15 {
16 16 }
17 17
18   -// returns a Scene that contains the HelloWorld as the only child
19   -+(id) scene;
  18 +// returns a CCScene that contains the HelloWorldLayer as the only child
  19 ++(CCScene *) scene;
20 20
21 21 @end
13 templates/cocos2d_mac/Classes/HelloWorldScene.m → templates/cocos2d_app/Classes/HelloWorldLayer.m
@@ -6,19 +6,20 @@
6 6 // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
7 7 //
8 8
  9 +
9 10 // Import the interfaces
10   -#import "HelloWorldScene.h"
  11 +#import "HelloWorldLayer.h"
11 12
12   -// HelloWorld implementation
13   -@implementation HelloWorld
  13 +// HelloWorldLayer implementation
  14 +@implementation HelloWorldLayer
14 15
15   -+(id) scene
  16 ++(CCScene *) scene
16 17 {
17 18 // 'scene' is an autorelease object.
18 19 CCScene *scene = [CCScene node];
19 20
20 21 // 'layer' is an autorelease object.
21   - HelloWorld *layer = [HelloWorld node];
  22 + HelloWorldLayer *layer = [HelloWorldLayer node];
22 23
23 24 // add layer as a child to scene
24 25 [scene addChild: layer];
@@ -32,7 +33,7 @@ -(id) init
32 33 {
33 34 // always call "super" init
34 35 // Apple recommends to re-assign "self" with the "super" return value
35   - if( (self=[super init] )) {
  36 + if( (self=[super init])) {
36 37
37 38 // create and initialize a Label
38 39 CCLabelTTF *label = [CCLabelTTF labelWithString:@"Hello World" fontName:@"Marker Felt" fontSize:64];
4 templates/cocos2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.m
@@ -10,7 +10,7 @@
10 10
11 11 #import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h"
12 12 #import "GameConfig.h"
13   -#import "HelloWorldScene.h"
  13 +#import "HelloWorldLayer.h"
14 14 #import "RootViewController.h"
15 15
16 16 @implementation ___PROJECTNAMEASIDENTIFIER___AppDelegate
@@ -110,7 +110,7 @@ - (void) applicationDidFinishLaunching:(UIApplication*)application
110 110 [self removeStartupFlicker];
111 111
112 112 // Run the intro Scene
113   - [[CCDirector sharedDirector] runWithScene: [HelloWorld scene]];
  113 + [[CCDirector sharedDirector] runWithScene: [HelloWorldLayer scene]];
114 114 }
115 115
116 116
12 templates/cocos2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
@@ -27,7 +27,7 @@
27 27 50674855107A3AF30090963A /* ZAttributedStringPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 50674852107A3AF30090963A /* ZAttributedStringPrivate.h */; };
28 28 506EDB88102F4C4000A389B3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDB87102F4C4000A389B3 /* libz.dylib */; };
29 29 506EDBA5102F4C9F00A389B3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */; };
30   - 506EDC31102F528A00A389B3 /* HelloWorldScene.m in Sources */ = {isa = PBXBuildFile; fileRef = 506EDC30102F528A00A389B3 /* HelloWorldScene.m */; };
  30 + 506EDC31102F528A00A389B3 /* HelloWorldLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 506EDC30102F528A00A389B3 /* HelloWorldLayer.m */; };
31 31 506EE1A91030508200A389B3 /* libcocos2d libraries.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EE05E10304ED200A389B3 /* libcocos2d libraries.a */; };
32 32 507ED63C11C638C6002ED3FC /* CDAudioManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 507ED63311C638C6002ED3FC /* CDAudioManager.h */; };
33 33 507ED63D11C638C6002ED3FC /* CDAudioManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 507ED63411C638C6002ED3FC /* CDAudioManager.m */; };
@@ -276,8 +276,8 @@
276 276 50674852107A3AF30090963A /* ZAttributedStringPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZAttributedStringPrivate.h; sourceTree = "<group>"; };
277 277 506EDB87102F4C4000A389B3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
278 278 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
279   - 506EDC2F102F528A00A389B3 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldScene.h; sourceTree = "<group>"; };
280   - 506EDC30102F528A00A389B3 /* HelloWorldScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloWorldScene.m; sourceTree = "<group>"; };
  279 + 506EDC2F102F528A00A389B3 /* HelloWorldLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
  280 + 506EDC30102F528A00A389B3 /* HelloWorldLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
281 281 506EE05E10304ED200A389B3 /* libcocos2d libraries.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d libraries.a"; sourceTree = BUILT_PRODUCTS_DIR; };
282 282 507ED63311C638C6002ED3FC /* CDAudioManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDAudioManager.h; sourceTree = "<group>"; };
283 283 507ED63411C638C6002ED3FC /* CDAudioManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDAudioManager.m; sourceTree = "<group>"; };
@@ -588,8 +588,8 @@
588 588 isa = PBXGroup;
589 589 children = (
590 590 E0F80F5D120A0182005866B8 /* GameConfig.h */,
591   - 506EDC2F102F528A00A389B3 /* HelloWorldScene.h */,
592   - 506EDC30102F528A00A389B3 /* HelloWorldScene.m */,
  591 + 506EDC2F102F528A00A389B3 /* HelloWorldLayer.h */,
  592 + 506EDC30102F528A00A389B3 /* HelloWorldLayer.m */,
593 593 E0F80F5E120A0182005866B8 /* RootViewController.h */,
594 594 E0F80F5F120A0182005866B8 /* RootViewController.m */,
595 595 1F3B9A2C0EF2145700286867 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.h */,
@@ -1133,7 +1133,7 @@
1133 1133 files = (
1134 1134 1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1135 1135 1F3B9A2D0EF2145700286867 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m in Sources */,
1136   - 506EDC31102F528A00A389B3 /* HelloWorldScene.m in Sources */,
  1136 + 506EDC31102F528A00A389B3 /* HelloWorldLayer.m in Sources */,
1137 1137 E0F80F60120A0182005866B8 /* RootViewController.m in Sources */,
1138 1138 );
1139 1139 runOnlyForDeploymentPostprocessing = 0;
11 ...lates/cocos2d_box2d_app/Classes/HelloWorldScene.h → ...lates/cocos2d_box2d_app/Classes/HelloWorldLayer.h
... ... @@ -1,5 +1,5 @@
1 1 //
2   -// HelloWorldScene.h
  2 +// HelloWorldLayer.h
3 3 // ___PROJECTNAME___
4 4 //
5 5 // Created by ___FULLUSERNAME___ on ___DATE___.
@@ -12,16 +12,15 @@
12 12 #import "Box2D.h"
13 13 #import "GLES-Render.h"
14 14
15   -// HelloWorld Layer
16   -@interface HelloWorld : CCLayer
  15 +// HelloWorldLayer
  16 +@interface HelloWorldLayer : CCLayer
17 17 {
18 18 b2World* world;
19 19 GLESDebugDraw *m_debugDraw;
20 20 }
21 21
22   -// returns a Scene that contains the HelloWorld as the only child
23   -+(id) scene;
24   -
  22 +// returns a CCScene that contains the HelloWorldLayer as the only child
  23 ++(CCScene *) scene;
25 24 // adds a new sprite at a given coordinate
26 25 -(void) addNewSpriteWithCoords:(CGPoint)p;
27 26
16 ...ates/cocos2d_box2d_app/Classes/HelloWorldScene.mm → ...ates/cocos2d_box2d_app/Classes/HelloWorldLayer.mm
... ... @@ -1,5 +1,5 @@
1 1 //
2   -// HelloWorldScene.mm
  2 +// HelloWorldLayer.mm
3 3 // ___PROJECTNAME___
4 4 //
5 5 // Created by ___FULLUSERNAME___ on ___DATE___.
@@ -8,7 +8,7 @@
8 8
9 9
10 10 // Import the interfaces
11   -#import "HelloWorldScene.h"
  11 +#import "HelloWorldLayer.h"
12 12
13 13 //Pixel to metres ratio. Box2D uses metres as the unit for measurement.
14 14 //This ratio defines how many pixels correspond to 1 Box2D "metre"
@@ -24,16 +24,16 @@
24 24 };
25 25
26 26
27   -// HelloWorld implementation
28   -@implementation HelloWorld
  27 +// HelloWorldLayer implementation
  28 +@implementation HelloWorldLayer
29 29
30   -+(id) scene
  30 ++(CCScene *) scene
31 31 {
32 32 // 'scene' is an autorelease object.
33 33 CCScene *scene = [CCScene node];
34 34
35 35 // 'layer' is an autorelease object.
36   - HelloWorld *layer = [HelloWorld node];
  36 + HelloWorldLayer *layer = [HelloWorldLayer node];
37 37
38 38 // add layer as a child to scene
39 39 [scene addChild: layer];
@@ -42,9 +42,11 @@ +(id) scene
42 42 return scene;
43 43 }
44 44
45   -// initialize your instance here
  45 +// on "init" you need to initialize your instance
46 46 -(id) init
47 47 {
  48 + // always call "super" init
  49 + // Apple recommends to re-assign "self" with the "super" return value
48 50 if( (self=[super init])) {
49 51
50 52 // enable touches
4 templates/cocos2d_box2d_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.mm
@@ -10,7 +10,7 @@
10 10
11 11 #import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h"
12 12 #import "GameConfig.h"
13   -#import "HelloWorldScene.h"
  13 +#import "HelloWorldLayer.h"
14 14 #import "RootViewController.h"
15 15
16 16 @implementation ___PROJECTNAMEASIDENTIFIER___AppDelegate
@@ -111,7 +111,7 @@ - (void) applicationDidFinishLaunching:(UIApplication*)application
111 111 [self removeStartupFlicker];
112 112
113 113 // Run the intro Scene
114   - [[CCDirector sharedDirector] runWithScene: [HelloWorld scene]];
  114 + [[CCDirector sharedDirector] runWithScene: [HelloWorldLayer scene]];
115 115 }
116 116
117 117
12 templates/cocos2d_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
@@ -27,7 +27,7 @@
27 27 50674865107A3B340090963A /* ZAttributedStringPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 50674862107A3B340090963A /* ZAttributedStringPrivate.h */; };
28 28 506EDB88102F4C4000A389B3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDB87102F4C4000A389B3 /* libz.dylib */; };
29 29 506EDBA5102F4C9F00A389B3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */; };
30   - 506EDC31102F528A00A389B3 /* HelloWorldScene.mm in Sources */ = {isa = PBXBuildFile; fileRef = 506EDC30102F528A00A389B3 /* HelloWorldScene.mm */; };
  30 + 506EDC31102F528A00A389B3 /* HelloWorldLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 506EDC30102F528A00A389B3 /* HelloWorldLayer.mm */; };
31 31 506EE1A91030508200A389B3 /* libcocos2d libraries.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EE05E10304ED200A389B3 /* libcocos2d libraries.a */; };
32 32 507ED65C11C638E2002ED3FC /* CDAudioManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 507ED65311C638E2002ED3FC /* CDAudioManager.h */; };
33 33 507ED65D11C638E2002ED3FC /* CDAudioManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 507ED65411C638E2002ED3FC /* CDAudioManager.m */; };
@@ -350,8 +350,8 @@
350 350 50674862107A3B340090963A /* ZAttributedStringPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZAttributedStringPrivate.h; sourceTree = "<group>"; };
351 351 506EDB87102F4C4000A389B3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
352 352 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
353   - 506EDC2F102F528A00A389B3 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldScene.h; sourceTree = "<group>"; };
354   - 506EDC30102F528A00A389B3 /* HelloWorldScene.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HelloWorldScene.mm; sourceTree = "<group>"; };
  353 + 506EDC2F102F528A00A389B3 /* HelloWorldLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
  354 + 506EDC30102F528A00A389B3 /* HelloWorldLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HelloWorldLayer.mm; sourceTree = "<group>"; };
355 355 506EE05E10304ED200A389B3 /* libcocos2d libraries.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d libraries.a"; sourceTree = BUILT_PRODUCTS_DIR; };
356 356 507ED65311C638E2002ED3FC /* CDAudioManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDAudioManager.h; sourceTree = "<group>"; };
357 357 507ED65411C638E2002ED3FC /* CDAudioManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDAudioManager.m; sourceTree = "<group>"; };
@@ -741,8 +741,8 @@
741 741 E0F81061120A17DF005866B8 /* GameConfig.h */,
742 742 50F4143710692D7D002A0D5E /* GLES-Render.h */,
743 743 50F4143810692D7D002A0D5E /* GLES-Render.mm */,
744   - 506EDC2F102F528A00A389B3 /* HelloWorldScene.h */,
745   - 506EDC30102F528A00A389B3 /* HelloWorldScene.mm */,
  744 + 506EDC2F102F528A00A389B3 /* HelloWorldLayer.h */,
  745 + 506EDC30102F528A00A389B3 /* HelloWorldLayer.mm */,
746 746 E0F81062120A17DF005866B8 /* RootViewController.h */,
747 747 E0F81063120A17DF005866B8 /* RootViewController.m */,
748 748 1F3B9A2C0EF2145700286867 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.h */,
@@ -1454,7 +1454,7 @@
1454 1454 files = (
1455 1455 1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1456 1456 1F3B9A2D0EF2145700286867 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.mm in Sources */,
1457   - 506EDC31102F528A00A389B3 /* HelloWorldScene.mm in Sources */,
  1457 + 506EDC31102F528A00A389B3 /* HelloWorldLayer.mm in Sources */,
1458 1458 50F4143910692D7D002A0D5E /* GLES-Render.mm in Sources */,
1459 1459 E0F81064120A17DF005866B8 /* RootViewController.m in Sources */,
1460 1460 );
11 ...es/cocos2d_chipmunk_app/Classes/HelloWorldScene.h → ...es/cocos2d_chipmunk_app/Classes/HelloWorldLayer.h
... ... @@ -1,25 +1,26 @@
1 1 //
2   -// HelloWorldScene.m
  2 +// HelloWorldLayer.h
3 3 // ___PROJECTNAME___
4 4 //
5 5 // Created by ___FULLUSERNAME___ on ___DATE___.
6 6 // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
7 7 //
8 8
  9 +
9 10 // When you import this file, you import all the cocos2d classes
10 11 #import "cocos2d.h"
11 12
12 13 // Importing Chipmunk headers
13 14 #import "chipmunk.h"
14 15
15   -// HelloWorld Layer
16   -@interface HelloWorld : CCLayer
  16 +// HelloWorldLayer
  17 +@interface HelloWorldLayer : CCLayer
17 18 {
18 19 cpSpace *space;
19 20 }
20 21
21   -// returns a Scene that contains the HelloWorld as the only child
22   -+(id) scene;
  22 +// returns a CCScene that contains the HelloWorldLayer as the only child
  23 ++(CCScene *) scene;
23 24 -(void) step: (ccTime) dt;
24 25 -(void) addNewSpriteX:(float)x y:(float)y;
25 26
29 ...es/cocos2d_chipmunk_app/Classes/HelloWorldScene.m → ...es/cocos2d_chipmunk_app/Classes/HelloWorldLayer.m
... ... @@ -1,5 +1,5 @@
1 1 //
2   -// HelloWorldScene.m
  2 +// HelloWorldLayer.m
3 3 // ___PROJECTNAME___
4 4 //
5 5 // Created by ___FULLUSERNAME___ on ___DATE___.
@@ -8,7 +8,7 @@
8 8
9 9
10 10 // Import the interfaces
11   -#import "HelloWorldScene.h"
  11 +#import "HelloWorldLayer.h"
12 12
13 13 enum {
14 14 kTagBatchNode = 1,
@@ -31,16 +31,16 @@
31 31 }
32 32 }
33 33
34   -// HelloWorld implementation
35   -@implementation HelloWorld
  34 +// HelloWorldLayer implementation
  35 +@implementation HelloWorldLayer
36 36
37   -+(id) scene
  37 ++(CCScene *) scene
38 38 {
39 39 // 'scene' is an autorelease object.
40 40 CCScene *scene = [CCScene node];
41 41
42 42 // 'layer' is an autorelease object.
43   - HelloWorld *layer = [HelloWorld node];
  43 + HelloWorldLayer *layer = [HelloWorldLayer node];
44 44
45 45 // add layer as a child to scene
46 46 [scene addChild: layer];
@@ -49,7 +49,6 @@ +(id) scene
49 49 return scene;
50 50 }
51 51
52   -
53 52 -(void) addNewSpriteX: (float)x y:(float)y
54 53 {
55 54 int posx, posy;
@@ -89,8 +88,12 @@ -(void) addNewSpriteX: (float)x y:(float)y
89 88 cpSpaceAddShape(space, shape);
90 89
91 90 }
  91 +
  92 +// on "init" you need to initialize your instance
92 93 -(id) init
93 94 {
  95 + // always call "super" init
  96 + // Apple recommends to re-assign "self" with the "super" return value
94 97 if( (self=[super init])) {
95 98
96 99 self.isTouchEnabled = YES;
@@ -136,10 +139,20 @@ -(id) init
136 139
137 140 [self schedule: @selector(step:)];
138 141 }
139   -
140 142 return self;
141 143 }
142 144
  145 +// on "dealloc" you need to release all your retained objects
  146 +- (void) dealloc
  147 +{
  148 + // in case you have something to dealloc, do it in this method
  149 + cpSpaceFree(space);
  150 + space = NULL;
  151 +
  152 + // don't forget to call "super dealloc"
  153 + [super dealloc];
  154 +}
  155 +
143 156 -(void) onEnter
144 157 {
145 158 [super onEnter];
4 templates/cocos2d_chipmunk_app/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.m
@@ -10,7 +10,7 @@
10 10
11 11 #import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h"
12 12 #import "GameConfig.h"
13   -#import "HelloWorldScene.h"
  13 +#import "HelloWorldLayer.h"
14 14 #import "RootViewController.h"
15 15
16 16 @implementation ___PROJECTNAMEASIDENTIFIER___AppDelegate
@@ -111,7 +111,7 @@ - (void) applicationDidFinishLaunching:(UIApplication*)application
111 111 [self removeStartupFlicker];
112 112
113 113 // Run the intro Scene
114   - [[CCDirector sharedDirector] runWithScene: [HelloWorld scene]];
  114 + [[CCDirector sharedDirector] runWithScene: [HelloWorldLayer scene]];
115 115 }
116 116
117 117
12 templates/cocos2d_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
@@ -28,7 +28,7 @@
28 28 506EDBA5102F4C9F00A389B3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */; };
29 29 506EE1A91030508200A389B3 /* libcocos2d libraries.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EE05E10304ED200A389B3 /* libcocos2d libraries.a */; };
30 30 507022A4107672FA00393637 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 507022A2107672FA00393637 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m */; };
31   - 507022A5107672FA00393637 /* HelloWorldScene.m in Sources */ = {isa = PBXBuildFile; fileRef = 507022A3107672FA00393637 /* HelloWorldScene.m */; };
  31 + 507022A5107672FA00393637 /* HelloWorldLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 507022A3107672FA00393637 /* HelloWorldLayer.m */; };
32 32 507023151076758E00393637 /* grossini_dance_atlas.png in Resources */ = {isa = PBXBuildFile; fileRef = 507023141076758E00393637 /* grossini_dance_atlas.png */; };
33 33 507ED67E11C63903002ED3FC /* CDAudioManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 507ED67511C63903002ED3FC /* CDAudioManager.h */; };
34 34 507ED67F11C63903002ED3FC /* CDAudioManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 507ED67611C63903002ED3FC /* CDAudioManager.m */; };
@@ -331,10 +331,10 @@
331 331 50674873107A3B5E0090963A /* ZAttributedStringPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZAttributedStringPrivate.h; sourceTree = "<group>"; };
332 332 506EDB87102F4C4000A389B3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
333 333 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
334   - 506EDC2F102F528A00A389B3 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldScene.h; sourceTree = "<group>"; };
  334 + 506EDC2F102F528A00A389B3 /* HelloWorldLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
335 335 506EE05E10304ED200A389B3 /* libcocos2d libraries.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d libraries.a"; sourceTree = BUILT_PRODUCTS_DIR; };
336 336 507022A2107672FA00393637 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "___PROJECTNAMEASIDENTIFIER___AppDelegate.m"; sourceTree = "<group>"; };
337   - 507022A3107672FA00393637 /* HelloWorldScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloWorldScene.m; sourceTree = "<group>"; };
  337 + 507022A3107672FA00393637 /* HelloWorldLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
338 338 507023141076758E00393637 /* grossini_dance_atlas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grossini_dance_atlas.png; sourceTree = "<group>"; };
339 339 507ED67511C63903002ED3FC /* CDAudioManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDAudioManager.h; sourceTree = "<group>"; };
340 340 507ED67611C63903002ED3FC /* CDAudioManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDAudioManager.m; sourceTree = "<group>"; };
@@ -702,8 +702,8 @@
702 702 isa = PBXGroup;
703 703 children = (
704 704 E0F81035120A173C005866B8 /* GameConfig.h */,
705   - 507022A3107672FA00393637 /* HelloWorldScene.m */,
706   - 506EDC2F102F528A00A389B3 /* HelloWorldScene.h */,
  705 + 507022A3107672FA00393637 /* HelloWorldLayer.m */,
  706 + 506EDC2F102F528A00A389B3 /* HelloWorldLayer.h */,
707 707 E0F81036120A173C005866B8 /* RootViewController.h */,
708 708 E0F81037120A173C005866B8 /* RootViewController.m */,
709 709 1F3B9A2C0EF2145700286867 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.h */,
@@ -1382,7 +1382,7 @@
1382 1382 files = (
1383 1383 1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1384 1384 507022A4107672FA00393637 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m in Sources */,
1385   - 507022A5107672FA00393637 /* HelloWorldScene.m in Sources */,
  1385 + 507022A5107672FA00393637 /* HelloWorldLayer.m in Sources */,
1386 1386 E0F81038120A173C005866B8 /* RootViewController.m in Sources */,
1387 1387 );
1388 1388 runOnlyForDeploymentPostprocessing = 0;
8 templates/cocos2d_mac/Classes/HelloWorldScene.h → templates/cocos2d_mac/Classes/HelloWorldLayer.h
@@ -10,12 +10,12 @@
10 10 // When you import this file, you import all the cocos2d classes
11 11 #import "cocos2d.h"
12 12
13   -// HelloWorld Layer
14   -@interface HelloWorld : CCLayer
  13 +// HelloWorldLayer
  14 +@interface HelloWorldLayer : CCLayer
15 15 {
16 16 }
17 17
18   -// returns a Scene that contains the HelloWorld as the only child
19   -+(id) scene;
  18 +// returns a CCScene that contains the HelloWorldLayer as the only child
  19 ++(CCScene *) scene;
20 20
21 21 @end
13 templates/cocos2d_app/Classes/HelloWorldScene.m → templates/cocos2d_mac/Classes/HelloWorldLayer.m
@@ -6,19 +6,20 @@
6 6 // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved.
7 7 //
8 8
  9 +
9 10 // Import the interfaces
10   -#import "HelloWorldScene.h"
  11 +#import "HelloWorldLayer.h"
11 12
12   -// HelloWorld implementation
13   -@implementation HelloWorld
  13 +// HelloWorldLayer implementation
  14 +@implementation HelloWorldLayer
14 15
15   -+(id) scene
  16 ++(CCScene *) scene
16 17 {
17 18 // 'scene' is an autorelease object.
18 19 CCScene *scene = [CCScene node];
19 20
20 21 // 'layer' is an autorelease object.
21   - HelloWorld *layer = [HelloWorld node];
  22 + HelloWorldLayer *layer = [HelloWorldLayer node];
22 23
23 24 // add layer as a child to scene
24 25 [scene addChild: layer];
@@ -32,7 +33,7 @@ -(id) init
32 33 {
33 34 // always call "super" init
34 35 // Apple recommends to re-assign "self" with the "super" return value
35   - if( (self=[super init] )) {
  36 + if( (self=[super init])) {
36 37
37 38 // create and initialize a Label
38 39 CCLabelTTF *label = [CCLabelTTF labelWithString:@"Hello World" fontName:@"Marker Felt" fontSize:64];
4 templates/cocos2d_mac/Classes/___PROJECTNAMEASIDENTIFIER___AppDelegate.m
@@ -7,7 +7,7 @@
7 7 //
8 8
9 9 #import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h"
10   -#import "HelloWorldScene.h"
  10 +#import "HelloWorldLayer.h"
11 11
12 12 @implementation ___PROJECTNAMEASIDENTIFIER___AppDelegate
13 13 @synthesize window=window_, glView=glView_;
@@ -29,7 +29,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
29 29 [window_ setAcceptsMouseMovedEvents:NO];
30 30
31 31
32   - [director runWithScene:[HelloWorld scene]];
  32 + [director runWithScene:[HelloWorldLayer scene]];
33 33 }
34 34
35 35 - (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication *) theApplication
12 templates/cocos2d_mac/___PROJECTNAME___.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
11 11 E01E6B36121EDCED001A484F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E036A79E121B5C870037C5C6 /* QuartzCore.framework */; };
12 12 E01E6B49121EDCF4001A484F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E036A79C121B5C720037C5C6 /* OpenGL.framework */; };
13 13 E02A83D9129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E02A83D3129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m */; };
14   - E02A83DA129F000100341C97 /* HelloWorldScene.m in Sources */ = {isa = PBXBuildFile; fileRef = E02A83D6129F000100341C97 /* HelloWorldScene.m */; };
15 14 E02A83F6129F01DF00341C97 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E02A83EE129F01DF00341C97 /* InfoPlist.strings */; };
16 15 E02A83F7129F01DF00341C97 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02A83F0129F01DF00341C97 /* MainMenu.xib */; };
17 16 E02A83F8129F01DF00341C97 /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = E02A83F2129F01DF00341C97 /* fps_images.png */; };
@@ -30,6 +29,7 @@
30 29 E02A8484129F083600341C97 /* CDXPropertyModifierAction.h in Headers */ = {isa = PBXBuildFile; fileRef = E02A840F129F083500341C97 /* CDXPropertyModifierAction.h */; };
31 30 E02A8485129F083600341C97 /* CDXPropertyModifierAction.m in Sources */ = {isa = PBXBuildFile; fileRef = E02A8410129F083500341C97 /* CDXPropertyModifierAction.m */; };
32 31 E02A8529129F109200341C97 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = E02A8528129F109200341C97 /* icon.icns */; };
  32 + E0507118131760D700EAE33F /* HelloWorldLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = E0507117131760D700EAE33F /* HelloWorldLayer.m */; };
33 33 E076E5B71225E97900DE0DA2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
34 34 E076E5B81225E97900DE0DA2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E036A79C121B5C720037C5C6 /* OpenGL.framework */; };
35 35 E076E5B91225E97900DE0DA2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E036A79E121B5C870037C5C6 /* QuartzCore.framework */; };
@@ -213,8 +213,6 @@
213 213 E01E6A3D121EDCD3001A484F /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
214 214 E02A83D2129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "___PROJECTNAMEASIDENTIFIER___AppDelegate.h"; sourceTree = "<group>"; };
215 215 E02A83D3129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "___PROJECTNAMEASIDENTIFIER___AppDelegate.m"; sourceTree = "<group>"; };
216   - E02A83D5129F000100341C97 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldScene.h; sourceTree = "<group>"; };
217   - E02A83D6129F000100341C97 /* HelloWorldScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloWorldScene.m; sourceTree = "<group>"; };
218 216 E02A83EB129F01DF00341C97 /* ___PROJECTNAMEASIDENTIFIER____Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "___PROJECTNAMEASIDENTIFIER____Prefix.pch"; path = "Resources/___PROJECTNAMEASIDENTIFIER____Prefix.pch"; sourceTree = "<group>"; };
219 217 E02A83EC129F01DF00341C97 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = "<group>"; };
220 218 E02A83EF129F01DF00341C97 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
@@ -237,6 +235,8 @@
237 235 E02A8528129F109200341C97 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = icon.icns; path = Resources/icon.icns; sourceTree = "<group>"; };
238 236 E036A79C121B5C720037C5C6 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
239 237 E036A79E121B5C870037C5C6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
  238 + E0507116131760D700EAE33F /* HelloWorldLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldLayer.h; sourceTree = "<group>"; };
  239 + E0507117131760D700EAE33F /* HelloWorldLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloWorldLayer.m; sourceTree = "<group>"; };
240 240 E076E5C01225E97900DE0DA2 /* ___PROJECTNAME___.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "___PROJECTNAME___.app"; sourceTree = BUILT_PRODUCTS_DIR; };
241 241 E076E61F1225EC1E00DE0DA2 /* LICENSE.cocos2d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.cocos2d; sourceTree = "<group>"; };
242 242 E076E6201225EC1E00DE0DA2 /* LICENSE.cocosdenshion */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.cocosdenshion; sourceTree = "<group>"; };
@@ -500,11 +500,11 @@
500 500 E02A83D1129F000100341C97 /* Classes */ = {
501 501 isa = PBXGroup;
502 502 children = (
  503 + E0507116131760D700EAE33F /* HelloWorldLayer.h */,
  504 + E0507117131760D700EAE33F /* HelloWorldLayer.m */,
503 505 E02A83FB129F023B00341C97 /* main.m */,
504 506 E02A83D2129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.h */,
505 507 E02A83D3129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m */,
506   - E02A83D5129F000100341C97 /* HelloWorldScene.h */,
507   - E02A83D6129F000100341C97 /* HelloWorldScene.m */,
508 508 );
509 509 path = Classes;
510 510 sourceTree = "<group>";
@@ -1009,8 +1009,8 @@
1009 1009 buildActionMask = 2147483647;
1010 1010 files = (
1011 1011 E02A83D9129F000100341C97 /* ___PROJECTNAMEASIDENTIFIER___AppDelegate.m in Sources */,
1012   - E02A83DA129F000100341C97 /* HelloWorldScene.m in Sources */,
1013 1012 E02A83FC129F023B00341C97 /* main.m in Sources */,
  1013 + E0507118131760D700EAE33F /* HelloWorldLayer.m in Sources */,
1014 1014 );
1015 1015 runOnlyForDeploymentPostprocessing = 0;
1016 1016 };
2  tests/ActionsTest.m
@@ -14,8 +14,6 @@
14 14
15 15 static int sceneIdx=-1;
16 16 static NSString *transitions[] = {
17   - @"ActionBlink",
18   -
19 17 @"ActionManual",
20 18 @"ActionMove",
21 19 @"ActionRotate",

0 comments on commit e4fdea1

Please sign in to comment.
Something went wrong with that request. Please try again.