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

Merge pull request #14788 from mogemimi/fix-method-name 

Fix method name spelling in AutoPolygon
This commit is contained in:
zilongshanren 2015-12-23 19:27:53 +08:00
parent a5525c15ab b0c4adcbd0
commit d11498ddef
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/2d/CCAutoPolygon.cpp
View File

@ -119,11 +119,16 @@ const unsigned int PolygonInfo::getVertCount() const
return (unsigned int)triangles.vertCount;
}
const unsigned int PolygonInfo::getTriaglesCount() const
const unsigned int PolygonInfo::getTrianglesCount() const
{
return (unsigned int)triangles.indexCount/3;
}
const unsigned int PolygonInfo::getTriaglesCount() const
{
return getTrianglesCount();
}
const float PolygonInfo::getArea() const
{
float area = 0;

5
cocos/2d/CCAutoPolygon.h
View File

@ -107,7 +107,10 @@ public:
* get triangles count
* @return number of triangles
*/
const unsigned int getTriaglesCount() const;
const unsigned int getTrianglesCount() const;
/** @deprecated Use method getTrianglesCount() instead */
CC_DEPRECATED_ATTRIBUTE const unsigned int getTriaglesCount() const;
/**
* get sum of all triangle area size

2
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
View File

@ -5418,7 +5418,7 @@ bool js_cocos2dx_PolygonInfo_getTriaglesCount(JSContext *cx, uint32_t argc, jsva
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_PolygonInfo_getTriaglesCount : Invalid Native Object");
if (argc == 0)
{
const unsigned int ret = cobj->getTriaglesCount();
const unsigned int ret = cobj->getTrianglesCount();
jsval jsret = JSVAL_NULL;
jsret = uint32_to_jsval(cx, ret);
args.rval().set(jsret);

2
tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp
View File

@ -593,7 +593,7 @@ void SpritePolygonPerformanceTestDynamic::initIncrementStats()
{
_pinfo = AutoPolygon::generatePolygon(s_pathGrossini);
_incVert = _pinfo.getVertCount();
_incTri = _pinfo.getTriaglesCount();
_incTri = _pinfo.getTrianglesCount();
_incPix = _pinfo.getArea();
}