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

Merge pull request #16148 from mogemimi/fix-misspelled-enum 

Fix misspelled enum: POLYGEN -> POLYGON
This commit is contained in:
minggo 2016-07-20 09:54:42 +08:00 committed by GitHub
parent b5de8ba0ea 60dbbde3eb
commit 129a06b9b3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/physics/CCPhysicsShape.cpp
View File

@ -551,7 +551,7 @@ bool PhysicsShapePolygon::init(const Vec2* points, int count, const PhysicsMater
{
do
{
_type = Type::POLYGEN;
_type = Type::POLYGON;
auto vecs = new (std::nothrow) cpVect[count];
PhysicsHelper::points2cpvs(points, vecs, count); //count = cpConvexHull((int)count, vecs, nullptr, nullptr, 0);
@ -763,7 +763,7 @@ bool PhysicsShapeEdgePolygon::init(const Vec2* points, int count, const PhysicsM
cpVect* vec = nullptr;
do
{
_type = Type::EDGEPOLYGEN;
_type = Type::EDGEPOLYGON;
vec = new (std::nothrow) cpVect[count];
PhysicsHelper::points2cpvs(points, vec, count);

10
cocos/physics/CCPhysicsShape.h
View File

@ -77,11 +77,17 @@ public:
UNKNOWN,
CIRCLE,
BOX,
POLYGEN,
POLYGON,
EDGESEGMENT,
EDGEBOX,
EDGEPOLYGEN,
EDGEPOLYGON,
EDGECHAIN,
/** @deprecated Use Type::POLYGON instead. */
POLYGEN = POLYGON,
/** @deprecated Use Type::EDGEPOLYGON instead. */
EDGEPOLYGEN = EDGEPOLYGON,
};
public: