diff --git a/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id index 0e28aace84..a545658c94 100644 --- a/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id @@ -1 +1 @@ -981b8356bc8bd77f7380a9c0a4ba82e4116f7404 \ No newline at end of file +4e29f8ee3a6b5f2a9da96b64d4a44e977f1dec73 \ No newline at end of file diff --git a/tools/tolua++/CCGeometry.pkg b/tools/tolua++/CCGeometry.pkg index a3a8b45860..5034f99b62 100644 --- a/tools/tolua++/CCGeometry.pkg +++ b/tools/tolua++/CCGeometry.pkg @@ -1,7 +1,5 @@ -typedef float CGFloat; - -class CCPoint : public CCObject +struct CCPoint { float x; float y; @@ -11,7 +9,7 @@ class CCPoint : public CCObject bool equals(const CCPoint & target) const ; }; -class CCSize : public CCObject +struct CCSize { float width; float height; @@ -21,7 +19,7 @@ class CCSize : public CCObject bool equals(const CCSize & target) const; }; -class CCRect : public CCObject +struct CCRect { CCPoint origin; CCSize size; diff --git a/tools/tolua++/CCPointExtension.pkg b/tools/tolua++/CCPointExtension.pkg index 3aea350a14..6e4e60070a 100644 --- a/tools/tolua++/CCPointExtension.pkg +++ b/tools/tolua++/CCPointExtension.pkg @@ -2,22 +2,22 @@ static CCPoint ccpNeg(const CCPoint& v); static CCPoint ccpAdd(const CCPoint& v1, const CCPoint& v2); static CCPoint ccpSub(const CCPoint& v1, const CCPoint& v2); -static CCPoint ccpMult(const CCPoint& v, const CGFloat s); +static CCPoint ccpMult(const CCPoint& v, const float s); static CCPoint ccpMidpoint(const CCPoint& v1, const CCPoint& v2); -static CGFloat ccpDot(const CCPoint& v1, const CCPoint& v2); -static CGFloat ccpCross(const CCPoint& v1, const CCPoint& v2); +static float ccpDot(const CCPoint& v1, const CCPoint& v2); +static float ccpCross(const CCPoint& v1, const CCPoint& v2); static CCPoint ccpPerp(const CCPoint& v); static CCPoint ccpRPerp(const CCPoint& v); static CCPoint ccpProject(const CCPoint& v1, const CCPoint& v2); static CCPoint ccpRotate(const CCPoint& v1, const CCPoint& v2); static CCPoint ccpUnrotate(const CCPoint& v1, const CCPoint& v2); -static CGFloat ccpLengthSQ(const CCPoint& v); -static CGFloat ccpDistanceSQ(const CCPoint p1, const CCPoint p2); -CGFloat ccpLength(const CCPoint& v); -CGFloat ccpDistance(const CCPoint& v1, const CCPoint& v2); +static float ccpLengthSQ(const CCPoint& v); +static float ccpDistanceSQ(const CCPoint p1, const CCPoint p2); +float ccpLength(const CCPoint& v); +float ccpDistance(const CCPoint& v1, const CCPoint& v2); CCPoint ccpNormalize(const CCPoint& v); -CCPoint ccpForAngle(const CGFloat a); -CGFloat ccpToAngle(const CCPoint& v); +CCPoint ccpForAngle(const float a); +float ccpToAngle(const CCPoint& v); float clampf(float value, float min_inclusive, float max_inclusive); CCPoint ccpClamp(const CCPoint& p, const CCPoint& from, const CCPoint& to); CCPoint ccpFromSize(const CCSize& s);