Skip to content

Commit 6b765da

Browse files
osinolegosinoleg
committed
Merge pull request #11 from spritebuilder/headless-metal
Adding metal support
2 parents 467d226 + a59e922 commit 6b765da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2771
-1315
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.1
1+
3.2.0

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 38 additions & 12 deletions
Large diffs are not rendered by default.

‎cocos2d-osx.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@
178178
D2D5986A1987132700BDAF25 /* CCEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D598481987132700BDAF25 /* CCEffectBrightness.m */; };
179179
D2D5986B1987132700BDAF25 /* CCEffectContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598491987132700BDAF25 /* CCEffectContrast.h */; };
180180
D2D5986C1987132700BDAF25 /* CCEffectContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D5984A1987132700BDAF25 /* CCEffectContrast.m */; };
181-
D2D5986D1987132700BDAF25 /* CCEffectGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D5984B1987132700BDAF25 /* CCEffectGaussianBlur.h */; };
182-
D2D5986E1987132700BDAF25 /* CCEffectGaussianBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D5984C1987132700BDAF25 /* CCEffectGaussianBlur.m */; };
183181
D2D5986F1987132700BDAF25 /* CCEffectGlass.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D5984D1987132700BDAF25 /* CCEffectGlass.h */; };
184182
D2D598701987132700BDAF25 /* CCEffectGlass.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D5984E1987132700BDAF25 /* CCEffectGlass.m */; };
185183
D2D598721987132700BDAF25 /* CCEffectHue.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598501987132700BDAF25 /* CCEffectHue.h */; };
@@ -245,6 +243,8 @@
245243
D389412B18639DD400725CFC /* CCPhysicsNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D389412318639DD400725CFC /* CCPhysicsNode.m */; };
246244
D389412C18639DD400725CFC /* CCPhysicsShape.h in Headers */ = {isa = PBXBuildFile; fileRef = D389412418639DD400725CFC /* CCPhysicsShape.h */; };
247245
D389412D18639DD400725CFC /* CCPhysicsShape.m in Sources */ = {isa = PBXBuildFile; fileRef = D389412518639DD400725CFC /* CCPhysicsShape.m */; };
246+
D3903B03199527AA003AA81A /* CCEffectBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = D3903B01199527AA003AA81A /* CCEffectBlur.h */; };
247+
D3903B04199527AA003AA81A /* CCEffectBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = D3903B02199527AA003AA81A /* CCEffectBlur.m */; };
248248
D3AD531218C84E7F005B6CF3 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3AD531118C84E7F005B6CF3 /* GLKit.framework */; };
249249
D3AD531618C84F79005B6CF3 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D3AD531318C84F79005B6CF3 /* CCShader_Private.h */; };
250250
D3AD531718C84F79005B6CF3 /* CCShader.h in Headers */ = {isa = PBXBuildFile; fileRef = D3AD531418C84F79005B6CF3 /* CCShader.h */; };
@@ -549,8 +549,6 @@
549549
D2D598481987132700BDAF25 /* CCEffectBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBrightness.m; sourceTree = "<group>"; };
550550
D2D598491987132700BDAF25 /* CCEffectContrast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectContrast.h; sourceTree = "<group>"; };
551551
D2D5984A1987132700BDAF25 /* CCEffectContrast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectContrast.m; sourceTree = "<group>"; };
552-
D2D5984B1987132700BDAF25 /* CCEffectGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGaussianBlur.h; sourceTree = "<group>"; };
553-
D2D5984C1987132700BDAF25 /* CCEffectGaussianBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGaussianBlur.m; sourceTree = "<group>"; };
554552
D2D5984D1987132700BDAF25 /* CCEffectGlass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGlass.h; sourceTree = "<group>"; };
555553
D2D5984E1987132700BDAF25 /* CCEffectGlass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGlass.m; sourceTree = "<group>"; };
556554
D2D598501987132700BDAF25 /* CCEffectHue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectHue.h; sourceTree = "<group>"; };
@@ -652,6 +650,8 @@
652650
D389412318639DD400725CFC /* CCPhysicsNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPhysicsNode.m; sourceTree = "<group>"; };
653651
D389412418639DD400725CFC /* CCPhysicsShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsShape.h; sourceTree = "<group>"; };
654652
D389412518639DD400725CFC /* CCPhysicsShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPhysicsShape.m; sourceTree = "<group>"; };
653+
D3903B01199527AA003AA81A /* CCEffectBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBlur.h; sourceTree = "<group>"; };
654+
D3903B02199527AA003AA81A /* CCEffectBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBlur.m; sourceTree = "<group>"; };
655655
D3AD531118C84E7F005B6CF3 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
656656
D3AD531318C84F79005B6CF3 /* CCShader_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShader_Private.h; sourceTree = "<group>"; };
657657
D3AD531418C84F79005B6CF3 /* CCShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShader.h; sourceTree = "<group>"; };
@@ -1112,6 +1112,8 @@
11121112
D2D598411987130500BDAF25 /* Effects */ = {
11131113
isa = PBXGroup;
11141114
children = (
1115+
D3903B01199527AA003AA81A /* CCEffectBlur.h */,
1116+
D3903B02199527AA003AA81A /* CCEffectBlur.m */,
11151117
D2D598421987132700BDAF25 /* CCEffect_Private.h */,
11161118
D2D598431987132700BDAF25 /* CCEffect.h */,
11171119
D2D598441987132700BDAF25 /* CCEffect.m */,
@@ -1121,8 +1123,6 @@
11211123
D2D598481987132700BDAF25 /* CCEffectBrightness.m */,
11221124
D2D598491987132700BDAF25 /* CCEffectContrast.h */,
11231125
D2D5984A1987132700BDAF25 /* CCEffectContrast.m */,
1124-
D2D5984B1987132700BDAF25 /* CCEffectGaussianBlur.h */,
1125-
D2D5984C1987132700BDAF25 /* CCEffectGaussianBlur.m */,
11261126
D2D5984D1987132700BDAF25 /* CCEffectGlass.h */,
11271127
D2D5984E1987132700BDAF25 /* CCEffectGlass.m */,
11281128
D2D598501987132700BDAF25 /* CCEffectHue.h */,
@@ -1697,6 +1697,7 @@
16971697
B77060871831B0C40043CC67 /* OpenALManager.h in Headers */,
16981698
B77060751831B0C40043CC67 /* ALCaptureDevice.h in Headers */,
16991699
B7D273331822F5460054849B /* CCBSequenceProperty.h in Headers */,
1700+
D3903B03199527AA003AA81A /* CCEffectBlur.h in Headers */,
17001701
A046E2B614C1E5000005BBF2 /* CCESRenderer.h in Headers */,
17011702
A046E2B714C1E5000005BBF2 /* CCGLView.h in Headers */,
17021703
B7E7758C184FBA47004221AA /* CCNodeColor.h in Headers */,
@@ -1724,7 +1725,6 @@
17241725
B7D2732D1822F5460054849B /* CCBLocalizationManager.h in Headers */,
17251726
A0D7D69115E2D2CC000CA0C4 /* ccTypes.h in Headers */,
17261727
A0D7D69415E2D2CC000CA0C4 /* CCConfiguration.h in Headers */,
1727-
D2D5986D1987132700BDAF25 /* CCEffectGaussianBlur.h in Headers */,
17281728
A0D7D69615E2D2CC000CA0C4 /* CCDirector.h in Headers */,
17291729
B7EE6A34181B287300B983FE /* CCSlider.h in Headers */,
17301730
A0D7D69815E2D2CC000CA0C4 /* CCProtocols.h in Headers */,
@@ -1900,6 +1900,7 @@
19001900
B77060831831B0C40043CC67 /* ALSource.m in Sources */,
19011901
E076E7191225EC7400DE0DA2 /* CCRenderTexture.m in Sources */,
19021902
E076E71D1225EC7400DE0DA2 /* CCScene.m in Sources */,
1903+
D3903B04199527AA003AA81A /* CCEffectBlur.m in Sources */,
19031904
B77060641831B0C40043CC67 /* OALActionManager.m in Sources */,
19041905
D2D5987F1987132700BDAF25 /* CCEffectSaturation.m in Sources */,
19051906
E076E7211225EC7400DE0DA2 /* CCSprite.m in Sources */,
@@ -1948,7 +1949,6 @@
19481949
A046E2B514C1E5000005BBF2 /* CCES2Renderer.m in Sources */,
19491950
A046E2B814C1E5000005BBF2 /* CCGLView.m in Sources */,
19501951
B770606E1831B0C40043CC67 /* OALAudioTracks.m in Sources */,
1951-
D2D5986E1987132700BDAF25 /* CCEffectGaussianBlur.m in Sources */,
19521952
D389412918639DD400725CFC /* CCPhysicsJoint.m in Sources */,
19531953
A0C879AD14F98F1C00C0E8B2 /* NSThread+performBlock.m in Sources */,
19541954
571CD04119649E22003D460C /* CCPlatformTextFieldMac.m in Sources */,

‎cocos2d-tests-android/Headless.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,8 @@
10111011
OTHER_LDFLAGS = (
10121012
"-landroid",
10131013
"-lgles_apportable",
1014+
"-all_load",
1015+
"-ObjC",
10141016
);
10151017
PRODUCT_NAME = "$(TARGET_NAME)";
10161018
WRAPPER_EXTENSION = app;
@@ -1042,6 +1044,8 @@
10421044
OTHER_LDFLAGS = (
10431045
"-landroid",
10441046
"-lgles_apportable",
1047+
"-all_load",
1048+
"-ObjC",
10451049
);
10461050
PRODUCT_NAME = "$(TARGET_NAME)";
10471051
WRAPPER_EXTENSION = app;

‎cocos2d-tests-ios.xcodeproj/project.pbxproj

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@
768768
TestTargetID = B7E2604717E7D278007067F0;
769769
};
770770
B7E2604717E7D278007067F0 = {
771-
DevelopmentTeam = NPYEFR2WH2;
771+
DevelopmentTeam = 96LKF67VJA;
772772
};
773773
};
774774
};
@@ -799,7 +799,7 @@
799799
/* Begin PBXReferenceProxy section */
800800
57E144B61974C1E90065F142 /* cocos2dJava.jar */ = {
801801
isa = PBXReferenceProxy;
802-
fileType = compiled.java.jar;
802+
fileType = file;
803803
path = cocos2dJava.jar;
804804
remoteRef = 57E144B51974C1E90065F142 /* PBXContainerItemProxy */;
805805
sourceTree = BUILT_PRODUCTS_DIR;
@@ -1195,6 +1195,13 @@
11951195
"-lsqlite3",
11961196
"-ObjC",
11971197
);
1198+
"OTHER_LDFLAGS[sdk=iphoneos8.0]" = (
1199+
"-lz",
1200+
"-lsqlite3",
1201+
"-ObjC",
1202+
"-weak_framework",
1203+
Metal,
1204+
);
11981205
PRODUCT_NAME = "cocos2d-tests-ios";
11991206
PROVISIONING_PROFILE = "";
12001207
WRAPPER_EXTENSION = app;
@@ -1218,6 +1225,13 @@
12181225
"-lsqlite3",
12191226
"-ObjC",
12201227
);
1228+
"OTHER_LDFLAGS[sdk=iphoneos8.0]" = (
1229+
"-lz",
1230+
"-lsqlite3",
1231+
"-ObjC",
1232+
"-weak_framework",
1233+
Metal,
1234+
);
12211235
PRODUCT_NAME = "cocos2d-tests-ios";
12221236
PROVISIONING_PROFILE = "";
12231237
VALIDATE_PRODUCT = YES;

