Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed typo, indentation

This commit is contained in:
Joachim Grill 2015-09-29 16:50:14 +02:00
parent b14b251628
commit 79656ffe13
4 changed files with 69 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCSpriteFrame.h
View File

@ -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);

126
tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp
View File

@ -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);
};

10
tests/cpp-tests/Classes/SpriteTest/SpriteTest.h
View File

@ -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;
};

1
tests/performance-tests/Classes/tests/PerformanceSpriteTest.cpp
View File

@ -323,7 +323,6 @@ Sprite* SubTest::createSpriteWithTag(int tag)
break;
}
default:
break;
}