mirror of https://github.com/axmolengine/axmol.git
fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730
This commit is contained in:
parent
ae056a07b1
commit
8082b91c0e
|
@ -52,7 +52,7 @@ namespace cocos2d {
|
|||
@return CCPoint
|
||||
@since v0.7.2
|
||||
*/
|
||||
#define ccp(__X__,__Y__) cocos2d::CCPointMake((float)__X__, (float)__Y__)
|
||||
#define ccp(__X__,__Y__) cocos2d::CCPointMake((float)(__X__), (float)(__Y__))
|
||||
|
||||
/** Returns opposite of point.
|
||||
@return CCPoint
|
||||
|
@ -305,17 +305,17 @@ bool CC_DLL ccpLineIntersect(const CCPoint& p1, const CCPoint& p2,
|
|||
const CCPoint& p3, const CCPoint& p4,
|
||||
float *s, float *t);
|
||||
|
||||
/*
|
||||
ccpSegmentIntersect returns YES if Segment A-B intersects with segment C-D
|
||||
@since v1.0.0
|
||||
*/
|
||||
bool CC_DLL ccpSegmentIntersect(const CCPoint& A, const CCPoint& B, const CCPoint& C, const CCPoint& D);
|
||||
|
||||
/*
|
||||
ccpIntersectPoint returns the intersection point of line A-B, C-D
|
||||
@since v1.0.0
|
||||
*/
|
||||
CCPoint CC_DLL ccpIntersectPoint(const CCPoint& A, const CCPoint& B, const CCPoint& C, const CCPoint& D);
|
||||
/*
|
||||
ccpSegmentIntersect returns YES if Segment A-B intersects with segment C-D
|
||||
@since v1.0.0
|
||||
*/
|
||||
bool CC_DLL ccpSegmentIntersect(const CCPoint& A, const CCPoint& B, const CCPoint& C, const CCPoint& D);
|
||||
|
||||
/*
|
||||
ccpIntersectPoint returns the intersection point of line A-B, C-D
|
||||
@since v1.0.0
|
||||
*/
|
||||
CCPoint CC_DLL ccpIntersectPoint(const CCPoint& A, const CCPoint& B, const CCPoint& C, const CCPoint& D);
|
||||
|
||||
}//namespace cocos2d
|
||||
|
||||
|
|
Loading…
Reference in New Issue