Skip to content

Commit b6d50b8

Browse files
BirkemoseBirkemose
committed
Matching -x demo
1 parent 721f466 commit b6d50b8

File tree

6 files changed

+22
-13
lines changed

6 files changed

+22
-13
lines changed

‎cocos2d-demo.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0E46C32A1B7EB7C100B416EF /* cocos2d_blues.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 0E46C3291B7EB7C100B416EF /* cocos2d_blues.aiff */; };
1110
0E98A8291B70B90800FA7E95 /* demo-1x.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8231B70B90800FA7E95 /* demo-1x.plist */; };
1211
0E98A82A1B70B90800FA7E95 /* demo-1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8241B70B90800FA7E95 /* demo-1x.png */; };
1312
0E98A82B1B70B90800FA7E95 /* demo-2x.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8251B70B90800FA7E95 /* demo-2x.plist */; };
@@ -16,6 +15,7 @@
1615
0E98A82E1B70B90800FA7E95 /* demo-4x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0E98A8281B70B90800FA7E95 /* demo-4x.png */; };
1716
0E98E2B41B5FE1FC0010E989 /* beep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 0E98E2B21B5FE1FC0010E989 /* beep.wav */; };
1817
0E98E2B51B5FE1FC0010E989 /* game.wav in Resources */ = {isa = PBXBuildFile; fileRef = 0E98E2B31B5FE1FC0010E989 /* game.wav */; };
18+
0EA1B6631B81E9FB005D31E7 /* cocos2d_blues.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 0EA1B6621B81E9FB005D31E7 /* cocos2d_blues.aiff */; };
1919
0EC6462E1B5E6D7100C656A6 /* Paddle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EC6462D1B5E6D7100C656A6 /* Paddle.m */; };
2020
0EE55C041B5D0D4D00D2F764 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EE55C031B5D0D4D00D2F764 /* OpenAL.framework */; };
2121
0EE55C101B5D0DDF00D2F764 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 0EE55C061B5D0DDF00D2F764 /* [email protected] */; };
@@ -232,7 +232,6 @@
232232
/* End PBXBuildFile section */
233233

234234
/* Begin PBXFileReference section */
235-
0E46C3291B7EB7C100B416EF /* cocos2d_blues.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; name = cocos2d_blues.aiff; path = "templates/cocos2d iOS demo.xctemplate/Resources/cocos2d_blues.aiff"; sourceTree = SOURCE_ROOT; };
236235
0E98A8231B70B90800FA7E95 /* demo-1x.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "demo-1x.plist"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-1x.plist"; sourceTree = SOURCE_ROOT; };
237236
0E98A8241B70B90800FA7E95 /* demo-1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "demo-1x.png"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-1x.png"; sourceTree = SOURCE_ROOT; };
238237
0E98A8251B70B90800FA7E95 /* demo-2x.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "demo-2x.plist"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-2x.plist"; sourceTree = SOURCE_ROOT; };
@@ -241,6 +240,7 @@
241240
0E98A8281B70B90800FA7E95 /* demo-4x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "demo-4x.png"; path = "templates/cocos2d iOS demo.xctemplate/Resources/demo-4x.png"; sourceTree = SOURCE_ROOT; };
242241
0E98E2B21B5FE1FC0010E989 /* beep.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = beep.wav; path = "templates/cocos2d iOS demo.xctemplate/Resources/beep.wav"; sourceTree = SOURCE_ROOT; };
243242
0E98E2B31B5FE1FC0010E989 /* game.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = game.wav; path = "templates/cocos2d iOS demo.xctemplate/Resources/game.wav"; sourceTree = SOURCE_ROOT; };
243+
0EA1B6621B81E9FB005D31E7 /* cocos2d_blues.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; name = cocos2d_blues.aiff; path = "templates/cocos2d iOS demo.xctemplate/Resources/cocos2d_blues.aiff"; sourceTree = SOURCE_ROOT; };
244244
0EC6462C1B5E6D7100C656A6 /* Paddle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Paddle.h; path = "templates/cocos2d iOS demo.xctemplate/Classes/Paddle.h"; sourceTree = SOURCE_ROOT; };
245245
0EC6462D1B5E6D7100C656A6 /* Paddle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Paddle.m; path = "templates/cocos2d iOS demo.xctemplate/Classes/Paddle.m"; sourceTree = SOURCE_ROOT; };
246246
0EC6462F1B5E6F5C00C656A6 /* GameTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GameTypes.h; path = "templates/cocos2d iOS demo.xctemplate/Classes/GameTypes.h"; sourceTree = SOURCE_ROOT; };
@@ -1406,7 +1406,7 @@
14061406
0EE55F441B5D137C00D2F764 /* Credits */ = {
14071407
isa = PBXGroup;
14081408
children = (
1409-
0E46C3291B7EB7C100B416EF /* cocos2d_blues.aiff */,
1409+
0EA1B6621B81E9FB005D31E7 /* cocos2d_blues.aiff */,
14101410
0EE55F0E1B5D132100D2F764 /* credits.plist */,
14111411
0EE55EFA1B5D0FCC00D2F764 /* shader.greyscale.fsh */,
14121412
0EE55EFB1B5D0FCC00D2F764 /* shader.greyscale.vsh */,
@@ -1584,7 +1584,7 @@
15841584
0E98A82B1B70B90800FA7E95 /* demo-2x.plist in Resources */,
15851585
0EE55C111B5D0DDF00D2F764 /* Default-Landscape.png in Resources */,
15861586
0E98A8291B70B90800FA7E95 /* demo-1x.plist in Resources */,
1587-
0E46C32A1B7EB7C100B416EF /* cocos2d_blues.aiff in Resources */,
1587+
0EA1B6631B81E9FB005D31E7 /* cocos2d_blues.aiff in Resources */,
15881588
0EE55F2E1B5D132100D2F764 /* grossini_hi.png in Resources */,
15891589
0E98A82A1B70B90800FA7E95 /* demo-1x.png in Resources */,
15901590
0EE55C191B5D0DDF00D2F764 /* [email protected] in Resources */,

‎cocos2d-demo.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate

289 Bytes
Binary file not shown.

‎cocos2d.xcodeproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate

-23 Bytes
Binary file not shown.

‎templates/cocos2d iOS demo.xctemplate/Classes/Credits.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @implementation Credits
3535
NSMutableArray *_shaderStack;
3636
CCNode *_scrollNode;
3737
CCButton *_back;
38-
NSMutableArray *_endgame;
38+
NSMutableArray *_endGameList;
3939

4040
// some external stuff we are not responsible for (always makes those weak)
4141
__weak CCScene *_scene;
@@ -80,7 +80,7 @@ - (instancetype)initWithScene:(CCScene *)scene andDictionary:(NSDictionary *)dic
8080
// create a scroll node occupying the entire screen
8181
_scrollNode = [CCNode new];
8282
_scrollNode.contentSize = [CCDirector sharedDirector].viewSize;
83-
// allow us to fade the scrollnode and all its children
83+
// allow us to fade the scrollnode and all its children without fading the back button
8484
_scrollNode.cascadeOpacityEnabled = YES;
8585
[self addChild:_scrollNode];
8686

@@ -105,13 +105,13 @@ - (instancetype)initWithScene:(CCScene *)scene andDictionary:(NSDictionary *)dic
105105
}
106106

107107
// load endgame
108-
_endgame = [NSMutableArray array];
108+
_endGameList = [NSMutableArray array];
109109
NSDictionary *endGameDict = [dict objectForKey:@"endgame"];
110110
for (int creditIndex = 1; creditIndex < 999; creditIndex ++)
111111
{
112-
NSString *endgame = [endGameDict objectForKey:[NSString stringWithFormat:@"credit - %d", creditIndex]];
113-
if (endgame != nil)
114-
[_endgame addObject:endgame];
112+
NSString *entry = [endGameDict objectForKey:[NSString stringWithFormat:@"credit - %d", creditIndex]];
113+
if (entry != nil)
114+
[_endGameList addObject:entry];
115115
else
116116
break;
117117
}
@@ -296,8 +296,8 @@ - (void)update:(CCTime)delta
296296
_isScrolling = NO;
297297

298298
// show endgame
299-
_yPos = 0.5 + ((_endgame.count - 1) * _spacing * 0.5);
300-
for (NSString *labelText in _endgame)
299+
_yPos = 0.5 + ((_endGameList.count - 1) * _spacing * 0.5);
300+
for (NSString *labelText in _endGameList)
301301
{
302302
CCLabelTTF *label = [CCLabelTTF labelWithString:labelText fontName:@"ArialMT" fontSize:36];
303303
label.positionType = CCPositionTypeNormalized;

‎templates/cocos2d iOS demo.xctemplate/Classes/loadScene.m

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,22 @@ - (void)loadNext:(CCTime)delta
8484
// load ex textures here
8585
// our loading doesnt take time, so we add a small delay to simulate "real" loading
8686
usleep(500000);
87+
88+
// We already loaded this, because the load scene needs it, but just to demonstrate ...
89+
// There is no memory penalty from loading it twice
90+
[[CCSpriteFrameCache sharedSpriteFrameCache] addSpriteFramesWithFile:@"demo.plist"];
91+
8792
_progress.percentage = 40;
8893
break;
8994
}
9095
case 1:
9196
{
9297
// load ex audio here
9398
usleep(500000);
99+
100+
[[OALSimpleAudio sharedInstance] preloadEffect:@"beep.wav"];
101+
[[OALSimpleAudio sharedInstance] preloadEffect:@"game.wav"];
102+
94103
_progress.percentage = 50;
95104
break;
96105
}

‎templates/cocos2d iOS demo.xctemplate/Classes/shader.greyscale.fsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void main()
2727
// That would require setting up a uniform, and loading it.
2828
//
2929
// For now we just use a value which will give "most sprites" a slight blurr
30-
vec2 pixelSize = vec2(0.01, 0.01);
30+
vec2 pixelSize = vec2(0.005, 0.005);
3131

3232
// read the four corner pixels
3333
vec4 color1 = texture2D(cc_MainTexture, cc_FragTexCoord1 + pixelSize);

0 commit comments

Comments
 (0)