‎cocos2d-ui-tests/osx/main.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@
1212

1313
int main(int argc, char *argv[])
1414
{
15-
[CCGLView load_];
1615
return NSApplicationMain(argc, (const char **) argv);
1716
}

‎cocos2d-ui-tests/tests/CCEffectPongTest.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "CCTextureCache.h"
1111
#import "CCNodeColor.h"
1212
#import "CCEffectNode.h"
13-
#import "CCEffectGaussianBlur.h"
13+
#import "CCEffectBlur.h"
1414

1515

1616
#define PADDLE_SCALE 0.5f
@@ -37,7 +37,7 @@ @implementation CCEffectPongTest {
3737
CGSize _designSize;
3838

3939
CCEffectNode* _ballEffectNode;
40-
CCEffectGaussianBlur* _ballEffect;
40+
CCEffectBlur* _ballEffect;
4141

4242
CCNodeColor* _ceiling;
4343
CCNodeColor* _floor;
@@ -157,7 +157,7 @@ - (void)setupBall
157157
_ballEffectNode.scale = 0.1f;
158158
[_ballEffectNode addChild:_ball];
159159

160-
_ballEffect = [CCEffectGaussianBlur effectWithPixelBlurRadius:2.0];
160+
_ballEffect = [CCEffectBlur effectWithBlurRadius:2.0];
161161
_ballEffectNode.effect = _ballEffect;
162162
}
163163

0 commit comments

Comments
 (0)