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

change ColliderFilter param type

This commit is contained in:
2youyou2 2013-11-27 11:39:58 +08:00
parent c0bd7f012c
commit 36cd51a453
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/CCColliderDetector.cpp
View File

@ -34,7 +34,7 @@ namespace cocostudio {
#if ENABLE_PHYSICS_BOX2D_DETECT #if ENABLE_PHYSICS_BOX2D_DETECT
ColliderFilter::ColliderFilter(unsigned short categoryBits, unsigned short maskBits, signed short groupIndex) ColliderFilter::ColliderFilter(uint16 categoryBits, uint16 maskBits, int16 groupIndex)
: _categoryBits(categoryBits) : _categoryBits(categoryBits)
, _maskBits(maskBits) , _maskBits(maskBits)
, _groupIndex(groupIndex) , _groupIndex(groupIndex)
@ -52,7 +52,7 @@ void ColliderFilter::updateShape(b2Fixture *fixture)
} }
#elif ENABLE_PHYSICS_CHIPMUNK_DETECT #elif ENABLE_PHYSICS_CHIPMUNK_DETECT
ColliderFilter::ColliderFilter(uintptr_t collisionType, uintptr_t group) ColliderFilter::ColliderFilter(cpCollisionType collisionType, cpGroup group)
: _collisionType(collisionType) : _collisionType(collisionType)
, _group(group) , _group(group)
{ {