Skip to content

Commit 05f5af0

Browse files
James Chenminggo
authored andcommitted
Particle font size should be a const value (cocos2d#17676)
* Particle font size should be a const value * Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
1 parent 3e25f0b commit 05f5af0

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

build/cocos2d_libs.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,7 @@
10261026
1A41ABC61DF00D1500B5584C /* AudioDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A41ABC51DF00D1500B5584C /* AudioDecoder.h */; };
10271027
1A41ABC71DF00D1500B5584C /* AudioDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A41ABC51DF00D1500B5584C /* AudioDecoder.h */; };
10281028
1A41ABC81DF00D1500B5584C /* AudioDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A41ABC51DF00D1500B5584C /* AudioDecoder.h */; };
1029+
1A4C3ABA1E9B7A45001972CC /* CCStencilStateManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4C3AB91E9B7A45001972CC /* CCStencilStateManager.h */; };
10291030
1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570047180BC5A10088DEC7 /* CCAction.cpp */; };
10301031
1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570047180BC5A10088DEC7 /* CCAction.cpp */; };
10311032
1A570063180BC5A10088DEC7 /* CCAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570048180BC5A10088DEC7 /* CCAction.h */; };
@@ -1369,8 +1370,6 @@
13691370
2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; };
13701371
298C75D51C0465D0006BAE63 /* CCStencilStateManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 298C75D31C0465D0006BAE63 /* CCStencilStateManager.cpp */; };
13711372
298C75D61C0465D1006BAE63 /* CCStencilStateManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 298C75D31C0465D0006BAE63 /* CCStencilStateManager.cpp */; };
1372-
298C75D71C0465D1006BAE63 /* CCStencilStateManager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 298C75D41C0465D0006BAE63 /* CCStencilStateManager.hpp */; };
1373-
298C75D81C0465D1006BAE63 /* CCStencilStateManager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 298C75D41C0465D0006BAE63 /* CCStencilStateManager.hpp */; };
13741373
299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; };
13751374
299754F5193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; };
13761375
299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; };
@@ -3307,7 +3306,6 @@
33073306
507B3F721C31BDD30067B53E /* CCBoneNode.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306641B60B583001E6D43 /* CCBoneNode.h */; };
33083307
507B3F731C31BDD30067B53E /* CCPUCollisionAvoidanceAffectorTranslator.h in Headers */ = {isa = PBXBuildFile; fileRef = B665E0F71AA80A6500DDB1C5 /* CCPUCollisionAvoidanceAffectorTranslator.h */; };
33093308
507B3F741C31BDD30067B53E /* btParallelConstraintSolver.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CAB1431AF9AA1900B9B856 /* btParallelConstraintSolver.h */; };
3310-
507B3F751C31BDD30067B53E /* CCStencilStateManager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 298C75D41C0465D0006BAE63 /* CCStencilStateManager.hpp */; };
33113309
507B3F761C31BDD30067B53E /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; };
33123310
507B3F771C31BDD30067B53E /* b2DistanceJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168FE1807AF9C005B8026 /* b2DistanceJoint.h */; };
33133311
507B3F781C31BDD30067B53E /* btQuickprof.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CAB1CC1AF9AA1A00B9B856 /* btQuickprof.h */; };
@@ -6034,6 +6032,7 @@
60346032
1A40D1081E8E56C6002E363A /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
60356033
1A41ABC11DF00CEC00B5584C /* AudioDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioDecoder.mm; sourceTree = "<group>"; };
60366034
1A41ABC51DF00D1500B5584C /* AudioDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioDecoder.h; sourceTree = "<group>"; };
6035+
1A4C3AB91E9B7A45001972CC /* CCStencilStateManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCStencilStateManager.h; path = ../base/CCStencilStateManager.h; sourceTree = "<group>"; };
60376036
1A570047180BC5A10088DEC7 /* CCAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAction.cpp; sourceTree = "<group>"; };
60386037
1A570048180BC5A10088DEC7 /* CCAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAction.h; sourceTree = "<group>"; };
60396038
1A570049180BC5A10088DEC7 /* CCActionCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionCamera.cpp; sourceTree = "<group>"; };
@@ -6403,7 +6402,6 @@
64036402
2986667818B1B079000E39CA /* CCTweenFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTweenFunction.cpp; sourceTree = "<group>"; };
64046403
2986667918B1B079000E39CA /* CCTweenFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTweenFunction.h; sourceTree = "<group>"; };
64056404
298C75D31C0465D0006BAE63 /* CCStencilStateManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCStencilStateManager.cpp; path = ../base/CCStencilStateManager.cpp; sourceTree = "<group>"; };
6406-
298C75D41C0465D0006BAE63 /* CCStencilStateManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CCStencilStateManager.hpp; path = ../base/CCStencilStateManager.hpp; sourceTree = "<group>"; };
64076405
299754F2193EC95400A54AC3 /* ObjectFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ObjectFactory.cpp; path = ../base/ObjectFactory.cpp; sourceTree = "<group>"; };
64086406
299754F3193EC95400A54AC3 /* ObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectFactory.h; path = ../base/ObjectFactory.h; sourceTree = "<group>"; };
64096407
299CF1F919A434BC00C378C1 /* ccRandom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccRandom.cpp; path = ../base/ccRandom.cpp; sourceTree = "<group>"; };
@@ -8437,7 +8435,7 @@
84378435
50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */,
84388436
50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */,
84398437
298C75D31C0465D0006BAE63 /* CCStencilStateManager.cpp */,
8440-
298C75D41C0465D0006BAE63 /* CCStencilStateManager.hpp */,
8438+
1A4C3AB91E9B7A45001972CC /* CCStencilStateManager.h */,
84418439
);
84428440
name = base;
84438441
path = ../cocos/2d;
@@ -11683,6 +11681,7 @@
1168311681
B6CAB4011AF9AA1A00B9B856 /* btMultiBodyConstraintSolver.h in Headers */,
1168411682
B6CAB2FB1AF9AA1A00B9B856 /* btTriangleCallback.h in Headers */,
1168511683
15AE1A5A19AAD40300C27E9E /* b2StackAllocator.h in Headers */,
11684+
1A4C3ABA1E9B7A45001972CC /* CCStencilStateManager.h in Headers */,
1168611685
B665E4101AA80A6600DDB1C5 /* CCPUTechniqueTranslator.h in Headers */,
1168711686
B6CAB3691AF9AA1A00B9B856 /* btConvexCast.h in Headers */,
1168811687
38F526401A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */,
@@ -11803,7 +11802,6 @@
1180311802
463AE7391E4DA31C00926B3A /* grpc.h in Headers */,
1180411803
50864CA31C7BC1B000B3BAB1 /* cpBody.h in Headers */,
1180511804
1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
11806-
298C75D71C0465D1006BAE63 /* CCStencilStateManager.hpp in Headers */,
1180711805
B6DD2FDB1B04825B00E47F5F /* DetourLocalBoundary.h in Headers */,
1180811806
B6CAB3491AF9AA1A00B9B856 /* gim_clip_polygon.h in Headers */,
1180911807
503D4F661CE29D4E0054A2D1 /* CCVRDistortionMesh.h in Headers */,
@@ -13389,7 +13387,6 @@
1338913387
507B3F721C31BDD30067B53E /* CCBoneNode.h in Headers */,
1339013388
507B3F731C31BDD30067B53E /* CCPUCollisionAvoidanceAffectorTranslator.h in Headers */,
1339113389
507B3F741C31BDD30067B53E /* btParallelConstraintSolver.h in Headers */,
13392-
507B3F751C31BDD30067B53E /* CCStencilStateManager.hpp in Headers */,
1339313390
507B3F761C31BDD30067B53E /* CCNodeLoaderLibrary.h in Headers */,
1339413391
507B3F771C31BDD30067B53E /* b2DistanceJoint.h in Headers */,
1339513392
50864C961C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */,
@@ -14483,7 +14480,6 @@
1448314480
85505F051B60E3B2003F2CD4 /* CCBoneNode.h in Headers */,
1448414481
B665E2491AA80A6500DDB1C5 /* CCPUCollisionAvoidanceAffectorTranslator.h in Headers */,
1448514482
B6CAB4461AF9AA1A00B9B856 /* btParallelConstraintSolver.h in Headers */,
14486-
298C75D81C0465D1006BAE63 /* CCStencilStateManager.hpp in Headers */,
1448714483
15AE18D119AAD33D00C27E9E /* CCNodeLoaderLibrary.h in Headers */,
1448814484
15AE1AC319AAD40300C27E9E /* b2DistanceJoint.h in Headers */,
1448914485
50864C951C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */,

tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,8 @@ void ParticleDemo::onEnter(void)
10601060
{
10611061
TestCase::onEnter();
10621062

1063+
MenuItemFont::setFontSize(32);
1064+
10631065
_color = LayerColor::create( Color4B(127,127,127,255) );
10641066
this->addChild(_color);
10651067

0 commit comments

Comments
 (0)