From 79656ffe13049c1790365787a20ee783d7b14e26 Mon Sep 17 00:00:00 2001 From: Joachim Grill Date: Tue, 29 Sep 2015 16:50:14 +0200 Subject: [PATCH] fixed typo, indentation --- cocos/2d/CCSpriteFrame.h | 2 +- .../Classes/SpriteTest/SpriteTest.cpp | 126 +++++++++--------- .../cpp-tests/Classes/SpriteTest/SpriteTest.h | 10 +- .../Classes/tests/PerformanceSpriteTest.cpp | 1 - 4 files changed, 69 insertions(+), 70 deletions(-) diff --git a/cocos/2d/CCSpriteFrame.h b/cocos/2d/CCSpriteFrame.h index 8989431c4a..9efdb5d233 100644 --- a/cocos/2d/CCSpriteFrame.h +++ b/cocos/2d/CCSpriteFrame.h @@ -191,7 +191,7 @@ public: /** Set the polygon info for polygon mesh sprites * - * @param polygonInfo triangle mesh of teh sprite + * @param polygonInfo triangle mesh of the sprite */ void setPolygonInfo(const PolygonInfo &polygonInfo); diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp index b04c6d41f4..fdf792ea8f 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp @@ -54,71 +54,71 @@ enum SpriteTests::SpriteTests() { - ADD_TEST_CASE(Sprite1); - ADD_TEST_CASE(SpriteBatchNode1); - ADD_TEST_CASE(SpriteAnchorPoint); - ADD_TEST_CASE(SpriteBatchNodeAnchorPoint); - ADD_TEST_CASE(SpriteOffsetAnchorRotation); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorRotation); - ADD_TEST_CASE(SpriteOffsetAnchorScale); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorScale); - ADD_TEST_CASE(SpriteOffsetAnchorSkew); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorSkew); - ADD_TEST_CASE(SpriteOffsetAnchorRotationalSkew); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorRotationalSkew); - ADD_TEST_CASE(SpriteOffsetAnchorSkewScale); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorSkewScale); - ADD_TEST_CASE(SpriteOffsetAnchorRotationalSkewScale); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorRotationalSkewScale); - ADD_TEST_CASE(SpriteSkewNegativeScaleChildren); - ADD_TEST_CASE(SpriteBatchNodeSkewNegativeScaleChildren); - ADD_TEST_CASE(SpriteRotationalSkewNegativeScaleChildren); - ADD_TEST_CASE(SpriteBatchNodeRotationalSkewNegativeScaleChildren); - ADD_TEST_CASE(SpriteOffsetAnchorFlip); - ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorFlip); - ADD_TEST_CASE(SpriteChildrenChildren); - ADD_TEST_CASE(SpriteBatchNodeChildrenChildren); - ADD_TEST_CASE(SpriteChildrenAnchorPoint); - ADD_TEST_CASE(SpriteBatchNodeChildrenAnchorPoint); - ADD_TEST_CASE(SpriteColorOpacity); - ADD_TEST_CASE(SpriteBatchNodeColorOpacity); - ADD_TEST_CASE(SpriteZOrder); - ADD_TEST_CASE(SpriteBatchNodeZOrder); - ADD_TEST_CASE(SpriteZVertex); - ADD_TEST_CASE(SpriteBatchNodeZVertex); - ADD_TEST_CASE(SpriteAliased); - ADD_TEST_CASE(SpriteBatchNodeAliased); - ADD_TEST_CASE(SpriteNewTexture); - ADD_TEST_CASE(SpriteBatchNodeNewTexture); - ADD_TEST_CASE(SpriteFlip); - ADD_TEST_CASE(SpriteBatchNodeFlip); - ADD_TEST_CASE(SpriteAnimationSplit); - ADD_TEST_CASE(SpriteFrameTest); - ADD_TEST_CASE(SpriteFrameAliasNameTest); + ADD_TEST_CASE(Sprite1); + ADD_TEST_CASE(SpriteBatchNode1); + ADD_TEST_CASE(SpriteAnchorPoint); + ADD_TEST_CASE(SpriteBatchNodeAnchorPoint); + ADD_TEST_CASE(SpriteOffsetAnchorRotation); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorRotation); + ADD_TEST_CASE(SpriteOffsetAnchorScale); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorScale); + ADD_TEST_CASE(SpriteOffsetAnchorSkew); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorSkew); + ADD_TEST_CASE(SpriteOffsetAnchorRotationalSkew); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorRotationalSkew); + ADD_TEST_CASE(SpriteOffsetAnchorSkewScale); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorSkewScale); + ADD_TEST_CASE(SpriteOffsetAnchorRotationalSkewScale); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorRotationalSkewScale); + ADD_TEST_CASE(SpriteSkewNegativeScaleChildren); + ADD_TEST_CASE(SpriteBatchNodeSkewNegativeScaleChildren); + ADD_TEST_CASE(SpriteRotationalSkewNegativeScaleChildren); + ADD_TEST_CASE(SpriteBatchNodeRotationalSkewNegativeScaleChildren); + ADD_TEST_CASE(SpriteOffsetAnchorFlip); + ADD_TEST_CASE(SpriteBatchNodeOffsetAnchorFlip); + ADD_TEST_CASE(SpriteChildrenChildren); + ADD_TEST_CASE(SpriteBatchNodeChildrenChildren); + ADD_TEST_CASE(SpriteChildrenAnchorPoint); + ADD_TEST_CASE(SpriteBatchNodeChildrenAnchorPoint); + ADD_TEST_CASE(SpriteColorOpacity); + ADD_TEST_CASE(SpriteBatchNodeColorOpacity); + ADD_TEST_CASE(SpriteZOrder); + ADD_TEST_CASE(SpriteBatchNodeZOrder); + ADD_TEST_CASE(SpriteZVertex); + ADD_TEST_CASE(SpriteBatchNodeZVertex); + ADD_TEST_CASE(SpriteAliased); + ADD_TEST_CASE(SpriteBatchNodeAliased); + ADD_TEST_CASE(SpriteNewTexture); + ADD_TEST_CASE(SpriteBatchNodeNewTexture); + ADD_TEST_CASE(SpriteFlip); + ADD_TEST_CASE(SpriteBatchNodeFlip); + ADD_TEST_CASE(SpriteAnimationSplit); + ADD_TEST_CASE(SpriteFrameTest); + ADD_TEST_CASE(SpriteFrameAliasNameTest); ADD_TEST_CASE(SpriteFramesFromFileContent); ADD_TEST_CASE(SpritePolygonFromFileContent); - ADD_TEST_CASE(SpriteBatchNodeReorder); - ADD_TEST_CASE(SpriteBatchNodeReorderIssue744); - ADD_TEST_CASE(SpriteBatchNodeReorderIssue766); - ADD_TEST_CASE(SpriteBatchNodeReorderIssue767); - ADD_TEST_CASE(SpriteBatchNodeReorderSameIndex); - ADD_TEST_CASE(SpriteBatchNodeReorderOneChild); - ADD_TEST_CASE(NodeSort); - ADD_TEST_CASE(Sprite6); - ADD_TEST_CASE(SpriteHybrid); - ADD_TEST_CASE(SpriteBatchNodeChildren); - ADD_TEST_CASE(SpriteBatchNodeChildrenZ); - ADD_TEST_CASE(SpriteChildrenVisibility); - ADD_TEST_CASE(SpriteChildrenVisibilityIssue665); - ADD_TEST_CASE(SpriteBatchNodeChildrenScale); - ADD_TEST_CASE(SpriteNilTexture); - ADD_TEST_CASE(SpriteSubclass); - ADD_TEST_CASE(SpriteDoubleResolution); - ADD_TEST_CASE(SpriteBatchBug1217); - ADD_TEST_CASE(AnimationCacheTest); - ADD_TEST_CASE(AnimationCacheFile); - ADD_TEST_CASE(SpriteCullTest1); - ADD_TEST_CASE(SpriteCullTest2); + ADD_TEST_CASE(SpriteBatchNodeReorder); + ADD_TEST_CASE(SpriteBatchNodeReorderIssue744); + ADD_TEST_CASE(SpriteBatchNodeReorderIssue766); + ADD_TEST_CASE(SpriteBatchNodeReorderIssue767); + ADD_TEST_CASE(SpriteBatchNodeReorderSameIndex); + ADD_TEST_CASE(SpriteBatchNodeReorderOneChild); + ADD_TEST_CASE(NodeSort); + ADD_TEST_CASE(Sprite6); + ADD_TEST_CASE(SpriteHybrid); + ADD_TEST_CASE(SpriteBatchNodeChildren); + ADD_TEST_CASE(SpriteBatchNodeChildrenZ); + ADD_TEST_CASE(SpriteChildrenVisibility); + ADD_TEST_CASE(SpriteChildrenVisibilityIssue665); + ADD_TEST_CASE(SpriteBatchNodeChildrenScale); + ADD_TEST_CASE(SpriteNilTexture); + ADD_TEST_CASE(SpriteSubclass); + ADD_TEST_CASE(SpriteDoubleResolution); + ADD_TEST_CASE(SpriteBatchBug1217); + ADD_TEST_CASE(AnimationCacheTest); + ADD_TEST_CASE(AnimationCacheFile); + ADD_TEST_CASE(SpriteCullTest1); + ADD_TEST_CASE(SpriteCullTest2); ADD_TEST_CASE(Sprite3DRotationTest); }; diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h index 47e701ccfa..ebf4aac628 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h @@ -330,12 +330,12 @@ public: class SpriteFramesFromFileContent : public SpriteTestDemo { public: - CREATE_FUNC(SpriteFramesFromFileContent); + CREATE_FUNC(SpriteFramesFromFileContent); - virtual void onEnter() override; - virtual void onExit() override; - virtual std::string title() const override; - virtual std::string subtitle() const override; + virtual void onEnter() override; + virtual void onExit() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; virtual std::string sheetName() const; }; diff --git a/tests/performance-tests/Classes/tests/PerformanceSpriteTest.cpp b/tests/performance-tests/Classes/tests/PerformanceSpriteTest.cpp index 74d293b305..babb91b723 100644 --- a/tests/performance-tests/Classes/tests/PerformanceSpriteTest.cpp +++ b/tests/performance-tests/Classes/tests/PerformanceSpriteTest.cpp @@ -323,7 +323,6 @@ Sprite* SubTest::createSpriteWithTag(int tag) break; } - default: break; }